Updated OpenAFS to 1.4.5. conditionalized several of the options.

Fixed a couple of files, in theory should work on NetBSD 3.x & 4.x, and
i386 & amd64 now.

OpenAFS Release Notes - Version 1.4.5
_________________________________________________________________
All systems:
- fileserver address tracking is improved to avoid potentially merging
  unrelated hosts.
- Documentation updates.
- namei fileserver now does fsync()s in background batches for performance
  improvements.
- Kerberos ticket support corrected in bundled Kerberos 4 utilities on 64
  bit platforms.
- fileserver includes limited per-host thread quota support to avoid
  resource starvation.
- fileserver deals with more types of damaged volumes without asserting.
- vos validates dumpfiles before attempting restores.
- vos clone will no longer potentially delete the parent volume.
- Client no longer permits empty UUID to be created.
- fs uuid command for checking, regenerating UUID added.
- Updates for gcc 4.2.
- fileserver treats w (write) permission as granting read lock permission
  in addition to write.

10 files changed, 313 insertions, 31 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 930bc97ec3f..31ea8de864f 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/05/13 06:59:16 agc Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/27 09:11:10 gendalia Exp $
 
-DISTNAME=	openafs-1.4.4-src
-PKGREVISION=	1
+DISTNAME=	openafs-1.4.5-src
 PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	net sysutils
-MASTER_SITES=	http://www.openafs.org/dl/openafs/1.4.4/
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.4.5/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	gendalia@NetBSD.org
@@ -18,12 +17,10 @@ CONFLICTS+=	rx-[0-9]*
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		lex
-CONFIGURE_ARGS+=	--enable-bitmap-later
-CONFIGURE_ARGS+=	--enable-bos-new-config
-CONFIGURE_ARGS+=	--enable-fast-restart
-CONFIGURE_ARGS+=	--enable-largefile-fileserver
-CONFIGURE_ARGS+=	--disable-kernel-module
-CONFIGURE_ARGS+=	--enable-namei-fileserver
+RCD_SCRIPTS+=		bosserver
+
+.include "options.mk"
+
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
@@ -31,20 +28,6 @@ USE_GNU_CONFIGURE_HOST= no
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-PKG_SUPPORTED_OPTIONS=	pam
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openafs
-RCD_SCRIPTS+=		bosserver
-.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
-
 PLIST_SRC+=		${.CURDIR}/PLIST
 OWN_DIRS+=		${PKG_SYSCONFDIR}/openafs
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/openafs/server ${ROOT_USER} ${ROOT_GROUP} 775
diff --git a/net/openafs/PLIST b/net/openafs/PLIST
index 4fedcb93407..e7126405d3c 100644
--- a/net/openafs/PLIST
+++ b/net/openafs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/21 19:49:24 gendalia Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/10/27 09:11:10 gendalia Exp $
 bin/afsmonitor
 bin/bos
 bin/cmdebug
@@ -217,10 +217,10 @@ sbin/fms
 sbin/fstrace
 sbin/kadb_check
 sbin/kas
+sbin/ka-forwarder
 sbin/kdb
 sbin/kdump/kdump-build
 sbin/kpwvalid
-sbin/kseal
 sbin/prdb_check
 sbin/pt_util
 sbin/read_tape
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index 53d34b7297f..51c92b99368 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.11 2007/03/21 04:29:29 gendalia Exp $
+$NetBSD: distinfo,v 1.12 2007/10/27 09:11:10 gendalia Exp $
 
-SHA1 (openafs-1.4.4-src.tar.bz2) = 07c2854d97fab807ee023c281ec7203f1e9ef723
-RMD160 (openafs-1.4.4-src.tar.bz2) = 712907afc74ced010996dd43f785b341ac24da46
-Size (openafs-1.4.4-src.tar.bz2) = 12500224 bytes
+SHA1 (openafs-1.4.5-src.tar.bz2) = b9c8aaab204487e82ac8de261a2088e4eb145297
+RMD160 (openafs-1.4.5-src.tar.bz2) = baf00d0443ce113b380082b40b9b077cb4df5a17
+Size (openafs-1.4.5-src.tar.bz2) = 12483615 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
diff --git a/net/openafs/files/bosserver.sh b/net/openafs/files/bosserver.sh
index 8264756b044..a6ac1977b7f 100644
--- a/net/openafs/files/bosserver.sh
+++ b/net/openafs/files/bosserver.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: bosserver.sh,v 1.1 2005/06/16 17:27:12 gendalia Exp $
+# $NetBSD: bosserver.sh,v 1.2 2007/10/27 09:11:10 gendalia Exp $
 #
 # PROVIDE: bosserver
 # BEFORE: arlad
@@ -12,6 +12,7 @@ name="bosserver"
 rcvar=$name
 hostname=`@HOSTNAME_CMD@`
 command="@PREFIX@/sbin/$name"
+start_precmd="ulimit -S -d 1048576;ulimit -S -c unlimited"
 stop_precmd="@PREFIX@/bin/bos shutdown $hostname -local -wait"
 
 load_rc_config $name
diff --git a/net/openafs/options.mk b/net/openafs/options.mk
new file mode 100644
index 00000000000..ce8b16fdf3b
--- /dev/null
+++ b/net/openafs/options.mk
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2007/10/27 09:11:10 gendalia Exp $ 
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.openafs
+PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart
+PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei
+.if ${MACHINE_ARCH} != "x86_64"
+PKG_SUPPORTED_OPTIONS+= pam
+.endif
+PKG_SUGGESTED_OPTIONS=  server bitmap-later bos-new-config fast-restart
+PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msupergroups)
+CONFIGURE_ARGS+=        --enable-supergroups
+.endif
+.if !empty(PKG_OPTIONS:Mbitmap-later)
+CONFIGURE_ARGS+=        --enable-bitmap-later
+.endif
+.if !empty(PKG_OPTIONS:Mbos-new-config)
+CONFIGURE_ARGS+=        --enable-bos-new-config
+.endif
+.if !empty(PKG_OPTIONS:Mfast-restart)
+CONFIGURE_ARGS+=        --enable-fast-restart
+.endif
+.if !empty(PKG_OPTIONS:Mlargefile)
+CONFIGURE_ARGS+=        --enable-largefile-fileserver
+.endif
+.if !empty(PKG_OPTIONS:Mkernel-module)
+CONFIGURE_ARGS+=        --enable-kernel-module
+.else
+CONFIGURE_ARGS+=        --disable-kernel-module
+.endif
+.if !empty(PKG_OPTIONS:Mnamei)
+CONFIGURE_ARGS+=        --enable-namei-fileserver
+.endif
+.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
diff --git a/net/openafs/patches/patch-ab b/net/openafs/patches/patch-ab
new file mode 100644
index 00000000000..e4d55c3de35
--- /dev/null
+++ b/net/openafs/patches/patch-ab
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..c612d2d8c51
--- /dev/null
+++ b/net/openafs/patches/patch-ac
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..da519cd878b
--- /dev/null
+++ b/net/openafs/patches/patch-ad
@@ -0,0 +1,165 @@
+$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
new file mode 100644
index 00000000000..d6b65599e2b
--- /dev/null
+++ b/net/openafs/patches/patch-ae
@@ -0,0 +1,26 @@
+$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
new file mode 100644
index 00000000000..de55be0ac44
--- /dev/null
+++ b/net/openafs/patches/patch-af
@@ -0,0 +1,26 @@
+$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 */