Index: branches/2015Q3/net/openafs/Makefile =================================================================== --- branches/2015Q3/net/openafs/Makefile (revision 393221) +++ branches/2015Q3/net/openafs/Makefile (revision 393222) @@ -1,116 +1,115 @@ # $FreeBSD$ PORTNAME= openafs -PORTREVISION= 1 DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g} CATEGORIES= net MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \ http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \ http://dl.central.org/dl/cellservdb/:gco \ http://grand.central.org/dl/cellservdb/:gco DISTFILES= ${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2:openafs \ ${PORTNAME}-${AFS_DISTVERSION}-doc.tar.bz2:openafs \ CellServDB.${DBVERSION}:gco EXTRACT_ONLY= ${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2 \ ${PORTNAME}-${AFS_DISTVERSION}-doc.tar.bz2 MAINTAINER= bjk@FreeBSD.org COMMENT= AFS implementation from openafs.org LICENSE= IPLv1 LICENSE_NAME= IBM Public License Version 1.0 LICENSE_FILE= ${WRKSRC}/doc/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -AFS_DISTVERSION= 1.6.10 +AFS_DISTVERSION= 1.6.13 DBVERSION= 2013-01-28 USES= cpe kmod tar:bzip2 USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ENV= _XCFLAGS="${CFLAGS} -fPIC" \ _PAM_CFLAGS="${CFLAGS} -fPIC" \ _MT_LIBS="-lpthread" CONFIGURE_ARGS= --prefix=${PREFIX} \ --localstatedir=/var \ --mandir=${MANPREFIX}/man \ --with-bsd-kernel-headers=${SRC_BASE}/sys \ --with-bsd-kernel-build=${WRKDIR}/conf \ --enable-debug \ --enable-debug-kernel \ --enable-debug-lwp \ --includedir=${PREFIX}/include/openafs \ ${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION} MAKE_ENV= COMPILER_TYPE=${COMPILER_TYPE} USE_RC_SUBR= afsd afsserver CPE_VERSION= ${AFS_DISTVERSION} CONFLICTS= coda-server-6.[0-9]* heimdal-[0-9]* ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes AFSMNTDIR?= /afs AFSSTATEDIR?= /var/${PORTNAME} AFSCACHEDIR?= ${AFSSTATEDIR}/cache PLIST_SUB+= AFSMNTDIR=${AFSMNTDIR:C,^/,,} \ AFSSTATEDIR=${AFSSTATEDIR:C,^/,,} \ AFSCACHEDIR=${AFSCACHEDIR:C,^/,,} # clang (the base system compiler in __FreeBSD_version 1000024 and later) # is pickier about stack alignment than gcc; OpenAFS uses its own # lightweight process "threading" library which will produce a misaligned # stack under clang; we need to pass -mstackrealign to avoid SIGBUS at # runtime. gcc does not understand this flag, so we use compiler.mk to # figure out what type of compiler is in use. USES+= compiler OPTIONS_DEFINE= FUSE FUSE_USES= fuse OPTIONS_SUB= yes FUSE_CONFIGURE_OFF= --disable-fuse-client .include .if ${COMPILER_TYPE} == clang CFLAGS+= -mstackrealign .endif KERNCONF?= GENERIC KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf # Use the first component of ${KERNCONF}. .for K in ${KERNCONF} _KERNCONF?=$K .endfor .if !exists(${KERNCONFDIR}/${_KERNCONF}) IGNORE= requires kernel configuration file ${_KERNCONF} to build .endif # Do not show users the reminder about cleandepend and depend post-extract: ${MKDIR} ${WRKDIR}/conf cd ${KERNCONFDIR} && \ /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null create-sample-files: @${ECHO_CMD} openafs.org > ${WRKDIR}/ThisCell @${ECHO_CMD} "${AFSMNTDIR}:${AFSCACHEDIR}:150000" > ${WRKDIR}/cacheinfo ${INSTALL_DATA} ${DISTDIR}/CellServDB.${DBVERSION} ${WRKDIR}/CellServDB post-install: create-sample-files @${MKDIR} ${STAGEDIR}${ETCDIR} .for F in CellServDB ThisCell cacheinfo ${INSTALL_DATA} ${WRKDIR}/${F} ${STAGEDIR}${ETCDIR}/${F}.sample .endfor ${INSTALL_KLD} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko \ ${STAGEDIR}${KMODDIR} @${RM} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko @${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs @${MKDIR} ${STAGEDIR}${AFSMNTDIR} \ ${STAGEDIR}${AFSSTATEDIR} ${STAGEDIR}${AFSCACHEDIR} .include Index: branches/2015Q3/net/openafs/distinfo =================================================================== --- branches/2015Q3/net/openafs/distinfo (revision 393221) +++ branches/2015Q3/net/openafs/distinfo (revision 393222) @@ -1,6 +1,6 @@ -SHA256 (openafs-1.6.10-src.tar.bz2) = 09b3c4f9500107c6e1cb737a5642e50f338d6acb0579e5e03c772cba1c6f1276 -SIZE (openafs-1.6.10-src.tar.bz2) = 14592958 -SHA256 (openafs-1.6.10-doc.tar.bz2) = 7cc67eaa3feb7bc4fafc2339284ca46e160bc8dff4acdbd502cfa6e4f41a8ea4 -SIZE (openafs-1.6.10-doc.tar.bz2) = 3531577 +SHA256 (openafs-1.6.13-src.tar.bz2) = 6139370633b48f0149d4dacdd01af7ee29b800b0866c2d18a679c1669e317b26 +SIZE (openafs-1.6.13-src.tar.bz2) = 14373447 +SHA256 (openafs-1.6.13-doc.tar.bz2) = a0517efcb665efc70ac0813256730443be68fb8635da2f90e221bb2c6cc23736 +SIZE (openafs-1.6.13-doc.tar.bz2) = 3501580 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17 SIZE (CellServDB.2013-01-28) = 36787 Index: branches/2015Q3/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c =================================================================== --- branches/2015Q3/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c (revision 393221) +++ branches/2015Q3/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c (nonexistent) @@ -1,14 +0,0 @@ ---- src/afs/FBSD/osi_vfsops.c.orig 2014-11-08 11:45:02.000000000 +0900 -+++ src/afs/FBSD/osi_vfsops.c 2014-11-08 12:01:34.000000000 +0900 -@@ -49,7 +49,11 @@ - int code; - int offset = AFS_SYSCALL; - #if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV) -+# if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS) -+ code = syscall_register(&offset, &afs_sysent, &old_sysent, 0); -+# else - code = syscall_register(&offset, &afs_sysent, &old_sysent); -+# endif - if (code) { - printf("AFS_SYSCALL in use, error %i. aborting\n", code); - return code; Property changes on: branches/2015Q3/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h =================================================================== --- branches/2015Q3/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h (revision 393221) +++ branches/2015Q3/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h (nonexistent) @@ -1,14 +0,0 @@ ---- src/config/param.amd64_fbsd_110.h.orig 2014-10-09 18:21:13.000000000 +0900 -+++ src/config/param.amd64_fbsd_110.h 2014-11-08 12:19:21.000000000 +0900 -@@ -144,6 +144,11 @@ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ - #endif /* _KERNEL */ - -+/* r273707 added a flags argument to syscall_register() */ -+#if __FreeBSD_version >= 1100041 -+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS -+#endif -+ - #else /* !defined(UKERNEL) */ - - /* This section for user space compiles only */ Property changes on: branches/2015Q3/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/net/openafs/files/patch-src-config-param.i386_fbsd_110.h =================================================================== --- branches/2015Q3/net/openafs/files/patch-src-config-param.i386_fbsd_110.h (revision 393221) +++ branches/2015Q3/net/openafs/files/patch-src-config-param.i386_fbsd_110.h (nonexistent) @@ -1,14 +0,0 @@ ---- src/config/param.i386_fbsd_110.h.orig 2014-10-09 18:21:13.000000000 +0900 -+++ src/config/param.i386_fbsd_110.h 2014-11-08 12:19:35.000000000 +0900 -@@ -143,6 +143,11 @@ - #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ - #endif /* _KERNEL */ - -+/* r273707 added a flags argument to syscall_register() */ -+#if __FreeBSD_version >= 1100041 -+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS -+#endif -+ - #else /* !defined(UKERNEL) */ - - /* This section for user space compiles only */ Property changes on: branches/2015Q3/net/openafs/files/patch-src-config-param.i386_fbsd_110.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in =================================================================== --- branches/2015Q3/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in (revision 393221) +++ branches/2015Q3/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in (nonexistent) @@ -1,17 +0,0 @@ ---- src/libafs/MakefileProto.FBSD.in.orig 2014-05-14 23:09:14.000000000 +0900 -+++ src/libafs/MakefileProto.FBSD.in 2014-05-22 08:00:36.000000000 +0900 -@@ -41,10 +41,12 @@ - - - KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \ -- -elf \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \ -- -mno-align-long-strings -fno-common -ffreestanding \ -+ -fno-common -ffreestanding \ - -I${KBLD} -include opt_global.h -fno-strict-aliasing -+.if ${COMPILER_TYPE} != clang -+KDEFS+= -elf -mno-align-long-strings -+.endif - - DBUG = -O2 - #DBUG = -O -g Property changes on: branches/2015Q3/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q3 =================================================================== --- branches/2015Q3 (revision 393221) +++ branches/2015Q3 (revision 393222) Property changes on: branches/2015Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r393218