MFH: r455921

Update to upstream security release 1.6.22

Also bring in rudimentary support for 11.1; 12.0 doesn't quite work
yet due to the ROOTINO-->UFS_ROOTINO rename.

Approved by:	eadler (ports committer)
Security:	CVE-2017-17432

Approved by:	ports-secteam (delphij)

11 files changed, 916 insertions, 17 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index aeeebf8287d8..cb4ca4528333 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -21,9 +21,10 @@ LICENSE_NAME=	IBM Public License Version 1.0
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_FreeBSD_12=	does not build (don't know how to make ./param.amd64_fbsd_120.h. Stop)
+BROKEN_FreeBSD_12=	does not build (use of undeclared identifier 'ROOTINO')
+ONLY_FOR_ARCHS=	i386 amd64
 
-AFS_DISTVERSION=	1.6.20.1
+AFS_DISTVERSION=	1.6.22
 DBVERSION=	2016-01-01
 
 USES=		cpe kmod tar:bzip2
@@ -49,7 +50,6 @@ USE_RC_SUBR=	afsserver
 CPE_VERSION=	${AFS_DISTVERSION}
 
 CONFLICTS=	coda-server-6.[0-9]* heimdal-[0-9]*
-ONLY_FOR_ARCHS=	i386 amd64
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -79,7 +79,7 @@ FUSE_CONFIGURE_OFF=	--disable-fuse-client
 CFLAGS+=	-mstackrealign
 .endif
 
-.if ${OSREL} == "11.0" || ${OSREL} == "12.0"
+.if ${OSREL} == "11.0" || ${OSREL} == "11.1" || ${OSREL} == "12.0"
 # Upstream does not support the client on 11 and newer
 CONFIGURE_ARGS += --disable-kernel-module
 PLIST_SUB+=	KMOD="@comment "
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index e156c5ae487b..351bf69dab58 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1487798814
-SHA256 (openafs-1.6.20.1-src.tar.bz2) = dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826
-SIZE (openafs-1.6.20.1-src.tar.bz2) = 14672548
-SHA256 (openafs-1.6.20.1-doc.tar.bz2) = 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c
-SIZE (openafs-1.6.20.1-doc.tar.bz2) = 3533007
+TIMESTAMP = 1512851739
+SHA256 (openafs-1.6.22-src.tar.bz2) = 835410b75d14aec1ac6a1138d8194897f1badeffa3a0c282963ad51996712347
+SIZE (openafs-1.6.22-src.tar.bz2) = 14606745
+SHA256 (openafs-1.6.22-doc.tar.bz2) = 0e177e007ea802891d23bcecd5a836f7c768e9af0d70aab4259233cd2d474a0f
+SIZE (openafs-1.6.22-doc.tar.bz2) = 3567926
 SHA256 (CellServDB.2016-01-01) = ef37a1cc73c90619e9b6a0ab0fa8602c57c9da8ae5e65aab96cb17e2bc1bf70e
 SIZE (CellServDB.2016-01-01) = 37058
diff --git a/net/openafs/files/patch-configure b/net/openafs/files/patch-configure
index c06de4203b2e..d43fa932f67f 100644
--- a/net/openafs/files/patch-configure
+++ b/net/openafs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-12-15 13:48:00 UTC
+--- configure.orig	2017-12-05 15:02:11 UTC
 +++ configure
-@@ -34144,13 +34144,15 @@ case $AFS_SYSNAME in
+@@ -25273,13 +25273,15 @@ case $AFS_SYSNAME in
  		;;
  
  	i386_fbsd_*)
@@ -20,7 +20,7 @@
  		;;
  
  	i386_dfbsd_*)
-@@ -34164,12 +34166,15 @@ case $AFS_SYSNAME in
+@@ -25293,12 +25295,15 @@ case $AFS_SYSNAME in
  		;;
  
  	amd64_fbsd_*)
diff --git a/net/openafs/files/patch-doc-man-pages-Makefile.in b/net/openafs/files/patch-doc-man-pages-Makefile.in
index 1f98744d5129..cdd8372e3db2 100644
--- a/net/openafs/files/patch-doc-man-pages-Makefile.in
+++ b/net/openafs/files/patch-doc-man-pages-Makefile.in
@@ -1,4 +1,4 @@
---- doc/man-pages/Makefile.in.orig	2016-12-14 18:28:29 UTC
+--- doc/man-pages/Makefile.in.orig	2017-12-05 14:52:48 UTC
 +++ doc/man-pages/Makefile.in
 @@ -2,6 +2,7 @@
  
diff --git a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
index fe80d1eb573e..0debb70c5250 100644
--- a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
+++ b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
@@ -1,4 +1,4 @@
---- src/packaging/FreeBSD/Makefile.man.orig	2016-12-14 18:28:29 UTC
+--- src/packaging/FreeBSD/Makefile.man.orig	2017-12-05 14:52:48 UTC
 +++ src/packaging/FreeBSD/Makefile.man
 @@ -7,6 +7,7 @@ MAN1+=	copyauth.1
  MAN1+=	dlog.1
