Update OpenAFS package to 1.4.14.

Includes two years of changes since 1.4.8, including bug and security fixes.

13 files changed, 138 insertions, 277 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index a062106686c..8e8f320297e 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.25 2008/07/13 19:10:41 tonnerre Exp $
+# $NetBSD: Makefile,v 1.26 2011/03/19 23:35:40 jakllsch Exp $
 
-DISTNAME=	openafs-1.4.6-src
+DISTNAME=	openafs-1.4.14-src
 PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	net sysutils
-MASTER_SITES=	http://www.openafs.org/dl/openafs/1.4.6/
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.4.14/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	gendalia@NetBSD.org
 HOMEPAGE=	http://www.openafs.org/
 COMMENT=	File system for sharing, scalability and transparent data migration
+#LICENSE=	ibm-public-license
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	arla-[0-9]*
 CONFLICTS+=	heimdal-[0-9]*
 CONFLICTS+=	lwp-[0-9]*
 CONFLICTS+=	rx-[0-9]*
 
+MAKE_JOBS_SAFE=no
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		lex
 RCD_SCRIPTS+=		bosserver
@@ -37,11 +42,14 @@ OWN_DIRS_PERMS+=	${VARBASE}/openafs/db ${ROOT_USER} ${ROOT_GROUP} 700
 
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 
+BUILD_DEFS+= VARBASE
+
 # attempt to future-proof configuration
 pre-build:
-	cd ${WRKSRC}/src/config && for i in 40 50 60 70 80 90; do	\
-		${SED} -e 's|nbsd20|nbsd'$$i'|g' param.i386_nbsd20.h > param.i386_nbsd$$i.h; \
-		${CP} param.nbsd30.h param.nbsd$$i.h; 			\
+	cd ${WRKSRC}/src/config && for i in 50 60 70 80 90; do	\
+		${SED} -e 's|nbsd40|nbsd'$$i'|g' param.i386_nbsd40.h > param.i386_nbsd$$i.h; \
+		${SED} -e 's|nbsd40|nbsd'$$i'|g' param.amd64_nbsd40.h > param.amd64_nbsd$$i.h; \
+		${CP} param.nbsd40.h param.nbsd$$i.h; 			\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openafs/PLIST b/net/openafs/PLIST
index 9f9fdc925c3..b2689f76b4d 100644
--- a/net/openafs/PLIST
+++ b/net/openafs/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:00:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/03/19 23:35:40 jakllsch Exp $
+bin/afs_compile_et
 bin/afsmonitor
 bin/bos
 bin/cmdebug
-bin/compile_et
 bin/dlog
 bin/dpass
 bin/fs
@@ -190,8 +190,9 @@ lib/afs/libxstat_cm.a
 lib/afs/libxstat_fs.a
 lib/afs/util.a
 lib/afs/vlib.a
-lib/libafsauthent.a
-lib/libafsrpc.a
+lib/libafssetpag.so
+lib/libafssetpag.so.1
+lib/libafssetpag.so.1.0
 lib/libdes.a
 lib/liblwp.a
 lib/librx.a
@@ -212,14 +213,13 @@ sbin/backup
 sbin/bos_util
 sbin/bosserver
 sbin/butc
-sbin/copyauth
 sbin/fms
 sbin/fstrace
 sbin/kadb_check
 sbin/kas
 sbin/ka-forwarder
 sbin/kdb
-sbin/kdump/kdump-build
+sbin/kdump
 sbin/kpwvalid
 sbin/prdb_check
 sbin/pt_util
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index a393ef813ec..43534a708d8 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.13 2008/07/13 19:10:41 tonnerre Exp $
+$NetBSD: distinfo,v 1.14 2011/03/19 23:35:40 jakllsch Exp $
 
