diff options
Diffstat (limited to 'net/arla')
| -rw-r--r-- | net/arla/MESSAGE | 5 | ||||
| -rw-r--r-- | net/arla/Makefile | 8 | ||||
| -rw-r--r-- | net/arla/PLIST | 5 | ||||
| -rw-r--r-- | net/arla/distinfo | 10 | ||||
| -rw-r--r-- | net/arla/patches/patch-ah | 35 | ||||
| -rw-r--r-- | net/arla/patches/patch-ak | 46 | ||||
| -rw-r--r-- | net/arla/patches/patch-bt | 18 |
7 files changed, 25 insertions, 102 deletions
diff --git a/net/arla/MESSAGE b/net/arla/MESSAGE index 0ce9abfa0ee..0a9f649145a 100644 --- a/net/arla/MESSAGE +++ b/net/arla/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/09/25 00:06:34 jlam Exp $ +$NetBSD: MESSAGE,v 1.4 2003/01/14 12:00:08 wennmach Exp $ Arla now has been installed on your system. @@ -25,7 +25,8 @@ At a minimum, to configure an arla client, copy: ${PREFIX}/share/examples/arla.conf to ${PKG_SYSCONFDIR} and customize them, include an entry for xfs in your -/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), append: +/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), append (only on +NetBSD releases prior to 1.6): ${PREFIX}/share/examples/arla/services diff --git a/net/arla/Makefile b/net/arla/Makefile index b6c9c53de09..85a453a9903 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2002/12/07 02:38:59 schmonz Exp $ +# $NetBSD: Makefile,v 1.30 2003/01/14 12:00:08 wennmach Exp $ -DISTNAME= arla-0.35.9 -PKGREVISION= 2 +DISTNAME= arla-0.35.12pre1 +#PKGREVISION= CATEGORIES= net security -MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/ +MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/snap/ MAINTAINER= wennmach@netbsd.org HOMEPAGE= http://www.stacken.kth.se/project/arla/ diff --git a/net/arla/PLIST b/net/arla/PLIST index ad826299c43..f0b1b67da43 100644 --- a/net/arla/PLIST +++ b/net/arla/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.11 2002/12/07 15:38:48 cjep Exp $ +@comment $NetBSD: PLIST,v 1.12 2003/01/14 12:00:09 wennmach Exp $ bin/aklog bin/amon bin/bos bin/fs bin/kalog -bin/klog bin/pts bin/rxdebug bin/themis @@ -78,7 +77,6 @@ lkm/xfs_mod.o man/man1/aklog.1 man/man1/fs.1 man/man1/kalog.1 -man/man1/klog.1 man/man1/pts.1 man/man1/rxdebug.1 man/man1/themis.1 @@ -110,6 +108,5 @@ share/examples/arla/fstab share/examples/arla/lkm.conf share/examples/arla/services @dirrm share/examples/arla -@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE} @dirrm include/rx @dirrm include/afs diff --git a/net/arla/distinfo b/net/arla/distinfo index c559f50be47..af48fd98251 100644 --- a/net/arla/distinfo +++ b/net/arla/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.9 2002/10/07 19:01:24 wennmach Exp $ +$NetBSD: distinfo,v 1.10 2003/01/14 12:00:09 wennmach Exp $ -SHA1 (arla-0.35.9.tar.gz) = e61f73dced5ec2951d7f0641bfdd6e1acb2cacaa -Size (arla-0.35.9.tar.gz) = 1341786 bytes +SHA1 (arla-0.35.12pre1.tar.gz) = 474b5aa955dc2f2caaba2f30f2c709fafa07267c +Size (arla-0.35.12pre1.tar.gz) = 1355699 bytes SHA1 (patch-ac) = a1d725edea6aaf3711c0d62a5ab5acd84d5fe4b7 SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6 SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e SHA1 (patch-af) = 90b230d2f462a01528c157352e257e3c3e58c7b5 -SHA1 (patch-ah) = 8386d4062aedbfe24c66cad84cfdcf3a2617848e -SHA1 (patch-ak) = f48e7885a87cb4eda21ff11e933165806a598302 +SHA1 (patch-ah) = 5d27207a6acd83be222d1d7b1df3a660e14de1a9 SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63 SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f SHA1 (patch-bd) = b57dceb3e40b82c199c599152b5273cd2555dbe8 @@ -26,4 +25,3 @@ SHA1 (patch-bp) = 36da1e63e93c54be548c65a1ba79fd43f89c9df8 SHA1 (patch-bq) = 1add9568dbe3fec36960bcaccba8329cb5988fb0 SHA1 (patch-br) = 8862fc87d0aa5fa316f1c3a84dfc29e06cacb562 SHA1 (patch-bs) = 93ecb3788f9d057ad7dd00864fcf049e222fd636 -SHA1 (patch-bt) = 5eda4b9ce8af8c84375e805fc7a6681e4e806b5e diff --git a/net/arla/patches/patch-ah b/net/arla/patches/patch-ah index 8a7ad9b1905..4c136a83603 100644 --- a/net/arla/patches/patch-ah +++ b/net/arla/patches/patch-ah @@ -1,45 +1,36 @@ -$NetBSD: patch-ah,v 1.2 2000/08/15 16:08:25 wennmach Exp $ +$NetBSD: patch-ah,v 1.3 2003/01/14 12:00:09 wennmach Exp $ Install xfs_mod.o into $(lkmdir), not $(bindir). Do not strip xfs_mod.o while installing it. ---- xfs/bsd/Makefile.in.orig Thu Jun 22 04:24:42 2000 -+++ xfs/bsd/Makefile.in Wed Aug 9 16:09:04 2000 -@@ -18,6 +18,7 @@ +--- xfs/bsd/Makefile.in.orig Fri Jan 10 14:18:09 2003 ++++ xfs/bsd/Makefile.in Fri Jan 10 14:22:48 2003 +@@ -19,6 +19,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_LKM = ${INSTALL_PROGRAM:C/-s//} ++INSTALL_LKMD = ${INSTALL_PROGRAM:C/-s//} INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs -@@ -26,6 +27,7 @@ +@@ -27,6 +28,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ bindir = @bindir@ -+lkmdir = $(exec_prefix)/lkm ++lkmdir = $(exec_prefix)/lkm transform = @program_transform_name@ EXECSUFFIX = @EXECSUFFIX@ -@@ -111,10 +113,10 @@ - ./bin/umount_xfs /afs +@@ -117,10 +119,10 @@ + $(INSTALL_DATA) Info.plist $(KEXTDIR)/Contents - install: all + install-bsd: - $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + $(MKINSTALLDIRS) $(DESTDIR)$(lkmdir) PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \ f=`echo $$x | sed '$(transform)'`; \ - $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \ -+ $(INSTALL_LKM) $$x $(DESTDIR)$(lkmdir)/$$f; \ ++ $(INSTALL_LKMD) $$x $(DESTDIR)$(lkmdir)/$$f; \ done - for i in lkm subsys modules; do \ - if test -d /$$i; then \ -@@ -126,7 +128,7 @@ - uninstall: - PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \ - f=`echo $$x | sed '$(transform)'`; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ rm -f $(DESTDIR)$(lkmdir)/$$f; \ - done - for i in lkm subsys modules; do \ - if test -d /$$i; then \ + + install: all $(INSTALL_LKM) diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak deleted file mode 100644 index 85f4e22725e..00000000000 --- a/net/arla/patches/patch-ak +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ak,v 1.4 2002/10/07 19:01:25 wennmach Exp $ - -Make arla work on -current (post NetBSD 1.6). - -Do not print a cryptic message after xfs_mod has been modloaded, say it -in clear text. - ---- xfs/bsd/xfs_wrap-bsd.c.~1.33.~ Mon Sep 30 21:58:30 2002 -+++ xfs/bsd/xfs_wrap-bsd.c Mon Sep 30 22:22:24 2002 -@@ -31,6 +31,8 @@ - * SUCH DAMAGE. - */ - -+#include <arla-version.h> -+ - #include <xfs/xfs_locl.h> - #include <xfs/xfs_message.h> - #include <xfs/xfs_fs.h> -@@ -205,7 +207,9 @@ - #elif defined(__FreeBSD__) - MOD_DEV(xfs,LM_DT_CHAR,-1,&xfs_dev); - #else --#if !defined(__APPLE__) -+#if __NetBSD_Version__ >= 106080000 -+MOD_DEV("xfs_mod","xfs_mod", NULL, -1, &xfs_dev, -1) -+#elif !defined(__APPLE__) - MOD_DEV("xfs_mod",LM_DT_CHAR,-1,&xfs_dev) - #endif - #endif -@@ -302,8 +306,14 @@ - } - ret = lkmdispatch(lkmtp, cmd); - if(cmd == LKM_E_LOAD) { -+#if __NetBSD_Version__ >= 106080000 -+ xfs_dev_major = _module.lkm_cdevmaj; -+#else - xfs_dev_major = _module.lkm_offset; -- printf ("xfs: cdev: %d, syscall: %d\n", -+#endif -+ printf ("xfs (%s): " -+ "using cdev: %d, syscall: %d\n", -+ arla_version, - xfs_dev_major, xfs_syscall_num); - } - return ret; - diff --git a/net/arla/patches/patch-bt b/net/arla/patches/patch-bt deleted file mode 100644 index 241f55c99b0..00000000000 --- a/net/arla/patches/patch-bt +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bt,v 1.2 2002/12/23 18:28:20 cjep Exp $ - -Fix a problem with VOP_PUTPAGES on NetBSD-1.6. From Love <lha@netbsd.org>. - -diff -u -u -w -r1.87.2.8 -r1.87.2.9 ---- xfs/bsd/xfs_vnodeops-bsd.c 2002/08/02 07:46:57 1.87.2.8 -+++ xfs/bsd/xfs_vnodeops-bsd.c 2002/09/22 15:25:40 1.87.2.9 -@@ -974,6 +974,9 @@ - - XFSDEB(XDEBVNOPS, ("xfs_putpages\n")); - -+ if (t == NULL) -+ return 0; -+ - xn->flags |= XFS_DATA_DIRTY; - - #ifdef HAVE_STRUCT_VOP_PUTPAGES_ARGS_A_SYNC /* FreeBSD-style */ - |