Update OpenAFS to 1.3.84. They applied all the patches we were using, so

we can remove them.  Also set up the data directories in ${VARBASE} properly.

For UNIX, 1.3.84 is the latest version in the 1.4 release cycle.
Notable recent improvements are included in Linux 2.6 client support.
A bug affecting all kernel modules which was present in the released
1.3.83 is also fixed.

9 files changed, 14 insertions, 185 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index b67b564b990..11b2cf522a3 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/06/06 03:07:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/06 17:08:20 gendalia Exp $
 
-DISTNAME=	openafs-1.3.82-src
+DISTNAME=	openafs-1.3.84-src
 PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	net sysutils
-MASTER_SITES=	http://www.openafs.org/dl/openafs/1.3.82/
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.3.84/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	gendalia@NetBSD.org
@@ -14,7 +14,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-largefile-fileserver --enable-fast-restart
 CONFIGURE_ARGS+= --enable-bitmap-later --disable-kernel-module
 CONFIGURE_ARGS+= --enable-debug --enable-bos-new-config
-CONFIGURE_ARGS+= --enable-namei-fileserver --prefix=${PREFIX}/openafs
+CONFIGURE_ARGS+= --enable-namei-fileserver
+CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
 
 USE_GNU_CONFIGURE_HOST= no
 
@@ -24,6 +25,8 @@ PKG_SUPPORTED_OPTIONS = pam
 PKG_OPTIONS_VAR       = PKG_OPTIONS.openafs
 .include "../../mk/bsd.options.mk"
 
+USE_PKGINSTALL=		yes
+
 .if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=        --enable-pam
 .include "../../mk/pam.buildlink3.mk"
@@ -32,5 +35,8 @@ PLIST_SRC+=		${.CURDIR}/PLIST.pam
 CONFIGURE_ARGS+=        --disable-pam
 .endif
 PLIST_SRC+=		${.CURDIR}/PLIST
+OWN_DIRS+=		${VARBASE}/openafs
+OWN_DIRS+=		${VARBASE}/openafs/db
+OWN_DIRS+=		${VARBASE}/openafs/logs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index d62af766d3f..de7516d8f52 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/05/27 16:44:01 gendalia Exp $
+$NetBSD: distinfo,v 1.4 2005/06/06 17:08:20 gendalia Exp $
 
