FreeBSD Bugzilla – Attachment 148319 Details for
Bug 194362
[maintainer-update] [patch] update net/openafs to 1.6.10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch file
openafs-1.6.10.diff (text/plain), 30.49 KB, created by
Benjamin Kaduk
on 2014-10-15 03:25:35 UTC
(
hide
)
Description:
patch file
Filename:
MIME Type:
Creator:
Benjamin Kaduk
Created:
2014-10-15 03:25:35 UTC
Size:
30.49 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 370894) >+++ Makefile (working copy) >@@ -21,7 +21,7 @@ > LICENSE_FILE= ${WRKSRC}/doc/LICENSE > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > >-AFS_DISTVERSION= 1.6.9 >+AFS_DISTVERSION= 1.6.10 > DBVERSION= 2013-01-28 > > USES= kmod tar:bzip2 >Index: distinfo >=================================================================== >--- distinfo (revision 370894) >+++ distinfo (working copy) >@@ -1,6 +1,6 @@ >-SHA256 (openafs-1.6.9-src.tar.bz2) = 7b2ea3a1f77a5cc38f311963c7db0b6d89c0d69796453d72051c846bffe14fc7 >-SIZE (openafs-1.6.9-src.tar.bz2) = 14598147 >-SHA256 (openafs-1.6.9-doc.tar.bz2) = c1a4d325ca0403e8a909578df06ef3a9606015eaaa35a06520d495218b111e43 >-SIZE (openafs-1.6.9-doc.tar.bz2) = 3521690 >+SHA256 (openafs-1.6.10-src.tar.bz2) = 9158bfe90b4fffbf616916ba8eb98d930f624a61e299146913cdb669f2ec69e8 >+SIZE (openafs-1.6.10-src.tar.bz2) = 14592585 >+SHA256 (openafs-1.6.10-doc.tar.bz2) = 6e5fc15b82587d56b40ca806e371b3b82893415579281ec1e1dc53fa854a0173 >+SIZE (openafs-1.6.10-doc.tar.bz2) = 3529991 > SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17 > SIZE (CellServDB.2013-01-28) = 36787 >Index: files/patch-Makefile.in >=================================================================== >--- files/patch-Makefile.in (revision 370894) >+++ files/patch-Makefile.in (working copy) >@@ -1,28 +0,0 @@ >---- Makefile.in.orig 2012-03-27 08:03:34.000000000 +0900 >-+++ Makefile.in 2012-06-24 06:37:47.000000000 +0900 >-@@ -338,6 +338,7 @@ >- >- venus: cmd comerr volser ptserver libafscp >- +${COMPILE_PART1} venus ${COMPILE_PART2} >-+venus-test:: venus >- +${COMPILE_PART1} venus/test ${COMPILE_PART2} >- >- afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@ >-@@ -666,7 +667,7 @@ >- finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \ >- ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \ >- dviced dvolser libafscp \ >-- venus update xstat afsmonitor rxdebug libafsrpc \ >-+ venus venus-test update xstat afsmonitor rxdebug libafsrpc \ >- libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ >- platform kopenafs authtools >- +${COMPILE_PART1} finale ${COMPILE_PART2} >-@@ -674,7 +675,7 @@ >- finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \ >- ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \ >- dviced dvolser libafscp\ >-- venus update xstat afsmonitor rxdebug libafsrpc \ >-+ venus venus-test update xstat afsmonitor rxdebug libafsrpc \ >- libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ >- platform kopenafs authtools >- +${COMPILE_PART1} finale ${COMPILE_PART2} >Index: files/patch-src-rx-rx_kernel.h >=================================================================== >--- files/patch-src-rx-rx_kernel.h (revision 370894) >+++ files/patch-src-rx-rx_kernel.h (working copy) >@@ -1,6 +1,14 @@ >---- src/rx/rx_kernel.h.orig 2014-09-11 17:20:18.000000000 +0900 >-+++ src/rx/rx_kernel.h 2014-09-11 17:23:52.000000000 +0900 >-@@ -59,7 +59,13 @@ >+--- src/rx/rx_kernel.h.orig 2014-09-24 10:17:09.000000000 -0400 >++++ src/rx/rx_kernel.h 2014-09-28 20:37:20.000000000 -0400 >+@@ -54,12 +54,20 @@ >+ #endif >+ #define rx_ifnet_mtu(x) (x)->if_mtu >+ #define rx_ifnet_flags(x) (x?(x)->if_flags:0) >+-#if defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV) >++#if __FreeBSD_version >= 1100032 >++#define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0, RT_ALL_FIBS) >++#elif defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV) >+ #define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0) > #else > #define rx_ifaddr_withnet(x) ifa_ifwithnet(x) > #endif >Index: files/patch-src__config__afs_sysnames.h >=================================================================== >--- files/patch-src__config__afs_sysnames.h (revision 370894) >+++ files/patch-src__config__afs_sysnames.h (working copy) >@@ -1,24 +0,0 @@ >-diff --git src/config/afs_sysnames.h src/config/afs_sysnames.h >-index 62b18f3..8687a6c 100644 >---- src/config/afs_sysnames.h >-+++ src/config/afs_sysnames.h >-@@ -213,7 +213,9 @@ >- #define SYS_NAME_ID_i386_fbsd_90 2120 >- #define SYS_NAME_ID_i386_fbsd_91 2122 >- #define SYS_NAME_ID_i386_fbsd_92 2124 >-+#define SYS_NAME_ID_i386_fbsd_93 2126 >- #define SYS_NAME_ID_i386_fbsd_100 2130 >-+#define SYS_NAME_ID_i386_fbsd_101 2131 >- #define SYS_NAME_ID_i386_fbsd_110 2140 >- >- #define SYS_NAME_ID_ia64_linux2 2200 >-@@ -316,7 +318,9 @@ >- #define SYS_NAME_ID_amd64_fbsd_90 3020 >- #define SYS_NAME_ID_amd64_fbsd_91 3022 >- #define SYS_NAME_ID_amd64_fbsd_92 3023 >-+#define SYS_NAME_ID_amd64_fbsd_93 3024 >- #define SYS_NAME_ID_amd64_fbsd_100 3030 >-+#define SYS_NAME_ID_amd64_fbsd_101 3031 >- #define SYS_NAME_ID_amd64_fbsd_110 3040 >- >- #define SYS_NAME_ID_amd64_w2k 3400 >Index: files/patch-src__config__param.amd64_fbsd_101.h >=================================================================== >--- files/patch-src__config__param.amd64_fbsd_101.h (revision 370894) >+++ files/patch-src__config__param.amd64_fbsd_101.h (working copy) >@@ -1,224 +0,0 @@ >-diff --git src/config/param.amd64_fbsd_101.h src/config/param.amd64_fbsd_101.h >-new file mode 100644 >-index 0000000..73eda56 >---- /dev/null >-+++ src/config/param.amd64_fbsd_101.h >-@@ -0,0 +1,218 @@ >-+#ifndef AFS_PARAM_H >-+#define AFS_PARAM_H >-+ >-+/* Machine / Operating system information */ >-+#define SYS_NAME "amd64_fbsd_101" >-+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_101 >-+ >-+#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_FBSD101_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_FBSD101_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_FBSD101_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 */ >Index: files/patch-src__config__param.amd64_fbsd_93.h >=================================================================== >--- files/patch-src__config__param.amd64_fbsd_93.h (revision 370894) >+++ files/patch-src__config__param.amd64_fbsd_93.h (working copy) >@@ -1,224 +0,0 @@ >-diff --git src/config/param.amd64_fbsd_93.h src/config/param.amd64_fbsd_93.h >-new file mode 100644 >-index 0000000..18ebf30 >---- /dev/null >-+++ src/config/param.amd64_fbsd_93.h >-@@ -0,0 +1,218 @@ >-+#ifndef AFS_PARAM_H >-+#define AFS_PARAM_H >-+ >-+/* Machine / Operating system information */ >-+#define SYS_NAME "amd64_fbsd_93" >-+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_93 >-+ >-+#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_FBSD92_ENV 1 >-+#define AFS_FBSD93_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_FBSD92_ENV 1 >-+#define AFS_X86_FBSD93_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_FBSD92_ENV 1 >-+#define AFS_USR_FBSD93_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 */ >Index: files/patch-src__config__param.i386_fbsd_101.h >=================================================================== >--- files/patch-src__config__param.i386_fbsd_101.h (revision 370894) >+++ files/patch-src__config__param.i386_fbsd_101.h (working copy) >@@ -1,222 +0,0 @@ >-diff --git src/config/param.i386_fbsd_101.h src/config/param.i386_fbsd_101.h >-new file mode 100644 >-index 0000000..dd89daf >---- /dev/null >-+++ src/config/param.i386_fbsd_101.h >-@@ -0,0 +1,216 @@ >-+#ifndef AFS_PARAM_H >-+#define AFS_PARAM_H >-+ >-+/* Machine / Operating system information */ >-+#define SYS_NAME "i386_fbsd_101" >-+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_101 >-+ >-+#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_FBSD101_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_FBSD101_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_FBSD101_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 */ >Index: files/patch-src__config__param.i386_fbsd_93.h >=================================================================== >--- files/patch-src__config__param.i386_fbsd_93.h (revision 370894) >+++ files/patch-src__config__param.i386_fbsd_93.h (working copy) >@@ -1,222 +0,0 @@ >-diff --git src/config/param.i386_fbsd_93.h src/config/param.i386_fbsd_93.h >-new file mode 100644 >-index 0000000..db67f92 >---- /dev/null >-+++ src/config/param.i386_fbsd_93.h >-@@ -0,0 +1,216 @@ >-+#ifndef AFS_PARAM_H >-+#define AFS_PARAM_H >-+ >-+/* Machine / Operating system information */ >-+#define SYS_NAME "i386_fbsd_93" >-+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_93 >-+ >-+#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_FBSD92_ENV 1 >-+#define AFS_FBSD93_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_FBSD92_ENV 1 >-+#define AFS_X86_FBSD93_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_FBSD92_ENV 1 >-+#define AFS_USR_FBSD93_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 */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 194362
:
148319
|
148624
|
148625