Index: head/net/openafs/Makefile =================================================================== --- head/net/openafs/Makefile (revision 322285) +++ head/net/openafs/Makefile (revision 322286) @@ -1,118 +1,117 @@ # $FreeBSD$ PORTNAME= openafs DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g} CATEGORIES= net kld 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= auto-accept -AFS_DISTVERSION= 1.6.2 +AFS_DISTVERSION= 1.6.4 DBVERSION= 2013-01-28 OPTIONS_DEFINE= FUSE USE_LDCONFIG= yes PATCH_STRIP= -p1 USE_BZIP2= yes HAS_CONFIGURE= yes USE_RC_SUBR= afsd afsserver MAKE_JOBS_SAFE= yes ONLY_FOR_ARCHS= i386 amd64 AFSMNTDIR?= /afs AFSSTATEDIR?= /var/${PORTNAME} AFSCACHEDIR?= ${AFSSTATEDIR}/cache PLIST_SUB+= AFSMNTDIR=${AFSMNTDIR:C,^/,,} \ AFSSTATEDIR=${AFSSTATEDIR:C,^/,,} \ AFSCACHEDIR=${AFSCACHEDIR:C,^/,,} .include -.if ${OSVERSION} > 1000000 -BROKEN= Does not build -.endif - KERNCONF?= GENERIC KERNCONFDIR?= ${SRC_BASE}/sys/${ARCH}/conf KMODDIR= /boot/modules PLIST_SUB+= KMODDIR=${KMODDIR:C,^/,,} # 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 .if ${OSVERSION} < 800000 IGNORE= supports FreeBSD 8.0 and later +.endif +.if ${OSVERSION} > 1000000 +IGNORE= Does not build .endif 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} .if ${PORT_OPTIONS:MFUSE} USES+= fuse PLIST_SUB+= FUSE="" .else CONFIGURE_ARGS+= --disable-fuse-client PLIST_SUB+= FUSE="@comment " .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION} CONFLICTS= coda-server-6.[0-9]* heimdal-[0-9]* .include "Makefile.man" # 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} ${PREFIX}/etc/openafs .for F in CellServDB ThisCell cacheinfo @${INSTALL_DATA} ${WRKDIR}/${F} ${PREFIX}/etc/openafs/${F}.sample @if [ ! -e ${PREFIX}/etc/openafs/${F} ]; then \ ${INSTALL_DATA} ${WRKDIR}/${F} ${PREFIX}/etc/openafs/${F}; \ fi .endfor ${INSTALL_KLD} ${PREFIX}/lib/openafs/libafs.ko ${KMODDIR}/ @${RM} ${PREFIX}/lib/openafs/libafs.ko @${RMDIR} ${PREFIX}/lib/openafs ${MKDIR} ${AFSMNTDIR} ${AFSSTATEDIR} ${AFSCACHEDIR} /usr/sbin/kldxref ${KMODDIR} .include Index: head/net/openafs/distinfo =================================================================== --- head/net/openafs/distinfo (revision 322285) +++ head/net/openafs/distinfo (revision 322286) @@ -1,6 +1,6 @@ -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 (openafs-1.6.4-src.tar.bz2) = a724d23c0cf942e2c463487b4ce213db41ac5801c8a8d74d372d5757313224d7 +SIZE (openafs-1.6.4-src.tar.bz2) = 14562800 +SHA256 (openafs-1.6.4-doc.tar.bz2) = e0953c67dc9eee6bb4494d935e4e7ae560332405f670315ecc86c178fde2c93e +SIZE (openafs-1.6.4-doc.tar.bz2) = 3493373 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17 SIZE (CellServDB.2013-01-28) = 36787 Index: head/net/openafs/files/patch-src__libuafs__MakefileProto.FBSD.in =================================================================== --- head/net/openafs/files/patch-src__libuafs__MakefileProto.FBSD.in (revision 322285) +++ head/net/openafs/files/patch-src__libuafs__MakefileProto.FBSD.in (nonexistent) @@ -1,14 +0,0 @@ ---- a/src/libuafs/MakefileProto.FBSD.in 2012-06-23 16:53:23.000000000 +0000 -+++ b/src/libuafs/MakefileProto.FBSD.in 2012-06-23 16:54:13.000000000 +0000 -@@ -23,9 +23,9 @@ - - TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS) - TEST_LDFLAGS= -- -+ - TEST_LIBS=-lc_r -- -+ - TEST_LIBS=-lpthread - - Property changes on: head/net/openafs/files/patch-src__libuafs__MakefileProto.FBSD.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/openafs/files/patch-src__libafs__MakefileProto.FBSD.in =================================================================== --- head/net/openafs/files/patch-src__libafs__MakefileProto.FBSD.in (revision 322285) +++ head/net/openafs/files/patch-src__libafs__MakefileProto.FBSD.in (nonexistent) @@ -1,21 +0,0 @@ ---- openafs-1.6.1/src/libafs/MakefileProto.FBSD.in.orig 2012-03-27 08:03:34.000000000 +0900 -+++ openafs-1.6.1/src/libafs/MakefileProto.FBSD.in 2012-06-24 04:58:07.000000000 +0900 -@@ -71,12 +71,15 @@ - ln -fs ../Makefile.common $(KOBJ)/Makefile.common - -$(RM) -f h net netinet rpc ufs nfs machine sys vm - -ln -fs ${KSRC}/net net -- -ln -fs ${KSRC}/@HOST_CPU@/include machine -+ -+ -ln -fs ${KSRC}/x86/include x86 -+ -+ -ln -fs ${KSRC}/${ARCH}/include machine - -ln -fs ${KSRC}/netinet netinet - -ln -fs ${KSRC}/nfs nfs -- -+ - -ln -fs /usr/include/rpc rpc -- -+ - -ln -fs ${KSRC}/rpc rpc - - -ln -fs ${KSRC}/sys sys Property changes on: head/net/openafs/files/patch-src__libafs__MakefileProto.FBSD.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/openafs/files/patch-acinclude.m4 =================================================================== --- head/net/openafs/files/patch-acinclude.m4 (revision 322285) +++ head/net/openafs/files/patch-acinclude.m4 (revision 322286) @@ -1,31 +1,31 @@ --- ./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) + AC_CHECK_FUNCS([ \ + daemon \ + flock \ Index: head/net/openafs/files/patch-src__budb__Makefile.in =================================================================== --- head/net/openafs/files/patch-src__budb__Makefile.in (revision 322285) +++ head/net/openafs/files/patch-src__budb__Makefile.in (revision 322286) @@ -1,16 +1,10 @@ ---- openafs-1.6.1/src/budb/Makefile.in 2012-06-24 06:49:53.000000000 +0900 -+++ openafs-1.6.1/src/budb/Makefile.in 2012-06-24 06:50:00.000000000 +0900 -@@ -76,10 +76,9 @@ - # - budb_errs.o: budb_errs.c budb_client.h budb_errs.h - --budb_client.h: budb_errs.c -- --budb_errs.c: budb_errs.et budb_client.p.h -- $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client -+budb_errs.c budb_client.h: budb_errs.et budb_client.p.h -+ $(RM) -f budb_client.h budb_errs.c -+ ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client - - budb_errs.h: budb_errs.et - ${COMPILE_ET} -p ${srcdir} budb_errs +--- a/src/budb/Makefile.in 2013-06-19 16:52:25.000000000 -0400 ++++ b/src/budb/Makefile.in 2013-06-19 16:53:06.000000000 -0400 +@@ -80,6 +80,7 @@ + + database.o: database.c budb_errs.h globals.h ${INCLS} + db_alloc.o: db_alloc.c budb_errs.h ${INCLS} ++db_dump.o: dbs_dump.c budb_errs.h ${INCLS} + dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS} + db_lock.o: db_lock.c budb_errs.h ${INCLS} + db_text.o: db_text.c budb_errs.h ${INCLS} Index: head/net/openafs/files/patch-src__tbudb__Makefile.in =================================================================== --- head/net/openafs/files/patch-src__tbudb__Makefile.in (revision 322285) +++ head/net/openafs/files/patch-src__tbudb__Makefile.in (revision 322286) @@ -1,14 +1,11 @@ ---- openafs-1.6.1/src/tbudb/Makefile.in.orig 2012-03-27 08:03:34.000000000 +0900 -+++ openafs-1.6.1/src/tbudb/Makefile.in 2012-06-24 06:44:51.000000000 +0900 -@@ -62,8 +62,9 @@ - # - budb_errs.o: budb_errs.c budb_client.h budb_errs.h - --budb_errs.c budb_client.h: ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h -- $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client -+budb_errs.c budb_client.h: budb_errs.h ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h -+ $(RM) -f budb_client.h budb_errs.c -+ ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client - - budb_errs.h: ${BUDB}/budb_errs.et - ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs +--- a/src/tbudb/Makefile.in 2013-06-19 16:52:31.000000000 -0400 ++++ b/src/tbudb/Makefile.in 2013-06-19 16:54:02.000000000 -0400 +@@ -122,7 +122,7 @@ + db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS} + ${CCRULE} ${srcdir}/${BUDB}/db_alloc.c + +-db_dump.o: ${BUDB}/db_dump.c ++db_dump.o: ${BUDB}/db_dump.c budb_errs.h ${INCLS} + ${CCRULE} ${srcdir}/${BUDB}/db_dump.c + + dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS}