diff options
| author | Chris Rees <crees@FreeBSD.org> | 2013-06-03 18:29:50 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2013-06-03 18:29:50 +0000 |
| commit | c27d53f4c2fb943790eefd264dd267aa6f737dee (patch) | |
| tree | 033e606f7ac0134f1f212f08c9e5aa8976dab0b4 /net/openafs | |
| parent | - Trim Makefile header (diff) | |
Update to 1.6.2
* Fix buffer overflows in fileserver and ptserver.
* Fix rare file corruption during background sync (Gerrit 8796).
* Fix corrupting clients' metadata cache during certain errors (Gerrit 6957).
* Fix cache corruption when reading from a file another client is simultaneously writing to (Gerrit 7994).
* Fix fileservers to properly report >2 TiB partitions.
and some other less serious changes.
PR: ports/179259
Submitted by: Adam Nowacki <nowak@tepeserwery.pl>
Submitted by: bjk (maintainer)
Security: CVE-2013-1794
Notes
Notes:
svn path=/head/; revision=319798
Diffstat (limited to 'net/openafs')
20 files changed, 12 insertions, 2053 deletions
diff --git a/net/openafs/Makefile b/net/openafs/Makefile index e19ac0f8705f..d624dcc7cd0e 100644 --- a/net/openafs/Makefile +++ b/net/openafs/Makefile @@ -2,7 +2,6 @@ PORTNAME= openafs DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g} -PORTREVISION= 1 CATEGORIES= net kld MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \ http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \ @@ -22,8 +21,8 @@ LICENSE_NAME= IBM Public License Version 1.0 LICENSE_FILE= ${WRKSRC}/doc/LICENSE LICENSE_PERMS= auto-accept -AFS_DISTVERSION= 1.6.1 -DBVERSION= 2011-08-14 +AFS_DISTVERSION= 1.6.2 +DBVERSION= 2013-01-28 OPTIONS_DEFINE= FUSE @@ -45,6 +44,10 @@ PLIST_SUB+= AFSMNTDIR=${AFSMNTDIR:C,^/,,} \ .include <bsd.port.pre.mk> +.if ${OSVERSION} > 1000000 +BROKEN= Does not build +.endif + KERNCONF?= GENERIC KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf KMODDIR= /boot/modules diff --git a/net/openafs/distinfo b/net/openafs/distinfo index fff1b8832aa3..7876e70362cc 100644 --- a/net/openafs/distinfo +++ b/net/openafs/distinfo @@ -1,6 +1,6 @@ -SHA256 (openafs-1.6.1-src.tar.bz2) = d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0 -SIZE (openafs-1.6.1-src.tar.bz2) = 14356434 -SHA256 (openafs-1.6.1-doc.tar.bz2) = c41006ca12368b028f2108c972bd3de1881b5f78941bc831ff238a0344a3bec6 -SIZE (openafs-1.6.1-doc.tar.bz2) = 3481865 -SHA256 (CellServDB.2011-08-14) = fa547873edda44682440d66b79d2002f7019fac520eb3a6d6d2c7e9e83ad8d89 -SIZE (CellServDB.2011-08-14) = 36836 +SHA256 (openafs-1.6.2-src.tar.bz2) = 0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9 +SIZE (openafs-1.6.2-src.tar.bz2) = 14378378 +SHA256 (openafs-1.6.2-doc.tar.bz2) = 3b1fecde4cea104d62fde9d4ac78bc4f28c64bc2c4f527bfefd27789facaae1e +SIZE (openafs-1.6.2-doc.tar.bz2) = 3483994 +SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17 +SIZE (CellServDB.2013-01-28) = 36787 diff --git a/net/openafs/files/patch-acinclude.m4 b/net/openafs/files/patch-acinclude.m4 deleted file mode 100644 index 38262ac48c4e..000000000000 --- a/net/openafs/files/patch-acinclude.m4 +++ /dev/null @@ -1,31 +0,0 @@ ---- ./acinclude.m4.orig 2012-03-26 19:03:34.000000000 -0400 -+++ ./acinclude.m4 2012-12-30 21:23:20.000000000 -0500 -@@ -158,6 +158,14 @@ - , - [enable_transarc_paths="no"]) - -+dnl Deprecated crypto -+AC_ARG_ENABLE([kauth], -+ [AS_HELP_STRING([--disable-kauth], -+ [do not install the deprecated kauth server and utilities (defaults to -+ enabled)])], -+ , -+ [enable_kauth="yes"]) -+ - dnl Optimization and debugging flags. - AC_ARG_ENABLE([strip-binaries], - [AS_HELP_STRING([--disable-strip-binaries], -@@ -1315,6 +1323,13 @@ - fi - AC_SUBST(BUILD_LOGIN) - -+if test "$enable_kauth" = yes; then -+ INSTALL_KAUTH="yes" -+else -+ INSTALL_KAUTH="no" -+fi -+AC_SUBST(INSTALL_KAUTH) -+ - AC_CHECK_FUNCS(snprintf strlcat strlcpy flock getrlimit strnlen tsearch) - AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr) - AC_CHECK_FUNCS(setvbuf vsyslog getcwd) diff --git a/net/openafs/files/patch-configure b/net/openafs/files/patch-configure deleted file mode 100644 index c04c582bb95e..000000000000 --- a/net/openafs/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- ./configure.orig 2012-11-06 23:10:16.000000000 -0500 -+++ ./configure 2012-11-06 23:10:33.000000000 -0500 -@@ -6791,13 +6791,13 @@ - vm=${v#*.} - AFS_SYSNAME="amd64_obsd${vM}${vm}" - ;; -- i?86-*-freebsd?.*) -+ i?86-*-freebsd*.*) - v=${host#*freebsd} - vM=${v%.*} - vm=${v#*.} - AFS_SYSNAME="i386_fbsd_${vM}${vm}" - ;; -- x86_64-*-freebsd?.*) -+ x86_64-*-freebsd*.*) - v=${host#*freebsd} - vM=${v%.*} - vm=${v#*.} diff --git a/net/openafs/files/patch-configure.ac b/net/openafs/files/patch-configure.ac deleted file mode 100644 index 023d6266852a..000000000000 --- a/net/openafs/files/patch-configure.ac +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 35c8694..3eb836f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,6 +56,7 @@ AS_IF([test x"$KRB5_LIBS" != x], - add_to_error_table \ - encode_krb5_enc_tkt_part \ - encode_krb5_ticket \ -+ krb5_524_conv_principal \ - krb5_allow_weak_crypto \ - krb5_c_encrypt \ - krb5_decode_ticket \ -@@ -69,6 +70,9 @@ AS_IF([test x"$KRB5_LIBS" != x], - [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], - [LIBS="-lkrb524 $LIBS" - KRB5_LIBS="-lkrb524 $KRB5_LIBS" -+ AC_CHECK_LIB([krb524], [krb5_524_conv_principal], -+ [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], 1, -+ [Define to 1 if you have the `krb5_524_conv_principal' function.])]) - AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1, - [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])]) - AC_CHECK_HEADERS([kerberosIV/krb.h]) diff --git a/net/openafs/files/patch-src__afs__FBSD__osi_misc.c b/net/openafs/files/patch-src__afs__FBSD__osi_misc.c deleted file mode 100644 index 28d856fc64c3..000000000000 --- a/net/openafs/files/patch-src__afs__FBSD__osi_misc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/afs/FBSD/osi_misc.c.orig 2012-11-06 23:51:43.000000000 -0500 -+++ ./src/afs/FBSD/osi_misc.c 2012-11-06 23:54:49.000000000 -0500 -@@ -37,7 +37,9 @@ - flags |= FOLLOW; - else - flags |= NOFOLLOW; -+#if __FreeBSD_version < 1000021 - flags |= MPSAFE; /* namei must take Giant if needed */ -+#endif - NDINIT(&n, LOOKUP, flags, seg, aname, curthread); - if ((error = namei(&n)) != 0) { - if (glocked) diff --git a/net/openafs/files/patch-src__afs__FBSD__osi_vfsops.c b/net/openafs/files/patch-src__afs__FBSD__osi_vfsops.c deleted file mode 100644 index 99e96c13ede7..000000000000 --- a/net/openafs/files/patch-src__afs__FBSD__osi_vfsops.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/afs/FBSD/osi_vfsops.c.orig 2012-11-06 23:59:19.000000000 -0500 -+++ ./src/afs/FBSD/osi_vfsops.c 2012-11-06 23:55:08.000000000 -0500 -@@ -135,7 +135,9 @@ - #if defined(AFS_FBSD61_ENV) && !defined(AFS_FBSD62_ENV) - MNT_ILOCK(mp); - #endif -+#if __FreeBSD_version < 1000021 - mp->mnt_kern_flag |= MNTK_MPSAFE; /* solid steel */ -+#endif - #ifndef AFS_FBSD61_ENV - MNT_ILOCK(mp); - #endif diff --git a/net/openafs/files/patch-src__afs__FBSD__osi_vnodeops.c b/net/openafs/files/patch-src__afs__FBSD__osi_vnodeops.c deleted file mode 100644 index ef0e4f1872ff..000000000000 --- a/net/openafs/files/patch-src__afs__FBSD__osi_vnodeops.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/afs/FBSD/osi_vnodeops.c.orig 2012-11-06 23:51:56.000000000 -0500 -+++ ./src/afs/FBSD/osi_vnodeops.c 2012-11-06 23:54:56.000000000 -0500 -@@ -501,7 +501,9 @@ - lockparent = flags & LOCKPARENT; - wantparent = flags & (LOCKPARENT | WANTPARENT); - -+#if __FreeBSD_version < 1000021 - cnp->cn_flags |= MPSAFE; /* steel */ -+#endif - - if (flags & ISDOTDOT) - MA_VOP_UNLOCK(dvp, 0, p); diff --git a/net/openafs/files/patch-src__aklog__aklog.c b/net/openafs/files/patch-src__aklog__aklog.c deleted file mode 100644 index 812a646cca5d..000000000000 --- a/net/openafs/files/patch-src__aklog__aklog.c +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c -index 43db12f..4e2b2de 100644 ---- a/src/aklog/aklog.c -+++ b/src/aklog/aklog.c -@@ -216,12 +216,11 @@ Done: - #error "Must have either keyblock or session member of krb5_creds" - #endif - --#ifdef AFS_DARWIN110_ENV --#define HAVE_NO_KRB5_524 /* MITKerberosShim logs but returns success */ -+/* MITKerberosShim logs but returns success */ -+#if !defined(HAVE_KRB5_524_CONV_PRINCIPAL) || defined(AFS_DARWIN110_ENV) || (!defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC)) -+#define HAVE_NO_KRB5_524 - #elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC) - #define krb5_524_convert_creds krb524_convert_creds_kdc --#elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC) --#define HAVE_NO_KRB5_524 - #endif - - #if USING_HEIMDAL diff --git a/net/openafs/files/patch-src__config__afs_sysnames.h b/net/openafs/files/patch-src__config__afs_sysnames.h deleted file mode 100644 index da68757e29e0..000000000000 --- a/net/openafs/files/patch-src__config__afs_sysnames.h +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h -index 74a42e2..454ab4b 100644 ---- a/src/config/afs_sysnames.h -+++ b/src/config/afs_sysnames.h -@@ -202,7 +202,11 @@ - #define SYS_NAME_ID_i386_fbsd_80 2117 - #define SYS_NAME_ID_i386_fbsd_81 2118 - #define SYS_NAME_ID_i386_fbsd_82 2119 -+#define SYS_NAME_ID_i386_fbsd_83 2121 -+#define SYS_NAME_ID_i386_fbsd_84 2123 - #define SYS_NAME_ID_i386_fbsd_90 2120 -+#define SYS_NAME_ID_i386_fbsd_91 2122 -+#define SYS_NAME_ID_i386_fbsd_100 2130 - - #define SYS_NAME_ID_ia64_linux2 2200 - #define SYS_NAME_ID_ia64_linux22 2201 -@@ -294,7 +298,11 @@ - #define SYS_NAME_ID_amd64_fbsd_80 3011 - #define SYS_NAME_ID_amd64_fbsd_81 3012 - #define SYS_NAME_ID_amd64_fbsd_82 3013 -+#define SYS_NAME_ID_amd64_fbsd_83 3014 -+#define SYS_NAME_ID_amd64_fbsd_84 3015 - #define SYS_NAME_ID_amd64_fbsd_90 3020 -+#define SYS_NAME_ID_amd64_fbsd_91 3022 -+#define SYS_NAME_ID_amd64_fbsd_100 3030 - - #define SYS_NAME_ID_amd64_w2k 3400 - diff --git a/net/openafs/files/patch-src__config__param.amd64_fbsd_100.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_100.h deleted file mode 100644 index e8c4c305506d..000000000000 --- a/net/openafs/files/patch-src__config__param.amd64_fbsd_100.h +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/src/config/param.amd64_fbsd_100.h b/src/config/param.amd64_fbsd_100.h -new file mode 100644 -index 0000000..fb6533c ---- /dev/null -+++ b/src/config/param.amd64_fbsd_100.h -@@ -0,0 +1,215 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "amd64_fbsd_100" -+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_100 -+ -+#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_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_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_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_83.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_83.h deleted file mode 100644 index af019fc8d495..000000000000 --- a/net/openafs/files/patch-src__config__param.amd64_fbsd_83.h +++ /dev/null @@ -1,218 +0,0 @@ -diff --git a/src/config/param.amd64_fbsd_83.h b/src/config/param.amd64_fbsd_83.h -new file mode 100644 -index 0000000..33b0d10 ---- /dev/null -+++ b/src/config/param.amd64_fbsd_83.h -@@ -0,0 +1,212 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "amd64_fbsd_83" -+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_83 -+ -+#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_FBSD82_ENV 1 -+#define AFS_FBSD83_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_FBSD82_ENV 1 -+#define AFS_X86_FBSD83_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_FBSD82_ENV 1 -+#define AFS_USR_FBSD83_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_84.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_84.h deleted file mode 100644 index 95915b1f65c6..000000000000 --- a/net/openafs/files/patch-src__config__param.amd64_fbsd_84.h +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/src/config/param.amd64_fbsd_84.h b/src/config/param.amd64_fbsd_84.h -new file mode 100644 -index 0000000..fd20d6f ---- /dev/null -+++ b/src/config/param.amd64_fbsd_84.h -@@ -0,0 +1,215 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "amd64_fbsd_84" -+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_84 -+ -+#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_FBSD82_ENV 1 -+#define AFS_FBSD83_ENV 1 -+#define AFS_FBSD84_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_FBSD82_ENV 1 -+#define AFS_X86_FBSD83_ENV 1 -+#define AFS_X86_FBSD84_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_FBSD82_ENV 1 -+#define AFS_USR_FBSD83_ENV 1 -+#define AFS_USR_FBSD84_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_91.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_91.h deleted file mode 100644 index 90c1cd1327af..000000000000 --- a/net/openafs/files/patch-src__config__param.amd64_fbsd_91.h +++ /dev/null @@ -1,218 +0,0 @@ -diff --git a/src/config/param.amd64_fbsd_91.h b/src/config/param.amd64_fbsd_91.h -new file mode 100644 -index 0000000..ee04a8e ---- /dev/null -+++ b/src/config/param.amd64_fbsd_91.h -@@ -0,0 +1,212 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "amd64_fbsd_91" -+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_91 -+ -+#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_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_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_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_100.h b/net/openafs/files/patch-src__config__param.i386_fbsd_100.h deleted file mode 100644 index 9b431d9b210e..000000000000 --- a/net/openafs/files/patch-src__config__param.i386_fbsd_100.h +++ /dev/null @@ -1,219 +0,0 @@ -diff --git a/src/config/param.i386_fbsd_100.h b/src/config/param.i386_fbsd_100.h -new file mode 100644 -index 0000000..c07853f ---- /dev/null -+++ b/src/config/param.i386_fbsd_100.h -@@ -0,0 +1,213 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "i386_fbsd_100" -+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_100 -+ -+#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_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_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_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_83.h b/net/openafs/files/patch-src__config__param.i386_fbsd_83.h deleted file mode 100644 index eb66755d0345..000000000000 --- a/net/openafs/files/patch-src__config__param.i386_fbsd_83.h +++ /dev/null @@ -1,216 +0,0 @@ -diff --git a/src/config/param.i386_fbsd_83.h b/src/config/param.i386_fbsd_83.h -new file mode 100644 -index 0000000..d00b6ad ---- /dev/null -+++ b/src/config/param.i386_fbsd_83.h -@@ -0,0 +1,210 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "i386_fbsd_83" -+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_83 -+ -+#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_FBSD82_ENV 1 -+#define AFS_FBSD83_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_FBSD82_ENV 1 -+#define AFS_X86_FBSD83_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_FBSD82_ENV 1 -+#define AFS_USR_FBSD83_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_84.h b/net/openafs/files/patch-src__config__param.i386_fbsd_84.h deleted file mode 100644 index c4221981bb18..000000000000 --- a/net/openafs/files/patch-src__config__param.i386_fbsd_84.h +++ /dev/null @@ -1,219 +0,0 @@ -diff --git a/src/config/param.i386_fbsd_84.h b/src/config/param.i386_fbsd_84.h -new file mode 100644 -index 0000000..1f78624 ---- /dev/null -+++ b/src/config/param.i386_fbsd_84.h -@@ -0,0 +1,213 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "i386_fbsd_84" -+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_84 -+ -+#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_FBSD82_ENV 1 -+#define AFS_FBSD83_ENV 1 -+#define AFS_FBSD84_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_FBSD82_ENV 1 -+#define AFS_X86_FBSD83_ENV 1 -+#define AFS_X86_FBSD84_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_FBSD82_ENV 1 -+#define AFS_USR_FBSD83_ENV 1 -+#define AFS_USR_FBSD84_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_91.h b/net/openafs/files/patch-src__config__param.i386_fbsd_91.h deleted file mode 100644 index a846c8d5b529..000000000000 --- a/net/openafs/files/patch-src__config__param.i386_fbsd_91.h +++ /dev/null @@ -1,216 +0,0 @@ -diff --git a/src/config/param.i386_fbsd_91.h b/src/config/param.i386_fbsd_91.h -new file mode 100644 -index 0000000..125c5f9 ---- /dev/null -+++ b/src/config/param.i386_fbsd_91.h -@@ -0,0 +1,210 @@ -+#ifndef AFS_PARAM_H -+#define AFS_PARAM_H -+ -+/* Machine / Operating system information */ -+#define SYS_NAME "i386_fbsd_91" -+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_91 -+ -+#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_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_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_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__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in deleted file mode 100644 index afe9bc81dbc8..000000000000 --- a/net/openafs/files/patch-src__kauth__Makefile.in +++ /dev/null @@ -1,130 +0,0 @@ ---- openafs-1.6.1/src/kauth/Makefile.in.orig -+++ openafs-1.6.1/src/kauth/Makefile.in -@@ -24,6 +24,8 @@ LT_deps = $(top_builddir)/src/ubik/liboafs_ubik.la \ - $(top_builddir)/src/rxkad/liboafs_rxkad.la - LT_libs = - -+INSTALL_KAUTH = @INSTALL_KAUTH@ -+ - INCLS=${TOP_INCDIR}/ubik.h \ - ${TOP_INCDIR}/lwp.h \ - ${TOP_INCDIR}/lock.h \ -@@ -248,62 +250,66 @@ rebuild: rebuild.o $(LIBS) libkauth.a - install: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \ - libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \ - kaport.h -- ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} -- ${INSTALL} -d ${DESTDIR}${bindir} -- ${INSTALL} -d ${DESTDIR}${sbindir} -- ${INSTALL} -d ${DESTDIR}${afssrvbindir} -- ${INSTALL} -d ${DESTDIR}${afssrvsbindir} -- ${INSTALL} -d ${DESTDIR}${libdir}/afs -- ${INSTALL} -d ${DESTDIR}${includedir}/afs -- ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver -- ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas -- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid -- ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas -- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid -- ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog -- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb -- ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog -- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb -- ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs -- ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd -- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid -- ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a -- ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a -- ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check -- ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb -- ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder -- ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h -- ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h -- ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h -+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \ -+ ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}; \ -+ ${INSTALL} -d ${DESTDIR}${bindir}; \ -+ ${INSTALL} -d ${DESTDIR}${sbindir}; \ -+ ${INSTALL} -d ${DESTDIR}${afssrvbindir}; \ -+ ${INSTALL} -d ${DESTDIR}${afssrvsbindir}; \ -+ ${INSTALL} -d ${DESTDIR}${libdir}/afs; \ -+ ${INSTALL} -d ${DESTDIR}${includedir}/afs; \ -+ ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver; \ -+ ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid; \ -+ ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid; \ -+ ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog; \ -+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb; \ -+ ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog; \ -+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb; \ -+ ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs; \ -+ ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid; \ -+ ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a; \ -+ ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a; \ -+ ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check; \ -+ ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb; \ -+ ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder; \ -+ ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h; \ -+ ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h; \ -+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h; \ -+ fi - - dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \ - libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \ - kaport.h -- ${INSTALL} -d ${DEST}/root.server/usr/afs/bin -- ${INSTALL} -d ${DEST}/etc -- ${INSTALL} -d ${DEST}/bin -- ${INSTALL} -d ${DEST}/lib/afs -- ${INSTALL} -d ${DEST}/include/afs -- ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver -- ${INSTALL_PROGRAM} kas ${DEST}/etc/kas -- ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid -- ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas -- ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid -- ${INSTALL_PROGRAM} klog ${DEST}/bin/klog -- ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb -- ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog -- ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb -- ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs -- ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd -- ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid -- ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a -- ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a -- ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb -- ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check -- ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder -- ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h -- ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h -- ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h -+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \ -+ ${INSTALL} -d ${DEST}/root.server/usr/afs/bin; \ -+ ${INSTALL} -d ${DEST}/etc; \ -+ ${INSTALL} -d ${DEST}/bin; \ -+ ${INSTALL} -d ${DEST}/lib/afs; \ -+ ${INSTALL} -d ${DEST}/include/afs; \ -+ ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver; \ -+ ${INSTALL_PROGRAM} kas ${DEST}/etc/kas; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid; \ -+ ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid; \ -+ ${INSTALL_PROGRAM} klog ${DEST}/bin/klog; \ -+ ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb; \ -+ ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog; \ -+ ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb; \ -+ ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs; \ -+ ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd; \ -+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid; \ -+ ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a; \ -+ ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a; \ -+ ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb; \ -+ ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check; \ -+ ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder; \ -+ ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h; \ -+ ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h; \ -+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h; \ -+ fi - - # - # Misc. targets diff --git a/net/openafs/files/patch-src__libafs__Makefile.common.in b/net/openafs/files/patch-src__libafs__Makefile.common.in deleted file mode 100644 index 78c0b298a21e..000000000000 --- a/net/openafs/files/patch-src__libafs__Makefile.common.in +++ /dev/null @@ -1,11 +0,0 @@ ---- openafs-1.6.1/src/libafs/Makefile.common.in.orig 2012-03-27 08:03:34.000000000 +0900 -+++ openafs-1.6.1/src/libafs/Makefile.common.in 2012-06-24 09:26:33.000000000 +0900 -@@ -58,7 +58,7 @@ - - all: setup $(COMPDIRS) - --single_compdir single_instdir single_destdir: setup -+single_compdir single_instdir single_destdir: setup vnode_if.h - cd $(KOBJ) ; \ - echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \ - $(MAKE) DESTDIR=${DESTDIR} $@_libafs |