-SHA1 (openafs-1.4.6-src.tar.bz2) = 39489babe20c42c16ea8f11457de423b2bcca009
-RMD160 (openafs-1.4.6-src.tar.bz2) = 856fa915c7847c25dab77b450bc8b0c6f6aeb308
-Size (openafs-1.4.6-src.tar.bz2) = 12485179 bytes
-SHA1 (patch-aa) = a24cc0d97a0045e44dadbcb195a55c50dfc2d308
-SHA1 (patch-ab) = 7faa19212a385228dcedb0cbedd869d9151e66cf
-SHA1 (patch-ac) = 667d66bb4f65337e8b89f73c91b42e6b445331ee
-SHA1 (patch-ad) = 27d99c4196072e9b65508edede87495dfbc093f3
-SHA1 (patch-ae) = 699b656e0421bdf46de1d8cda7f50b3651854b67
-SHA1 (patch-af) = 886892c359cb13952393aa390997080d65c5224c
+SHA1 (openafs-1.4.14-src.tar.bz2) = 2b4e7c839bbf8f577fdd4831e7a3b3ebb9c41926
+RMD160 (openafs-1.4.14-src.tar.bz2) = ecc038d7f9068d420cf1c94f9c01db5ecd1accac
+Size (openafs-1.4.14-src.tar.bz2) = 11813993 bytes
+SHA1 (patch-aa) = 3dde7848f9773fd8398156149368748146564eee
+SHA1 (patch-src_afsd_afsd.c) = ccc518675fc4b4fa594bb6b3a9f2c36e03df2ea6
+SHA1 (patch-src_comerr_Makefile.in) = f325c813dab0dc62592abead6d112ce15df086c9
+SHA1 (patch-src_config_param.nbsd30.h) = 64bbe81ef7208b6e3f70af4eddcb9d535e8a9c34
+SHA1 (patch-src_config_param.nbsd40.h) = ddfb69d2255629946e6df8416e6e2fcbfc0ffabb
diff --git a/net/openafs/patches/patch-aa b/net/openafs/patches/patch-aa
index 63062728a5c..c215ea9b38d 100644
--- a/net/openafs/patches/patch-aa
+++ b/net/openafs/patches/patch-aa
@@ -1,13 +1,61 @@
-$NetBSD: patch-aa,v 1.3 2005/08/11 08:48:33 adam Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/19 23:35:40 jakllsch Exp $
 
---- configure.orig	2005-08-11 10:25:48.000000000 +0000
+--- configure.orig	2010-12-17 16:06:16.000000000 +0000
 +++ configure
-@@ -7796,7 +7796,7 @@ if test "x$enable_optimize_lwp" = "xno";
+@@ -5999,6 +5999,22 @@ echo $ECHO_N "checking your AFS sysname.
+ 			AFS_PARAM_COMMON=param.nbsd40.h
+ 			AFS_SYSNAME="i386_nbsd40"
+ 			;;
++		i?86-*-netbsd*5.[0-8]*)
++			AFS_PARAM_COMMON=param.nbsd50.h
++			AFS_SYSNAME="i386_nbsd50"
++			;;
++		x86_64-*-netbsd*5.[0-8]*)
++			AFS_PARAM_COMMON=param.nbsd50.h
++			AFS_SYSNAME="amd64_nbsd50"
++			;;
++		i?86-*-netbsd*5.99*)
++			AFS_PARAM_COMMON=param.nbsd60.h
++			AFS_SYSNAME="i386_nbsd60"
++			;;
++		x86_64-*-netbsd*5.99*)
++			AFS_PARAM_COMMON=param.nbsd60.h
++			AFS_SYSNAME="amd64_nbsd60"
++			;;
+ 		hppa*-hp-hpux11.0*)
+ 			AFS_SYSNAME="hp_ux110"
+ 			;;
+@@ -24555,7 +24571,7 @@ case $AFS_SYSNAME in
+ 		YACC="byacc"
+ 		;;
+ 
+-	*nbsd2*|*nbsd3*|*nbsd4*)
++	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
+ 		LEX="flex -l"
+ 		MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
+ 		MT_LIBS="-lpthread" # XXX -pthread soon
+@@ -24563,7 +24579,14 @@ case $AFS_SYSNAME in
+ 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+ 		SHLIB_LINKER="${MT_CC} -shared"
+ 		TXLIBS="/usr/lib/libcurses.so"
+-		XCFLAGS="-O2 -pipe"
++		case $AFS_SYSNAME in
++		amd64_nbsd*)
++			XCFLAGS="-O2 -pipe -fPIC"
++			;;
++		*_nbsd*)
++			XCFLAGS="-O2 -pipe"
++			;;
++		esac
+ 		YACC="yacc"
+ 		;;
+ 
+@@ -25490,6 +25513,8 @@ if test "x$enable_optimize_lwp" = "xno";
    LWP_OPTMZ=
  fi
  
--
 +XCFLAGS="${XCFLAGS} ${CFLAGS}"
