diff options
| -rw-r--r-- | net/openafs/Makefile.man | 1 | ||||
| -rw-r--r-- | net/openafs/files/patch-acinclude.m4 | 31 | ||||
| -rw-r--r-- | net/openafs/files/patch-src__kauth__Makefile.in | 130 |
3 files changed, 162 insertions, 0 deletions
diff --git a/net/openafs/Makefile.man b/net/openafs/Makefile.man index f1ca9afaa4ec..1ed56a662115 100644 --- a/net/openafs/Makefile.man +++ b/net/openafs/Makefile.man @@ -7,6 +7,7 @@ MAN1+= copyauth.1 MAN1+= dlog.1 MAN1+= fs.1 MAN1+= fs_apropos.1 +MAN1+= fs_bypassthreshold.1 MAN1+= fs_checkservers.1 MAN1+= fs_checkvolumes.1 MAN1+= fs_chgrp.1 diff --git a/net/openafs/files/patch-acinclude.m4 b/net/openafs/files/patch-acinclude.m4 new file mode 100644 index 000000000000..38262ac48c4e --- /dev/null +++ b/net/openafs/files/patch-acinclude.m4 @@ -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) diff --git a/net/openafs/files/patch-src__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in new file mode 100644 index 000000000000..afe9bc81dbc8 --- /dev/null +++ b/net/openafs/files/patch-src__kauth__Makefile.in @@ -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 |