diff --git a/net/openafs/files/patch-src-rx-rx_kernel.h b/net/openafs/files/patch-src-rx-rx_kernel.h
index b5c1e57f4431..2ed99640f113 100644
--- a/net/openafs/files/patch-src-rx-rx_kernel.h
+++ b/net/openafs/files/patch-src-rx-rx_kernel.h
@@ -1,6 +1,6 @@
---- src/rx/rx_kernel.h.orig	2016-12-14 18:28:29 UTC
+--- src/rx/rx_kernel.h.orig	2017-12-05 14:52:48 UTC
 +++ src/rx/rx_kernel.h
-@@ -58,12 +58,20 @@ extern int osi_utoa(char *buf, size_t le
+@@ -58,12 +58,20 @@ extern int osi_utoa(char *buf, size_t len, unsigned lo
  #endif
  #define rx_ifnet_mtu(x) (x)->if_mtu
  #define rx_ifnet_flags(x) (x?(x)->if_flags:0)
diff --git a/net/openafs/files/patch-src__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in
index 849be353b3be..24edce218eeb 100644
--- a/net/openafs/files/patch-src__kauth__Makefile.in
+++ b/net/openafs/files/patch-src__kauth__Makefile.in
@@ -1,4 +1,4 @@
---- src/kauth/Makefile.in.orig	2016-12-14 18:28:29 UTC
+--- src/kauth/Makefile.in.orig	2017-12-05 14:52:48 UTC
 +++ src/kauth/Makefile.in
 @@ -12,6 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h b/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
new file mode 100644
index 000000000000..94f128f276f1
--- /dev/null
+++ b/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
@@ -0,0 +1,225 @@
+--- /dev/null
++++ src/config/param.amd64_fbsd_111.h
+@@ -0,0 +1,222 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++/* XXX temporarily use old sysname until new one is assigned */
++#define SYS_NAME	"amd64_fbsd_110"
++#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_110
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BITPOINTER_ENV 1
++#define AFS_64BITUSERPOINTER_ENV	1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD110_ENV 1
++#define AFS_FBSD111_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD110_ENV 1
++#define AFS_X86_FBSD111_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#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_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_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	0	/* 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)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#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
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++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__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD110_ENV	1
++#define AFS_USR_FBSD111_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BITPOINTER_ENV  1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#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	1
++#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
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h b/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
new file mode 100644
index 000000000000..14ef26d0cd54
--- /dev/null
+++ b/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
@@ -0,0 +1,228 @@
+--- /dev/null
++++ src/config/param.amd64_fbsd_120.h
+@@ -0,0 +1,225 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++/* XXX temporarily use old sysname until new one is assigned */
++#define SYS_NAME	"amd64_fbsd_110"
++#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_110
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BITPOINTER_ENV 1
++#define AFS_64BITUSERPOINTER_ENV	1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD110_ENV 1
++#define AFS_FBSD111_ENV 1
++#define AFS_FBSD120_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD110_ENV 1
++#define AFS_X86_FBSD111_ENV 1
++#define AFS_X86_FBSD120_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#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_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_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	0	/* 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)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#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
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++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__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD110_ENV	1
++#define AFS_USR_FBSD111_ENV	1
++#define AFS_USR_FBSD120_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BITPOINTER_ENV  1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#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	1
++#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
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src_config_param.i386__fbsd__111.h b/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
new file mode 100644
index 000000000000..fd7246523a6d
--- /dev/null
+++ b/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
@@ -0,0 +1,222 @@
+--- /dev/null
++++ src/config/param.i386_fbsd_111.h
+@@ -0,0 +1,219 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++/* XXX temporarilyuse old sysname until new one is assigned
++#define SYS_NAME	"i386_fbsd_110"
++#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_110
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++#define AFS_FAKEOPEN_ENV    1   /* call afs_FakeOpen as if !AFS_VM_RDWR */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD110_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD110_ENV 1
++#define AFS_X86_FBSD111_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#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_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_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	0	/* 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)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#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
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++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__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD110_ENV	1
++#define AFS_USR_FBSD111_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#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	1
++#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
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src_config_param.i386__fbsd__120.h b/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
new file mode 100644
index 000000000000..f9fb7e5dc53b
--- /dev/null
+++ b/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
@@ -0,0 +1,224 @@
+--- /dev/null
++++ src/config/param.i386_fbsd_120.h
+@@ -0,0 +1,221 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++/* XXX temporarilyuse old sysname until new one is assigned
++#define SYS_NAME	"i386_fbsd_110"
++#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_110
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++#define AFS_FAKEOPEN_ENV    1   /* call afs_FakeOpen as if !AFS_VM_RDWR */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD110_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD110_ENV 1
++#define AFS_X86_FBSD111_ENV 1
++#define AFS_X86_FBSD120_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#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_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_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	0	/* 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)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#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
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++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__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD110_ENV	1
++#define AFS_USR_FBSD111_ENV	1
++#define AFS_USR_FBSD120_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#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	1
++#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
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */