summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/arla/Makefile4
-rw-r--r--net/arla/files/md54
-rw-r--r--net/arla/files/patch-sum14
-rw-r--r--net/arla/patches/patch-aa30
-rw-r--r--net/arla/patches/patch-ab31
-rw-r--r--net/arla/patches/patch-an30
-rw-r--r--net/arla/patches/patch-ao44
-rw-r--r--net/arla/patches/patch-ap283
-rw-r--r--net/arla/patches/patch-aq34
-rw-r--r--net/arla/patches/patch-ar57
-rw-r--r--net/arla/patches/patch-at24
-rw-r--r--net/arla/patches/patch-au24
-rw-r--r--net/arla/pkg/PLIST3
13 files changed, 127 insertions, 455 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile
index d715c9b7280..4d013a7e167 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2000/10/18 04:26:53 garbled Exp $
+# $NetBSD: Makefile,v 1.10 2000/10/18 16:32:57 wennmach Exp $
#
-DISTNAME= arla-0.34.2
+DISTNAME= arla-0.34.5
CATEGORIES= net security
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/
diff --git a/net/arla/files/md5 b/net/arla/files/md5
index 5228cdcb64c..21a8ca2d1d8 100644
--- a/net/arla/files/md5
+++ b/net/arla/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/08/30 13:04:00 wennmach Exp $
+$NetBSD: md5,v 1.4 2000/10/18 16:32:58 wennmach Exp $
-MD5 (arla-0.34.2.tar.gz) = 9316115d4f6734312021c146785b0678
+MD5 (arla-0.34.5.tar.gz) = cfce4b29051061455dae222b0353a451
diff --git a/net/arla/files/patch-sum b/net/arla/files/patch-sum
index aea87ff3153..eb7e821a5e8 100644
--- a/net/arla/files/patch-sum
+++ b/net/arla/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.9 2000/10/13 17:31:11 wennmach Exp $
+$NetBSD: patch-sum,v 1.10 2000/10/18 16:32:58 wennmach Exp $
-MD5 (patch-aa) = e96c11332180783528b4f549cb7884a4
-MD5 (patch-ab) = 380a7bf1be1293ef21eefdd8b6ca14bf
+MD5 (patch-aa) = 670da1a7a15dc7753b767bde7893dac2
+MD5 (patch-ab) = ecb9e204c48b6f375f3bb727827c5ab5
MD5 (patch-ac) = 4e9b4470df7e95646c62d7f8fd25fed8
MD5 (patch-ad) = c0ce62d0b18c7df1889002fd12577afe
MD5 (patch-ae) = 314d5193f368a26322953f94f498849e
@@ -9,9 +9,7 @@ MD5 (patch-af) = 981665519686a86a1e6cbaeb5f915836
MD5 (patch-ag) = 75603787951f1d56abbbbdcca0ea92db
MD5 (patch-ah) = 8d39dc019cf603ebf3c3dd1792399d59
MD5 (patch-ak) = 35638f7dc4dd55a5541dd3832afb40fc
-MD5 (patch-an) = 900bea40df1e484e7383400f11270f0f
-MD5 (patch-ao) = 2fa45b0737735d717ba682441677ebba
-MD5 (patch-ap) = 166a4fe39980f1e67ae36f7189b5ce16
-MD5 (patch-aq) = 515c59ff13d9941cbb8ce64f55e909ae
-MD5 (patch-ar) = a7a5214d3ed360d81943dfbc68aaabdd
+MD5 (patch-an) = 255f1e20c203f235ba08c4f033270894
MD5 (patch-as) = 20be7c0d85e10335af47eb2c6c0f0769
+MD5 (patch-at) = a818ff1add05b59f341b5ec7ebdae023
+MD5 (patch-au) = 8ba64c58699400d1ef61149f75b907a9
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
index 6fba5e30880..02564b398b7 100644
--- a/net/arla/patches/patch-aa
+++ b/net/arla/patches/patch-aa
@@ -1,16 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2000/10/18 16:32:58 wennmach Exp $
Do not add a path to the library search path (-L) to find libsl.a. This will
find kth-krb4's sl library, which is the wrong one.
---- appl/fs/Makefile.in.orig Mon May 29 19:09:12 2000
-+++ appl/fs/Makefile.in Mon May 29 19:10:11 2000
-@@ -55,7 +55,7 @@
- -L../../rx -lrx \
- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
- -L../../lib/ko -lko -L../../util -lutil \
+--- appl/fs/Makefile.in.orig Wed Oct 11 21:19:59 2000
++++ appl/fs/Makefile.in Wed Oct 18 16:13:28 2000
+@@ -50,14 +50,15 @@
+ READLINE_lib = @LIB_readline@
+ KAFS_LIBS = @AIX_EXTRA_KAFS@ @KAFS_LIBS@
+ LIB_tgetent = @LIB_tgetent@
+-LIBS = -L../lib -larlalib \
+- -L../../rxdef -lrxdefclient \
+- -L../../rx -lrx \
+- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+- -L../../lib/ko -lko -L../../util -lutil \
- -L../../lib/sl -lsl \
++LIBS = ../lib/libarlalib.a \
++ ../../rxdef/librxdefclient.a \
++ ../../rx/librx.a \
++ ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
++ ../../lib/ko/libko.a \
++ ../../util/libutil.a \
+ ../../lib/sl/libsl.a \
- -L../../lib/roken \
$(READLINE_lib) \
+- -L../../lib/roken -lroken \
++ ../../lib/roken/libroken.a \
+ $(RXKAD_LIBS) \
+ $(KAFS_LIBS) \
$(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
index 7392d29fbdc..a86d918a2cb 100644
--- a/net/arla/patches/patch-ab
+++ b/net/arla/patches/patch-ab
@@ -1,16 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2000/10/18 16:32:58 wennmach Exp $
Do not add a path to the library search path (-L) to find libsl.a. This will
find kth-krb4's sl library, which is the wrong one.
---- appl/vos/Makefile.in.orig Mon May 29 19:16:56 2000
-+++ appl/vos/Makefile.in Mon May 29 19:17:40 2000
-@@ -55,7 +55,7 @@
- -L../../rx -lrx \
- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
- -L../../lib/ko -lko -L../../util -lutil \
+
+--- appl/vos/Makefile.in.orig Wed Oct 11 21:20:05 2000
++++ appl/vos/Makefile.in Wed Oct 18 16:18:43 2000
+@@ -50,14 +50,15 @@
+ READLINE_lib = @LIB_readline@
+ KAFS_LIBS = @AIX_EXTRA_KAFS@ @KAFS_LIBS@
+ LIB_tgetent = @LIB_tgetent@
+-LIBS = -L../lib -larlalib \
+- -L../../rxdef -lrxdefclient \
+- -L../../rx -lrx \
+- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+- -L../../lib/ko -lko -L../../util -lutil \
- -L../../lib/sl -lsl \
++LIBS = ../lib/libarlalib.a \
++ ../../rxdef/librxdefclient.a \
++ ../../rx/librx.a \
++ ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
++ ../../lib/ko/libko.a \
++ ../../util/libutil.a \
+ ../../lib/sl/libsl.a \
- -L../../lib/roken \
$(READLINE_lib) \
+- -L../../lib/roken -lroken \
++ ../../lib/roken/libroken.a \
+ $(RXKAD_LIBS) \
+ $(KAFS_LIBS) \
$(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-an b/net/arla/patches/patch-an
index 2140c4580be..43ae1416b56 100644
--- a/net/arla/patches/patch-an
+++ b/net/arla/patches/patch-an
@@ -1,16 +1,30 @@
-$NetBSD: patch-an,v 1.1 2000/08/15 16:08:27 wennmach Exp $
+$NetBSD: patch-an,v 1.2 2000/10/18 16:32:58 wennmach Exp $
Do not add a path to the library search path (-L) to find libsl.a. This will
find kth-krb4's sl library, which is the wrong one.
---- appl/bos/Makefile.in.orig Mon Jun 5 22:55:16 2000
-+++ appl/bos/Makefile.in Wed Aug 9 16:34:58 2000
-@@ -55,7 +55,7 @@
- -L../../rx -lrx \
- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
- -L../../lib/ko -lko -L../../util -lutil \
+--- appl/bos/Makefile.in.orig Wed Oct 11 21:19:57 2000
++++ appl/bos/Makefile.in Wed Oct 18 16:23:34 2000
+@@ -50,14 +50,15 @@
+ READLINE_lib = @LIB_readline@
+ KAFS_LIBS = @AIX_EXTRA_KAFS@ @KAFS_LIBS@
+ LIB_tgetent = @LIB_tgetent@
+-LIBS = -L../lib -larlalib \
+- -L../../rxdef -lrxdefclient \
+- -L../../rx -lrx \
+- -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+- -L../../lib/ko -lko -L../../util -lutil \
- -L../../lib/sl -lsl \
++LIBS = ../lib/libarlalib.a \
++ ../../rxdef/librxdefclient.a \
++ ../../rx/librx.a \
++ ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
++ ../../lib/ko/libko.a \
++ ../../util/libutil.a \
+ ../../lib/sl/libsl.a \
- -L../../lib/roken \
$(READLINE_lib) \
+- -L../../lib/roken -lroken \
++ ../../lib/roken/libroken.a \
+ $(RXKAD_LIBS) \
+ $(KAFS_LIBS) \
$(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ao b/net/arla/patches/patch-ao
deleted file mode 100644
index 0daa46d65f9..00000000000
--- a/net/arla/patches/patch-ao
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/08/22 15:08:45 wennmach Exp $
-
-Deal with a potential deadlock situation, which may arise when writing back
-data from a vnode failed because the ticket expired in the meantime.
-From arla-current, thanks to Assar and Love.
-
-Index: xfs_vnodeops-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_vnodeops-common.c,v
-retrieving revision 1.58
-diff -u -w -u -w -r1.58 xfs_vnodeops-common.c
---- xfs/bsd/xfs_vnodeops-common.c 2000/08/02 00:58:09 1.58
-+++ xfs/bsd/xfs_vnodeops-common.c 2000/08/17 00:30:23
-@@ -260,8 +260,17 @@
- return 0;
- }
-
-- if (xn->flags & XFS_DATA_DIRTY)
-+ if (xn->flags & XFS_DATA_DIRTY) {
-+#ifdef FSYNC_RECLAIM
-+ /* writing back the data from this vnode failed */
-+ if (waitfor & FSYNC_RECLAIM) {
-+ printf("xfs_fsync: data lost, failed to write back\n");
-+ xn->flags &= ~XFS_DATA_DIRTY;
-+ return 0;
-+ }
-+#endif
- error = do_fsync(xfsp, xn, cred, proc, XFS_WRITE | XFS_FSYNC);
-+ }
-
- return error;
- }
-@@ -907,8 +916,9 @@
- /* xn->cred not set -> NOCRED */
-
- error = xfs_fsync_common(vp, xn->cred, /* XXX */ 0, p);
-- if (error)
-- XFSDEB(XDEBVNOPS, ("xfs_inactive: fsync failed: %d\n", error));
-+ if (error) {
-+ printf ("xfs_inactive: failed writing back data: %d\n", error);
-+ }
-
- #ifndef __osf__
- xfs_vfs_unlock(vp, p);
diff --git a/net/arla/patches/patch-ap b/net/arla/patches/patch-ap
deleted file mode 100644
index ef938da51a8..00000000000
--- a/net/arla/patches/patch-ap
+++ /dev/null
@@ -1,283 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/08/22 15:08:45 wennmach Exp $
-
-Avoid deadlock situation.
-From arla-current via Assar and Love.
-
-Index: xfs_dev-bsd.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_dev-bsd.c,v
-retrieving revision 1.24
-diff -u -w -r1.24 xfs_dev-bsd.c
---- xfs/bsd/xfs_dev-bsd.c 2000/07/22 03:59:04 1.24
-+++ xfs/bsd/xfs_dev-bsd.c 2000/08/19 10:16:51
-@@ -50,7 +50,7 @@
- {
- XFSDEB(XDEBDEV, ("xfsopen dev = %d.%d, flag = %d, devtype = %d\n",
- major(dev), minor(dev), flag, devtype));
-- return xfs_devopen_common(dev);
-+ return xfs_devopen_common(dev, proc);
- }
-
- int
-Index: xfs_dev-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_dev-common.c,v
-retrieving revision 1.39
-diff -u -w -r1.39 xfs_dev-common.c
---- xfs/bsd/xfs_dev-common.c 2000/07/17 16:23:47 1.39
-+++ xfs/bsd/xfs_dev-common.c 2000/08/19 10:27:35
-@@ -92,7 +92,7 @@
- * Only allow one open.
- */
- int
--xfs_devopen_common(dev_t dev)
-+xfs_devopen_common(dev_t dev, struct proc *p)
- {
- struct xfs_channel *chan;
-
-@@ -105,8 +105,10 @@
- if (chan->status & CHANNEL_OPENED) {
- XFSDEB(XDEBDEV, ("xfs_devopen: already open\n"));
- return EBUSY;
-- } else
-+ } else {
- chan->status |= CHANNEL_OPENED;
-+ chan->proc = p;
-+ }
-
- chan->message_buffer = xfs_alloc(MAX_XMSG_SIZE);
-
-@@ -372,7 +374,8 @@
- */
-
- int
--xfs_message_rpc(int fd, struct xfs_message_header * message, u_int size)
-+xfs_message_rpc(int fd, struct xfs_message_header * message, u_int size,
-+ struct proc *proc)
- {
- int ret;
- struct xfs_channel *chan = &xfs_channel[fd];
-Index: xfs_dev-osf.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_dev-osf.c,v
-retrieving revision 1.7
-diff -u -w -r1.7 xfs_dev-osf.c
---- xfs/bsd/xfs_dev-osf.c 2000/03/18 00:51:40 1.7
-+++ xfs/bsd/xfs_dev-osf.c 2000/08/19 10:17:25
-@@ -51,7 +51,7 @@
- {
- XFSDEB(XDEBDEV, ("xfsopen dev = %d.%d, flag = %d, format = %d\n",
- major(dev), minor(dev), flag, format));
-- return xfs_devopen_common(dev);
-+ return xfs_devopen_common(dev, u.u_procp);
- }
-
- static int
-Index: xfs_syscalls-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_syscalls-common.c,v
-retrieving revision 1.51
-diff -u -w -r1.51 xfs_syscalls-common.c
---- xfs/bsd/xfs_syscalls-common.c 2000/08/02 00:06:16 1.51
-+++ xfs/bsd/xfs_syscalls-common.c 2000/08/19 10:23:15
-@@ -462,7 +462,7 @@
- msg.cred.uid = xfs_proc_to_ruid(p);
- msg.cred.pag = xfs_get_pag(xfs_proc_to_cred(p));
-
-- error = xfs_message_rpc(0, &msg.header, sizeof(msg)); /* XXX */
-+ error = xfs_message_rpc(0, &msg.header, sizeof(msg), p); /* XXX */
- msg2 = (struct xfs_message_wakeup_data *) &msg;
-
- if (error == 0)
-Index: xfs_vfsops-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_vfsops-common.c,v
-retrieving revision 1.27
-diff -u -w -r1.27 xfs_vfsops-common.c
---- xfs/bsd/xfs_vfsops-common.c 2000/08/01 20:36:56 1.27
-+++ xfs/bsd/xfs_vfsops-common.c 2000/08/19 10:23:23
-@@ -240,7 +240,7 @@
- msg.header.opcode = XFS_MSG_GETROOT;
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = xfs_get_pag(cred);
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), proc);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- } while (error == 0);
-Index: xfs_vnodeops-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_vnodeops-common.c,v
-retrieving revision 1.59
-diff -u -w -r1.59 xfs_vnodeops-common.c
---- xfs/bsd/xfs_vnodeops-common.c 2000/08/17 00:38:36 1.59
-+++ xfs/bsd/xfs_vnodeops-common.c 2000/08/19 10:28:19
-@@ -71,7 +71,7 @@
- msg.handle = xn->handle;
- msg.tokens = tok;
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
-
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-@@ -103,7 +103,7 @@
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = pag;
- msg.handle = xn->handle;
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- } else {
-@@ -132,7 +132,7 @@
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = pag;
- msg.handle = xn->handle;
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- } else {
-@@ -163,7 +163,7 @@
- msg.handle = xn->handle;
- msg.tokens = tok;
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
-
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-@@ -229,7 +229,7 @@
- vattr2xfs_attr(&xn->attr, &msg.attr);
- msg.flag = flag;
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
-
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-@@ -432,7 +432,7 @@
- }
-
- XFS_TOKEN_CLEAR(xn, XFS_ATTR_VALID, XFS_ATTR_MASK);
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- }
-@@ -552,7 +552,7 @@
- bcopy(cnp->cn_nameptr, msg.name, cnp->cn_namelen);
- msg.name[cnp->cn_namelen] = '\0';
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), proc);
-
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-@@ -603,7 +603,7 @@
- }
-
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
-
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-@@ -637,7 +637,7 @@
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = xfs_get_pag(cred);
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) &msg)->error;
-
-@@ -685,7 +685,7 @@
- strncpy(msg.new_name, tname, 256);
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = xfs_get_pag(cred);
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) &msg)->error;
-
-@@ -722,7 +722,7 @@
- msg.cred.uid = 0;
- msg.cred.pag = XFS_ANONYMOUSID;
- }
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- }
-@@ -749,7 +749,7 @@
- strncpy(msg.name, name, 256);
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = xfs_get_pag(cred);
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) &msg)->error;
-
-@@ -823,7 +823,7 @@
- msg.cred.uid = cred->cr_uid;
- msg.cred.pag = xfs_get_pag(cred);
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-
-@@ -857,7 +857,7 @@
- strncpy (msg.contents, target, sizeof(msg.contents));
- msg.contents[sizeof(msg.contents) - 1] = '\0';
-
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), proc);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
-
-@@ -998,7 +998,7 @@
- msg.cred.uid = 0;
- msg.cred.pag = XFS_ANONYMOUSID;
- }
-- error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg));
-+ error = xfs_message_rpc(xfsp->fd, &msg.header, sizeof(msg), p);
- if (error == 0)
- error = ((struct xfs_message_wakeup *) & msg)->error;
- }
-Index: xfs/xfs_dev.h
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs/xfs_dev.h,v
-retrieving revision 1.13
-diff -u -w -r1.13 xfs_dev.h
---- xfs/bsd/xfs/xfs_dev.h 2000/04/02 21:28:24 1.13
-+++ xfs/bsd/xfs/xfs_dev.h 2000/08/19 10:26:53
-@@ -68,6 +68,7 @@
- int status;
- #define CHANNEL_OPENED 0x1
- #define CHANNEL_WAITING 0x2
-+ struct proc *proc;
- };
-
- extern struct xfs_channel xfs_channel[NXFS];
-@@ -108,7 +109,7 @@
- xfs_outq(struct xfs_link *p);
-
- int
--xfs_devopen_common(dev_t dev);
-+xfs_devopen_common(dev_t dev, struct proc *);
-
- #ifndef __osf__ /* XXX - we should do the same for osf */
- int xfs_devopen(dev_t dev, int flag, int devtype, struct proc *proc);
-@@ -131,7 +132,8 @@
- xfs_message_send(int fd, struct xfs_message_header * message, u_int size);
-
- int
--xfs_message_rpc(int fd, struct xfs_message_header * message, u_int size);
-+xfs_message_rpc(int fd, struct xfs_message_header * message, u_int size,
-+ struct proc *p);
-
- int
- xfs_message_receive(int fd,
diff --git a/net/arla/patches/patch-aq b/net/arla/patches/patch-aq
deleted file mode 100644
index 0f1499848a7..00000000000
--- a/net/arla/patches/patch-aq
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/08/22 15:08:45 wennmach Exp $
-
-Avoid deadlock situation.
-From arla-current via Assar and Love.
-
-Index: xfs_dev-common.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_dev-common.c,v
-retrieving revision 1.39
-diff -u -w -u -w -r1.39 xfs_dev-common.c
---- xfs/bsd/xfs_dev-common.c 2000/07/17 16:23:47 1.39
-+++ xfs/bsd/xfs_dev-common.c 2000/08/20 04:25:33
-@@ -383,12 +386,19 @@
- sigset_t oldsigmask;
- #endif /* HAVE_STRUCT_PROC_P_SIGMASK */
- int catch;
-- struct proc *proc = xfs_curproc ();
-
- XFSDEB(XDEBMSG, ("xfs_message_rpc opcode = %d\n", message->opcode));
-
-+ if (proc == NULL)
-+ proc = xfs_curproc();
-+
- if (!(chan->status & CHANNEL_OPENED)) /* No receiver? */
- return ENODEV;
-+
-+ if (proc->p_pid == chan->proc->p_pid) {
-+ printf("xfs_message_rpc: deadlock avoided\n");
-+ return EDEADLK;
-+ }
-
- if (size < sizeof(struct xfs_message_wakeup)) {
- printf("XFS PANIC Error: Message to small to receive wakeup, opcode = %d\n", message->opcode);
-
diff --git a/net/arla/patches/patch-ar b/net/arla/patches/patch-ar
deleted file mode 100644
index 55e5cd5d581..00000000000
--- a/net/arla/patches/patch-ar
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/08/30 13:04:00 wennmach Exp $
-
-Remove all "%" characters in front of register names to make our
-m68k assembler happy.
-
---- lwp/process.m68k.S.orig Wed Aug 30 14:46:46 2000
-+++ lwp/process.m68k.S Wed Aug 30 14:52:32 2000
-@@ -75,19 +75,19 @@
-
- ENTRY(savecontext)
- movb #1,_C_LABEL(PRE_Block) | Dont allow any interrupt finagling
-- link %a6,#-(nregs*4) | Save frame pointer & ...
-+ link a6,#-(nregs*4) | Save frame pointer & ...
- | ... allocate space for nregs registers
- /* Save registers */
-- moveml #regs,%sp@
-+ moveml #regs,sp@
-
-- movl %a6@(area1),%a0 | a0 = base of savearea
-- movl %sp,%a0@(topstack) | area->topstack = sp
-- movl %a6@(newsp),%d0 | Get new sp
-+ movl a6@(area1),a0 | a0 = base of savearea
-+ movl sp,a0@(topstack) | area->topstack = sp
-+ movl a6@(newsp),d0 | Get new sp
- jeq forw1 | If newsp == 0, no stack switch
-- movl %d0,%sp | Switch to new stack
-+ movl d0,sp | Switch to new stack
- forw1:
-- movl %a6@(f),%a0 | a0 = f
-- jbsr %a0@ | f()
-+ movl a6@(f),a0 | a0 = f
-+ jbsr a0@ | f()
-
- /* It is impossible to be here, so abort() */
-
-@@ -102,14 +102,14 @@
- area2 = 8
-
- ENTRY(returnto)
-- link %a6,#0
-- movl %a6@(area2),%a0 | Base of savearea
-- movl %a0@(topstack),%sp | Restore sp
-+ link a6,#0
-+ movl a6@(area2),a0 | Base of savearea
-+ movl a0@(topstack),sp | Restore sp
- /* Restore registers */
-- moveml %sp@,#regs
-+ moveml sp@,#regs
-
-- addl #(nregs*4),%sp
-- movl %sp,%a6 | Argghh...be careful here
-- unlk %a6
-+ addl #(nregs*4),sp
-+ movl sp,a6 | Argghh...be careful here
-+ unlk a6
- clrb _C_LABEL(PRE_Block)
- rts | Return to previous process
diff --git a/net/arla/patches/patch-at b/net/arla/patches/patch-at
new file mode 100644
index 00000000000..7a4d97b07ca
--- /dev/null
+++ b/net/arla/patches/patch-at
@@ -0,0 +1,24 @@
+$NetBSD: patch-at,v 1.1 2000/10/18 16:32:59 wennmach Exp $
+
+Set up proper path to the LKM for startarla.
+
+--- xfs/bsd/bin/Makefile.in.orig Wed Oct 18 16:50:31 2000
++++ xfs/bsd/bin/Makefile.in Wed Oct 18 16:53:41 2000
+@@ -19,6 +19,7 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ bindir = @bindir@
++lkmdir = @prefix@/lkm
+ transform = @program_transform_name@
+ ARLACACHEDIR = @ARLACACHEDIR@
+
+@@ -52,7 +53,9 @@
+ $(RM) -f $(PROGRAMS) startarla *.o *~
+
+ startarla: startarla.in
+- sed -e ' s!%bindir%!$(bindir)! ; s!%ARLACACHEDIR%!$(ARLACACHEDIR)!' $(srcdir)/startarla.in > $@.new
++ sed -e 's!%bindir%!$(bindir)!' \
++ -e 's!%ARLACACHEDIR%!$(ARLACACHEDIR)!' \
++ -e 's!%lkmdir%!$(lkmdir)!' startarla.in > $@.new
+ mv $@.new $@
+ chmod +x $@
diff --git a/net/arla/patches/patch-au b/net/arla/patches/patch-au
new file mode 100644
index 00000000000..6d1b83217d9
--- /dev/null
+++ b/net/arla/patches/patch-au
@@ -0,0 +1,24 @@
+$NetBSD: patch-au,v 1.1 2000/10/18 16:32:59 wennmach Exp $
+
+We choose to install LKMs into $prefix/lkm, so we have to pay the price
+now and change startarla.
+
+--- xfs/bsd/bin/startarla.in.orig Wed Oct 18 16:54:09 2000
++++ xfs/bsd/bin/startarla.in Wed Oct 18 16:55:09 2000
+@@ -12,6 +12,7 @@
+ PATH="/sbin:/usr/sbin:/usr/bin:/bin:%bindir%"
+ BINDIR=%bindir%
+ CACHEDIR=%ARLACACHEDIR%
++LKMDIR=%lkmdir%
+
+ if [ ! -e $CACHEDIR ] ; then
+ mkdir $CACHEDIR
+@@ -27,7 +28,7 @@
+ elif [ -x /sbin/kmodload ]; then
+ kmodload $BINDIR/xfs_mod.o
+ else
+- modload -e xfs_mod -p $BINDIR/xfs_makedev $BINDIR/xfs_mod.o
++ modload -e xfs_mod -p $BINDIR/xfs_makedev $LKMDIR/xfs_mod.o
+ fi
+ test -d /afs || mkdir /afs
+ mount_xfs /dev/xfs0 /afs
diff --git a/net/arla/pkg/PLIST b/net/arla/pkg/PLIST
index 40151b1ac34..155c18fc415 100644
--- a/net/arla/pkg/PLIST
+++ b/net/arla/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/17 13:10:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/10/18 16:32:59 wennmach Exp $
include/atypes.h
include/fs_errors.h
include/base64.h
@@ -11,6 +11,7 @@ include/arla-roken.h
include/lock.h
include/preempt.h
include/timer.h
+include/rtbl.h
include/rx/rx.h
include/rx/rx_clock.h
include/rx/rx_event.h
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 11:04:40 +0000