Permalink
Browse files

- Fix build on 10.0-CURRENT.

- Update MAINTAINER line.
- Drop kaserver (kerberos4) support.

Submitted by:	bjk


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@309940 aed309b6-a8cd-e111-996c-001c23d10e55
  • Loading branch information...
1 parent eb4e9f0 commit 2ab2df39ec71ddfde4ecc6174c8ea161647c50e2 hrs committed Jan 4, 2013
View
@@ -1,13 +1,8 @@
-# New ports collection makefile for: openafs
-# Date created: 2010-11-06
-# Whom: Ben Kaduk <kaduk@mit.edu>
-# Based on: port by Alec Kloss <alec@setfilepointer.com>
-#
# $FreeBSD$
-#
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 \
@@ -19,7 +14,7 @@ DISTFILES= ${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2:openafs \
EXTRACT_ONLY= ${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2 \
${PORTNAME}-${AFS_DISTVERSION}-doc.tar.bz2
-MAINTAINER= kaduk@mit.edu
+MAINTAINER= bjk@FreeBSD.org
COMMENT= AFS implementation from openafs.org
LICENSE= IPLv1
@@ -0,0 +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)
@@ -0,0 +1,18 @@
+--- ./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#*.}
@@ -0,0 +1,12 @@
+--- ./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)
@@ -0,0 +1,12 @@
+--- ./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
@@ -0,0 +1,12 @@
+--- ./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);
@@ -0,0 +1,130 @@
+--- 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
View
@@ -3,15 +3,10 @@ bin/sys
bin/pagsh.krb
bin/udebug
bin/pagsh
-bin/klog.krb
-bin/knfs
bin/pts
-bin/klog
bin/tokens.krb
bin/scout
bin/xstat_cm_test
-bin/kpasswd
-bin/kpwvalid
bin/bos
bin/unlog
bin/tokens
@@ -83,9 +78,6 @@ include/openafs/afs/ptint.h
include/openafs/afs/ptserver.h
include/openafs/afs/acl.h
include/openafs/afs/prs_fs.h
-include/openafs/afs/kautils.h
-include/openafs/afs/kauth.h
-include/openafs/afs/kaport.h
include/openafs/afs/bumon.h
include/openafs/afs/butc.h
include/openafs/afs/bubasics.h
@@ -186,8 +178,6 @@ lib/afs/libafscom_err.a
lib/afs/libdir.a
lib/afs/libfsprobe.a
lib/afs/libgtx.a
-lib/afs/libkauth.a
-lib/afs/libkauth.krb.a
lib/afs/libprocmgmt.a
lib/afs/libprot.a
lib/afs/libsys.a
@@ -227,7 +217,6 @@ lib/libkopenafs.a
libexec/openafs/buserver
libexec/openafs/fileserver
libexec/openafs/dafileserver
-libexec/openafs/kaserver
libexec/openafs/ptserver
libexec/openafs/salvager
libexec/openafs/upclient
@@ -240,13 +229,8 @@ libexec/openafs/dasalvager
%%FUSE%%sbin/afsd.fuse
sbin/dafssync-debug
sbin/prdb_check
-sbin/kas
-sbin/kdb
sbin/rmtsysd
sbin/pt_util
-sbin/kadb_check
-sbin/ka-forwarder
-sbin/kpwvalid
sbin/volinfo
sbin/afsd
sbin/vsys

0 comments on commit 2ab2df3

Please sign in to comment.