-SHA1 (openafs-1.3.82-src.tar.bz2) = 05fdc1c1f123f5864ec92c706cab310e13e865cf
-RMD160 (openafs-1.3.82-src.tar.bz2) = 2d778deeed2023a327c6355c1786bf8f169785b9
-Size (openafs-1.3.82-src.tar.bz2) = 10963874 bytes
-SHA1 (patch-aa) = 8137c7f77b63fdc376f464310d84ccc8e491c196
-SHA1 (patch-ab) = 17d17f60eed81c6031f1b00723acb08dde7c0b05
-SHA1 (patch-ac) = 9929b75913a5ffb45ac3f1d6870f6cd8d277417e
-SHA1 (patch-ad) = f86765091ee0ca59e69a551a1777d3198e7a3cb3
-SHA1 (patch-ae) = 2ba1e8e7b615b99027def45b9d3b7aaf871606a2
-SHA1 (patch-af) = d1c28a8921d2252f5576c44ee409ae98216ebc4e
-SHA1 (patch-ag) = a16b0ecea9cb17df25246163208598841efaa564
+SHA1 (openafs-1.3.84-src.tar.bz2) = af4b75363d9ef4172b176d2d7160f7c9b2c3a02f
+RMD160 (openafs-1.3.84-src.tar.bz2) = 16687a71c0678acb9de5b12d77fe3ac67d554013
+Size (openafs-1.3.84-src.tar.bz2) = 10969009 bytes
diff --git a/net/openafs/patches/patch-aa b/net/openafs/patches/patch-aa
deleted file mode 100644
index c2e85424d9b..00000000000
--- a/net/openafs/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/05/03 19:30:40 agc Exp $
-
---- configure	2005/04/16 07:40:21	1.1
-+++ configure	2005/04/16 07:40:51
-@@ -2511,6 +2511,10 @@
- 			AFS_PARAM_COMMON=param.nbsd30.h
- 			AFS_SYSNAME="i386_nbsd30"
- 			;;
-+		i?86-*-netbsd*3.99*)
-+			AFS_PARAM_COMMON=param.nbsd30.h
-+			AFS_SYSNAME="i386_nbsd30"
-+			;;
- 		hppa*-hp-hpux11.0*)
- 			AFS_SYSNAME="hp_ux110"
- 			;;
diff --git a/net/openafs/patches/patch-ab b/net/openafs/patches/patch-ab
deleted file mode 100644
index dc58e7a5c37..00000000000
--- a/net/openafs/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/05/25 22:09:40 gendalia Exp $
-
---- src/pam/Makefile.in.orig	2005-05-24 09:01:47.000000000 -0500
-+++ src/pam/Makefile.in
-@@ -61,7 +61,7 @@ pam_afs.so.1: $(SHOBJS) afs_setcred.o af
- 	*linux*) \
- 		$(CC) $(LDFLAGS) -o $@ afs_setcred.o \
- 			afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
--	*fbsd*) \
-+	*fbsd*| *nbsd*) \
- 		$(CC) $(LDFLAGS) -o $@ afs_setcred.o \
- 			afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
- 	* ) \
-@@ -82,7 +82,7 @@ pam_afs.krb.so.1: $(SHOBJS) afs_setcred_
- 	*linux*) \
- 		$(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \
- 			afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
--	*fbsd*) \
-+	*fbsd*| *nbsd*) \
- 		$(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \
- 			afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\
- 	* ) \
-@@ -98,7 +98,7 @@ test_pam: test_pam.o
- 		$(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \
- 	*linux*) \
- 		$(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam -ldl;; \
--	*fbsd*) \
-+	*fbsd*| *nbsd*) \
- 		$(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam ;; \
- 	*) \
- 		echo No link line for system $(SYS_NAME). ;; \
diff --git a/net/openafs/patches/patch-ac b/net/openafs/patches/patch-ac
deleted file mode 100644
index 836877d71e5..00000000000
--- a/net/openafs/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/05/25 22:09:40 gendalia Exp $
-
---- src/pam/afs_auth.c.orig	2005-05-24 08:59:12.000000000 -0500
-+++ src/pam/afs_auth.c
-@@ -190,7 +190,7 @@ pam_sm_authenticate(pam_handle_t * pamh,
- 	RET(PAM_AUTH_ERR);
-     }
- #else
--#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
-+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
-     upwd = getpwnam(user);
- #else
-     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));
diff --git a/net/openafs/patches/patch-ad b/net/openafs/patches/patch-ad
deleted file mode 100644
index bf0fa7158a2..00000000000
--- a/net/openafs/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/05/25 22:09:40 gendalia Exp $
-
---- src/pam/afs_password.c.orig	2005-05-24 08:59:15.000000000 -0500
-+++ src/pam/afs_password.c
-@@ -134,7 +134,7 @@ pam_sm_chauthtok(pam_handle_t * pamh, in
- 	RET(PAM_AUTH_ERR);
-     }
- #else
--#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
-+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
-     upwd = getpwnam(user);
- #else
-     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));
diff --git a/net/openafs/patches/patch-ae b/net/openafs/patches/patch-ae
deleted file mode 100644
index 1fbcf03afcf..00000000000
--- a/net/openafs/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/05/25 22:09:40 gendalia Exp $
-
---- src/pam/afs_setcred.c.orig	2005-05-24 08:59:17.000000000 -0500
-+++ src/pam/afs_setcred.c
-@@ -170,7 +170,7 @@ pam_sm_setcred(pam_handle_t * pamh, int 
- 	RET(PAM_AUTH_ERR);
-     }
- #else
--#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
-+#if     defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
-     upwd = getpwnam(user);
- #else
-     upwd = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf));
diff --git a/net/openafs/patches/patch-af b/net/openafs/patches/patch-af
deleted file mode 100644
index 653180ab09c..00000000000
--- a/net/openafs/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/05/25 22:09:40 gendalia Exp $
-
---- src/pam/test_pam.c.orig	2005-05-24 08:59:22.000000000 -0500
-+++ src/pam/test_pam.c
-@@ -34,7 +34,7 @@ static const char *service = "afstest";
- static const char *new_envstring = "GOTHEREVIATESTPAM=1";
- static const char *new_homestring = "HOME=/tmp";
- 
--#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV)
-+#if defined(AFS_LINUX20_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_NBSD_ENV)
- #define getpassphrase getpass
- #endif
- 
diff --git a/net/openafs/patches/patch-ag b/net/openafs/patches/patch-ag
deleted file mode 100644
index 72eb735a777..00000000000
--- a/net/openafs/patches/patch-ag
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/05/27 15:51:35 gendalia Exp $
-
-sigwait doesn't get signals from pthread_kill
-
---- src/util/softsig.c.orig	2005-05-27 10:47:01.000000000 -0500
-+++ src/util/softsig.c
-@@ -36,9 +36,9 @@ static pthread_t softsig_tid;
- static struct {
-     void (*handler) (int);
-     int pending;
--#if !defined(AFS_DARWIN60_ENV)
-+#if !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV)
-     int fatal;
--#endif /* !defined(AFS_DARWIN60_ENV) */
-+#endif /* !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) */
-     int inited;
- } softsig_sigs[NSIG];
- 
-@@ -53,17 +53,17 @@ softsig_thread(void *arg)
-     pthread_sigmask(SIG_BLOCK, &ss, &os);
-     pthread_sigmask(SIG_SETMASK, &os, NULL);
-     sigaddset(&ss, SIGUSR1);
--#if defined(AFS_DARWIN60_ENV)
-+#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV)
-     pthread_sigmask (SIG_BLOCK, &ss, NULL);
-     sigdelset (&os, SIGUSR1);
--#else /* !defined(AFS_DARWIN60_ENV) */
-+#else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */
-     for (i = 0; i < NSIG; i++) {
- 	if (!sigismember(&os, i) && i != SIGSTOP && i != SIGKILL) {
- 	    sigaddset(&ss, i);
- 	    softsig_sigs[i].fatal = 1;
- 	}
-     }
--#endif /* defined(AFS_DARWIN60_ENV) */
-+#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
- 
-     while (1) {
- 	void (*h) (int);
-@@ -74,10 +74,10 @@ softsig_thread(void *arg)
- 	for (i = 0; i < NSIG; i++) {
- 	    if (softsig_sigs[i].handler && !softsig_sigs[i].inited) {
- 		sigaddset(&ss, i);
--#if defined(AFS_DARWIN60_ENV)
-+#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV)
- 		pthread_sigmask (SIG_BLOCK, &ss, NULL);
- 		sigdelset (&os, i);
--#endif /* defined(AFS_DARWIN60_ENV) */
-+#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
- 		softsig_sigs[i].inited = 1;
- 	    }
- 	    if (softsig_sigs[i].pending) {
-@@ -87,16 +87,16 @@ softsig_thread(void *arg)
- 	    }
- 	}
- 	if (i == NSIG) {
--#if defined(AFS_DARWIN60_ENV)
-+#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV)
- 	    sigsuspend (&os);
--#else /* !defined(AFS_DARWIN60_ENV) */
-+#else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */
- 	    sigwait(&ss, &sigw);
- 	    if (sigw != SIGUSR1) {
- 		if (softsig_sigs[sigw].fatal)
- 		    exit(0);
- 		softsig_sigs[sigw].pending = 1;
- 	    }
--#endif /* defined(AFS_DARWIN60_ENV) */
-+#endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */
- 	} else if (h)
- 	    h(i);
-     }