- 
- 
- 
++
+ if test "x$enable_strip_binaries" != "xno"; then
+   if test "x$enable_strip_binaries" = "xmaybe" -a "x$enable_debug" = "xyes"; then
+     NO_STRIP_BIN=-ns
diff --git a/net/openafs/patches/patch-ab b/net/openafs/patches/patch-ab
deleted file mode 100644
index e4d55c3de35..00000000000
--- a/net/openafs/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/10/27 09:11:11 gendalia Exp $
-
---- configure.orig	2007-10-27 02:00:04.000000000 -0500
-+++ configure
-@@ -6347,6 +6347,14 @@ echo $ECHO_N "checking your AFS sysname.
- 			AFS_PARAM_COMMON=param.nbsd20.h
- 			AFS_SYSNAME="amd64_nbsd20"
- 			;;
-+		x86_64-*-netbsd*3.[0-8]*)
-+			AFS_PARAM_COMMON=param.nbsd30.h
-+			AFS_SYSNAME="amd64_nbsd30"
-+			;;
-+		x86_64-*-netbsd*4.[0-8]*)
-+			AFS_PARAM_COMMON=param.nbsd40.h
-+			AFS_SYSNAME="amd64_nbsd40"
-+			;;
- 		powerpc-*-netbsd*2.0*)
- 			AFS_PARAM_COMMON=param.nbsd20.h
- 			AFS_SYSNAME="ppc_nbsd20"
diff --git a/net/openafs/patches/patch-ac b/net/openafs/patches/patch-ac
deleted file mode 100644
index c612d2d8c51..00000000000
--- a/net/openafs/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/10/27 09:11:11 gendalia Exp $
-
---- src/config/param.nbsd30.h.orig	2007-10-27 02:04:52.000000000 -0500
-+++ src/config/param.nbsd30.h
-@@ -21,6 +21,7 @@
- #define AFS_NBSD15_ENV 1
- #define AFS_NBSD16_ENV 1
- #define AFS_NBSD20_ENV 1
-+#define AFS_NBSD30_ENV 1
- #define AFS_NONFSTRANS 1
- #define AFS_KERBEROS_ENV 1
- 
diff --git a/net/openafs/patches/patch-ad b/net/openafs/patches/patch-ad
deleted file mode 100644
index da519cd878b..00000000000
--- a/net/openafs/patches/patch-ad
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/10/27 09:11:11 gendalia Exp $
-
---- /dev/null	2007-10-27 03:36:13.000000000 -0500
-+++ src/config/param.nbsd40.h
-@@ -0,0 +1,160 @@
-+/* NetBSD shared section */
-+
-+#ifndef	AFS_PARAM_COMMON_H
-+#define	AFS_PARAM_COMMON_H 1
-+
-+#define AFS_64BIT_ENV  1
-+#define AFS_NAMEI_ENV  1	/* User space interface to file system */
-+#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
-+#define AFS_64BIT_CLIENT 1
-+
-+#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
-+#define AFS_SYSCALL 210
-+
-+#ifndef	MOUNT_AFS
-+#define	MOUNT_AFS AFS_MOUNT_AFS
-+#endif
-+
-+#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
-+
-+#define AFS_NBSD_ENV 1
-+#define AFS_NBSD15_ENV 1
-+#define AFS_NBSD16_ENV 1
-+#define AFS_NBSD20_ENV 1
-+#define AFS_NBSD30_ENV 1
-+#define AFS_NBSD40_ENV 1
-+#define AFS_NONFSTRANS 1
-+#define AFS_KERBEROS_ENV 1
-+
-+#define AFS_VFSINCL_ENV 1
-+
-+#define AFS_HAVE_FFS            1	/* Use system's ffs. */
-+
-+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
-+#define AFS_HAVE_STATVFS    1	/* System supports statvfs */
-+#endif
-+
-+#ifndef UKERNEL
-+
-+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
-+#include <sys/param.h>
-+#endif
-+
-+#define FTRUNC O_TRUNC
-+
-+#define IUPD 0x0010
-+#define IACC 0x0020
-+#define ICHG 0x0040
-+#define IMOD 0x0080
-+
-+#define IN_LOCK(ip)     lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
-+                                NULL, curproc)
-+#define IN_UNLOCK(ip)   lockmgr(&ip->i_lock, LK_RELEASE, \
-+                                NULL, curproc)
-+
-+#include <afs/afs_sysnames.h>
-+
-+#define AFS_VM_RDWR_ENV	1
-+#define AFS_VFS_ENV	1
-+#define AFS_GREEDY43_ENV	1
-+
-+#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
-+#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
-+
-+/* Extra kernel definitions (from kdefs file) */
-+#ifdef _KERNEL
-+#define AFS_GLOBAL_SUNLOCK        1
-+#define	AFS_VFS34	1	/* What is VFS34??? */
-+#define	AFS_SHORTGID	1	/* are group id's short? */
-+#define	afsio_iov	uio_iov
-+#define	afsio_iovcnt	uio_iovcnt
-+#define	afsio_offset	uio_offset
-+#define	afsio_seg	uio_segflg
-+#define	afsio_resid	uio_resid
-+#define	AFS_UIOSYS	UIO_SYSSPACE
-+#define	AFS_UIOUSER	UIO_USERSPACE
-+#define	AFS_CLBYTES	CLBYTES
-+#define	osi_GetTime(x)	microtime(x)
-+#define	AFS_KALLOC(x)	kalloc(x)
-+#define	AFS_KFREE(x,y)	kfree(x,y)
-+#define	v_count		v_usecount
-+#define v_vfsp		v_mount
-+#define vfs_bsize	mnt_stat.f_bsize
-+#define vfs_fsid	mnt_stat.f_fsid
-+#define va_nodeid	va_fileid
-+#define vfs_vnodecovered mnt_vnodecovered
-+#define direct		dirent
-+#define vnode_t		struct vnode
-+
-+#ifndef MUTEX_DEFAULT
-+#define MUTEX_DEFAULT   0
-+#endif /* MUTEX_DEFAULT */
-+
-+#ifndef SSYS
-+#define SSYS            0x00002
-+#endif /* SSYS */
-+
-+#define p_rcred         p_ucred
-+
-+#define	VN_RELE(vp)	vrele(((struct vnode *)(vp)))
-+#define	VN_HOLD(vp)	VREF(((struct vnode *)(vp)))
-+
-+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
-+enum vcexcl { NONEXCL, EXCL };
-+
-+#ifdef KERNEL
-+#ifndef MIN
-+#define MIN(A,B) ((A) < (B) ? (A) : (B))
-+#endif
-+#ifndef MAX
-+#define MAX(A,B) ((A) > (B) ? (A) : (B))
-+#endif
-+#endif /* KERNEL */
-+
-+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ 
-+#endif /* _KERNEL */
-+
-+#else /* !defined(UKERNEL) */
-+
-+
-+/* This section for user space compiles only */
-+
-+#define UKERNEL			1	/* user space kernel */
-+
-+#include <afs/afs_sysnames.h>
-+
-+#define AFS_USERSPACE_IP_ADDR 1
-+#define RXK_LISTENER_ENV      1
-+#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
-+
-+#define	afsio_iov	uio_iov
-+#define	afsio_iovcnt	uio_iovcnt
-+#define	afsio_offset	uio_offset
-+#define	afsio_seg	uio_segflg
-+#define	afsio_fmode	uio_fmode
-+#define	afsio_resid	uio_resid
-+#define	AFS_UIOSYS	UIO_SYSSPACE
-+#define	AFS_UIOUSER	UIO_USERSPACE
-+#define	AFS_CLBYTES	MCLBYTES
-+#define	AFS_MINCHANGE	2
-+#define	VATTR_NULL	usr_vattr_null
-+
-+#define AFS_DIRENT
-+#ifndef CMSERVERPREF
-+#define CMSERVERPREF
-+#endif
-+
-+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
-+#include <limits.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/mount.h>
-+#include <sys/fcntl.h>
-+#include <netinet/in.h>
-+#include <sys/uio.h>
-+#include <sys/socket.h>
-+#endif
-+
-+#endif /* !defined(UKERNEL) */
-+
-+#endif /* AFS_PARAM_COMMON_H */
diff --git a/net/openafs/patches/patch-ae b/net/openafs/patches/patch-ae
deleted file mode 100644
index d6b65599e2b..00000000000
--- a/net/openafs/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/10/27 09:11:11 gendalia Exp $
-
---- /dev/null	2007-10-27 02:16:30.000000000 -0500
-+++ src/config/param.amd64_nbsd30.h
-@@ -0,0 +1,21 @@
-+#ifndef AFS_AMD64_PARAM_H
-+#define AFS_AMD64_PARAM_H
-+
-+#define AFS_X86_XBSD_ENV 1
-+#define AFS_X86_ENV 1
-+#define AFSLITTLE_ENDIAN 1
-+
-+#define SYS_NAME       "amd64_nbsd30"
-+#define SYS_NAME_ID    SYS_NAME_ID_amd64_nbsd30
-+
-+#define AFS_64BITPOINTER_ENV  1
-+#ifndef UKERNEL
-+/* This section for kernel libafs compiles only */
-+
-+#else /* !defined(UKERNEL) */
-+
-+/* This section for user space compiles only */
-+
-+#endif /* !defined(UKERNEL) */
-+
-+#endif /* AFS_AMD64_PARAM_H */
diff --git a/net/openafs/patches/patch-af b/net/openafs/patches/patch-af
deleted file mode 100644
index de55be0ac44..00000000000
--- a/net/openafs/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/10/27 09:11:11 gendalia Exp $
-
---- /dev/null	2007-10-27 02:16:19.000000000 -0500
-+++ src/config/param.amd64_nbsd40.h
-@@ -0,0 +1,21 @@
-+#ifndef AFS_AMD64_PARAM_H
-+#define AFS_AMD64_PARAM_H
-+
-+#define AFS_X86_XBSD_ENV 1
-+#define AFS_X86_ENV 1
-+#define AFSLITTLE_ENDIAN 1
-+
-+#define SYS_NAME       "amd64_nbsd40"
-+#define SYS_NAME_ID    SYS_NAME_ID_amd64_nbsd40
-+
-+#define AFS_64BITPOINTER_ENV  1
-+#ifndef UKERNEL
-+/* This section for kernel libafs compiles only */
-+
-+#else /* !defined(UKERNEL) */
-+
-+/* This section for user space compiles only */
-+
-+#endif /* !defined(UKERNEL) */
-+
-+#endif /* AFS_AMD64_PARAM_H */
diff --git a/net/openafs/patches/patch-src_afsd_afsd.c b/net/openafs/patches/patch-src_afsd_afsd.c
new file mode 100644
index 00000000000..0ca900b1ab9
--- /dev/null
+++ b/net/openafs/patches/patch-src_afsd_afsd.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_afsd_afsd.c,v 1.1 2011/03/19 23:35:40 jakllsch Exp $
+
+--- src/afsd/afsd.c.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/afsd/afsd.c
+@@ -2382,8 +2382,12 @@ mainproc(struct cmd_syndesc *as, void *a
+ 	if ((mount("AFS", cacheMountDir, MOUNT_AFS, 0, NULL)) < 0) {
+ #else
+ /* This is the standard mount used by the suns and rts */
++#if defined(__NetBSD__) && __NetBSD_Prereq__(4,99,24)
++	if (1) {
++#else
+ 	if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, (caddr_t) 0)) < 0) {
+ #endif
++#endif
+ 	    printf("%s: Can't mount AFS on %s(%d)\n", rn, cacheMountDir,
+ 		   errno);
+ 	    exit(1);
diff --git a/net/openafs/patches/patch-src_comerr_Makefile.in b/net/openafs/patches/patch-src_comerr_Makefile.in
new file mode 100644
index 00000000000..22fa6dfea57
--- /dev/null
+++ b/net/openafs/patches/patch-src_comerr_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_comerr_Makefile.in,v 1.1 2011/03/19 23:35:40 jakllsch Exp $
+
+--- src/comerr/Makefile.in.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/comerr/Makefile.in
+@@ -11,7 +11,7 @@ all: compile_et ${TOP_INCDIR}/afs/com_er
+ 
+ et_lex.lex.c: et_lex.lex.l
+ 	$(RM) -f et_lex.lex.c
+-	$(LEX) -t $(srcdir)/et_lex.lex.l > et_lex.lex.c
++	$(LEX) -l -t $(srcdir)/et_lex.lex.l > et_lex.lex.c
+ 
+ compile_et:	compile_et.o error_table.o
+ 	case $(SYS_NAME) in \
diff --git a/net/openafs/patches/patch-src_config_param.nbsd30.h b/net/openafs/patches/patch-src_config_param.nbsd30.h
new file mode 100644
index 00000000000..f1d332cc083
--- /dev/null
+++ b/net/openafs/patches/patch-src_config_param.nbsd30.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_config_param.nbsd30.h,v 1.1 2011/03/19 23:35:40 jakllsch Exp $
+
+--- src/config/param.nbsd30.h.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/config/param.nbsd30.h
+@@ -23,7 +23,6 @@
+ #define AFS_NBSD20_ENV 1
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NONFSTRANS 1
+-#define AFS_KERBEROS_ENV 1
+ 
+ #define AFS_VFSINCL_ENV 1
+ 
diff --git a/net/openafs/patches/patch-src_config_param.nbsd40.h b/net/openafs/patches/patch-src_config_param.nbsd40.h
new file mode 100644
index 00000000000..20b30544013
--- /dev/null
+++ b/net/openafs/patches/patch-src_config_param.nbsd40.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_config_param.nbsd40.h,v 1.1 2011/03/19 23:35:40 jakllsch Exp $
+
+--- src/config/param.nbsd40.h.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/config/param.nbsd40.h
+@@ -24,7 +24,6 @@
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NBSD40_ENV 1
+ #define AFS_NONFSTRANS 1
+-#define AFS_KERBEROS_ENV 1
+ 
+ #define AFS_VFSINCL_ENV 1
+