From 9cf7d0120174b0d7082678272d13ef6e7eb44cea Mon Sep 17 00:00:00 2001
From: gendalia <gendalia>
Date: Wed, 25 May 2005 22:09:39 +0000
Subject: Update OpenAFS to 1.3.82, add PAM support to the package, and add
 patches to OpenAFS for NetBSD PAM support.

OpenAFS release announcement information (Unix):
For UNIX, 1.3.82 is the latest version in the 1.4 release cycle.
Notable recent improvements are included in AIX 5 client support, Linux
2.6 client support, and Rx free packet handling in the fileserver.

Known remaining issues involve "dangling vnodes" at unmount time with the MacOS
10.3 client, a possible SMP MacOS 10.3 client issue, and a possible
largefile issue on Linux.
---
 net/openafs/Makefile         | 20 ++++++++++++++++----
 net/openafs/PLIST.pam        |  3 +++
 net/openafs/distinfo         | 13 +++++++++----
 net/openafs/patches/patch-ab | 31 +++++++++++++++++++++++++++++++
 net/openafs/patches/patch-ac | 13 +++++++++++++
 net/openafs/patches/patch-ad | 13 +++++++++++++
 net/openafs/patches/patch-ae | 13 +++++++++++++
 net/openafs/patches/patch-af | 13 +++++++++++++
 8 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 net/openafs/PLIST.pam
 create mode 100644 net/openafs/patches/patch-ab
 create mode 100644 net/openafs/patches/patch-ac
 create mode 100644 net/openafs/patches/patch-ad
 create mode 100644 net/openafs/patches/patch-ae
 create mode 100644 net/openafs/patches/patch-af

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 72914a4d59f..506dc43495f 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/03 19:30:40 agc Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/25 22:09:39 gendalia Exp $
 
-DISTNAME=	openafs-1.3.81-src
+DISTNAME=	openafs-1.3.82-src
 PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	net sysutils
-MASTER_SITES=	http://www.openafs.org/dl/openafs/1.3.81/
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.3.82/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	gendalia@NetBSD.org
 HOMEPAGE=	http://www.openafs.org/
 COMMENT=	File system for sharing, scalability and transparent data migration
 
@@ -20,4 +20,16 @@ USE_GNU_CONFIGURE_HOST= no
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
+PKG_SUPPORTED_OPTIONS = PAM
+PKG_OPTIONS_VAR       = PKG_OPTIONS.openafs
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
+CONFIGURE_ARGS+=        --enable-pam
+.include "../../mk/pam.buildlink3.mk"
+PLIST_SRC+=		${.CURDIR}/PLIST.pam
+.else
+CONFIGURE_ARGS+=        --disable-pam
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openafs/PLIST.pam b/net/openafs/PLIST.pam
new file mode 100644
index 00000000000..52e043d0449
--- /dev/null
+++ b/net/openafs/PLIST.pam
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.pam,v 1.1 2005/05/25 22:09:39 gendalia Exp $
+lib/pam_afs.krb.so.1
+lib/pam_afs.so.1
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index fd4eecb3792..6fd8c1f9893 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/03 19:30:40 agc Exp $
+$NetBSD: distinfo,v 1.2 2005/05/25 22:09:39 gendalia Exp $
 
-SHA1 (openafs-1.3.81-src.tar.bz2) = f1294a04d5faa206d863b6645db6d96fb4862b16
-RMD160 (openafs-1.3.81-src.tar.bz2) = ef9c89ebdf916022b96e95c0ef6889c314dd337a
-Size (openafs-1.3.81-src.tar.bz2) = 10959284 bytes
+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
diff --git a/net/openafs/patches/patch-ab b/net/openafs/patches/patch-ab
new file mode 100644
index 00000000000..dc58e7a5c37
--- /dev/null
+++ b/net/openafs/patches/patch-ab
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..836877d71e5
--- /dev/null
+++ b/net/openafs/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..bf0fa7158a2
--- /dev/null
+++ b/net/openafs/patches/patch-ad
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..1fbcf03afcf
--- /dev/null
+++ b/net/openafs/patches/patch-ae
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..653180ab09c
--- /dev/null
+++ b/net/openafs/patches/patch-af
@@ -0,0 +1,13 @@
+$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
+ 
-- 
cgit v1.2.3