Initial commit

1 files changed, 113 insertions, 0 deletions

diff --git a/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch b/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
new file mode 100644
index 000000000000..f53080ec8c05
--- /dev/null
+++ b/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
@@ -0,0 +1,113 @@
+From 75141b9c4cf2e40de4ad7ff7186abee21905089b Mon Sep 17 00:00:00 2001
+From: Benjamin Kaduk <kaduk@mit.edu>
+Date: Mon, 7 Apr 2014 21:54:46 -0400
+Subject: [PATCH 3/3] Do not install kauth manpages when kauth is disabled
+
+Commit 5afe7a882b0bb90a515e505d9ffce4f644633f06 added a configure
+option to disable the installation of the kauth suite, but did not
+add any logic to disable the installation of the corresponding man
+pages, so those man pages were always installed regardless of the
+options to configure.
+
+Add logic to doc/man-pages/Makefile.in to create .noinstall files
+for man pages which should not be installed in the current configuration.
+Depend on the Makefile (which will be regenerated by configure) in
+this target so as to attempt to behave properly if configure is re-run
+with different arguments in the same working tree.
+
+Change-Id: I19b77a9f20fe27c49db14f3e800d8c77cda1bb3a
+Reviewed-on: http://gerrit.openafs.org/10993
+Tested-by: BuildBot <buildbot@rampaginggeek.com>
+Reviewed-by: D Brashear <shadow@your-file-system.com>
+(cherry picked from commit 7223d7b00c20032a957bd6f82ddaf2e0c7d522a9)
+---
+ doc/man-pages/Makefile.in | 48 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 39 insertions(+), 9 deletions(-)
+
+diff --git a/doc/man-pages/Makefile.in b/doc/man-pages/Makefile.in
+index 1eed6a1..ee6bb15 100644
+--- a/doc/man-pages/Makefile.in
++++ b/doc/man-pages/Makefile.in
+@@ -7,7 +7,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+-all:
++all: prep-noinstall
+ 
+ maintclean:
+ 	rm -rf html man1 man5 man8
+@@ -17,15 +17,41 @@ html:
+ 
+ LINKEDPAGES = klog pagsh tokens
+ 
+-dest:
++KAUTH_MAN = man1/klog.1 man1/knfs.1 man1/kpasswd.1 man5/kaserver.DB0.5 \
++	man5/kaserverauxdb.5 man8/ka-forwarder.8 man8/kadb_check.8 man8/kas.8 \
++	man8/kas_apropos.8 man8/kas_create.8 man8/kas_delete.8 \
++	man8/kas_examine.8 man8/kas_forgetticket.8 man8/kas_help.8 \
++	man8/kas_interactive.8 man8/kas_list.8 man8/kas_listtickets.8 \
++	man8/kas_noauthentication.8 man8/kas_quit.8 man8/kas_setfields.8 \
++	man8/kas_setpassword.8 man8/kas_statistics.8 man8/kas_stringtokey.8 \
++	man8/kas_unlock.8 man8/kaserver.8 man8/kdb.8 man8/kpwvalid.8 \
++	man1/klog.krb.1
++
++INSTALL_KAUTH = @INSTALL_KAUTH@
++
++# This really depends on the options to configure, but configure will
++# regenerate the Makefile so this is a reasonable proxy.
++prep-noinstall: Makefile
++	rm -f man*/*.noinstall
++	if [ "$(INSTALL_KAUTH)" = "no" ] ; then \
++		for M in $(KAUTH_MAN); do \
++			touch $$M.noinstall; \
++		done; \
++	fi
++
++dest: prep-noinstall
+ 	chmod +x install-man
+ 	mkdir -p $(DEST)/man/man1 $(DEST)/man/man5 $(DEST)/man/man8
+ 	set -e; for M in man1/*.1 man5/*.5 man8/*.8 ; do \
+-	    ./install-man $$M $(DEST)/man/$$M ; \
++	    if ! [ -e $$M.noinstall ] ; then \
++		./install-man $$M $(DEST)/man/$$M ; \
++	    fi ; \
+ 	done
+ 	set -e; for M in ${LINKEDPAGES}; do \
+-	    test -h $(DEST)/man/man1/$$M.krb.1 \
+-		|| ln -s $$M.1 $(DEST)/man/man1/$$M.krb.1 ; \
++	    if ! [ -e man1/$$M.1.noinstall ] ; then \
++		test -h $(DEST)/man/man1/$$M.krb.1 \
++		    || ln -s $$M.1 $(DEST)/man/man1/$$M.krb.1 ; \
++	    fi ; \
+ 	done
+ 	test -h $(DEST)/man/man8/dafssync-debug.8 \
+ 	    || ln -s fssync-debug.8 $(DEST)/man/man8/dafssync-debug.8
+@@ -34,16 +60,20 @@ dest:
+ 		|| ln -s afsd.8 $(DEST)/man/man8/afsd.fuse.8; \
+ 	fi
+ 
+-install: $(MAN1) $(MAN8)
++install: prep-noinstall $(MAN1) $(MAN8)
+ 	chmod +x install-man
+ 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
+ 	    $(DESTDIR)$(mandir)/man8
+ 	set -e; for M in man1/*.1 man5/*.5 man8/*.8 ; do \
+-	    ./install-man $$M $(DESTDIR)$(mandir)/$$M ; \
++	    if ! [ -e $$M.noinstall ] ; then \
++		./install-man $$M $(DESTDIR)$(mandir)/$$M ; \
++	    fi; \
+ 	done
+ 	set -e; for M in ${LINKEDPAGES}; do \
+-	    test -h $(DESTDIR)$(mandir)/man1/$$M.krb.1 \
+-		|| ln -s $$M.1 $(DESTDIR)$(mandir)/man1/$$M.krb.1 ; \
++	    if ! [ -e man1/$$M.1.noinstall ] ; then \
++		test -h $(DESTDIR)$(mandir)/man1/$$M.krb.1 \
++		    || ln -s $$M.1 $(DESTDIR)$(mandir)/man1/$$M.krb.1 ; \
++	    fi ; \
+ 	done
+ 	test -h $(DESTDIR)/$(mandir)/man8/dafssync-debug.8 \
+ 	    || ln -s fssync-debug.8 $(DESTDIR)/$(mandir)/man8/dafssync-debug.8
+-- 
+2.3.5
+