summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwennmach <wennmach@pkgsrc.org>2002-09-23 14:37:18 +0000
committerwennmach <wennmach@pkgsrc.org>2002-09-23 14:37:18 +0000
commit80530d2731ceff841cd7ce4676e99ff301c704d9 (patch)
tree20d7d340c271fa0197b0c8a0fc5e02740efcd8ca
parent99fdb92ec87bb6eb57b79b4b3fa43e28ecc28049 (diff)
downloadpkgsrc-80530d2731ceff841cd7ce4676e99ff301c704d9.tar.gz
Fix a problem with VOP_PUTPAGES on NetBSD-1.6 (via patch from
Love <lha@netbsd.org>). Also, don't try to remove the top-level "lkm" directory on pkg_delete.
-rw-r--r--net/arla/Makefile3
-rw-r--r--net/arla/PLIST3
-rw-r--r--net/arla/distinfo3
-rw-r--r--net/arla/patches/patch-bt18
4 files changed, 23 insertions, 4 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile
index cd681eb185b..d45dc12199f 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/08/20 17:47:40 wennmach Exp $
+# $NetBSD: Makefile,v 1.25 2002/09/23 14:37:18 wennmach Exp $
#
DISTNAME= arla-0.35.9
+PKGREVISION= 1
CATEGORIES= net security
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/
diff --git a/net/arla/PLIST b/net/arla/PLIST
index 8678a7e4106..0ee4710f07d 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/08/20 17:47:40 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/09/23 14:37:18 wennmach Exp $
bin/aklog
bin/amon
bin/bos
@@ -117,6 +117,5 @@ share/examples/arla/services
@unexec /bin/rm -rf ${ARLA_CACHE}
@unexec /bin/rm -f /sbin/mount_xfs
@dirrm share/examples/arla
-@dirrm lkm
@dirrm include/rx
@dirrm include/afs
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 7ae196b2934..8c58e5092c9 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/20 17:47:40 wennmach Exp $
+$NetBSD: distinfo,v 1.7 2002/09/23 14:37:18 wennmach Exp $
SHA1 (arla-0.35.9.tar.gz) = e61f73dced5ec2951d7f0641bfdd6e1acb2cacaa
Size (arla-0.35.9.tar.gz) = 1341786 bytes
@@ -26,3 +26,4 @@ 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-bt b/net/arla/patches/patch-bt
new file mode 100644
index 00000000000..911e5c5e3c2
--- /dev/null
+++ b/net/arla/patches/patch-bt
@@ -0,0 +1,18 @@
+# $NetBSD: patch-bt,v 1.1 2002/09/23 14:37:19 wennmach 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 */
+