Update to 1.8.0

author: Michael Lass 2018-04-13 21:16:24 +0200
committer: Michael Lass 2018-04-13 21:16:24 +0200
commit: ff4743e4f63defcf7bfb1a59b815e5c56ba643b5 (patch)
tree: 9808ac04a2f6555202edbd0cce0491d16d05e438
parent: 7b0d146a3f57068b0be584f11ac0082b64d2c2b2 (diff)
download: aur-ff4743e4f63defcf7bfb1a59b815e5c56ba643b5.tar.gz
6 files changed, 23 insertions, 399 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b2195bde5cc..d0650d9cd6b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
-	pkgver = 1.6.22.2
+	pkgver = 1.8.0
 	pkgrel = 1
 	url = http://www.openafs.org
 	install = openafs.install
@@ -17,19 +17,13 @@ pkgbase = openafs
 	backup = etc/openafs/ThisCell
 	backup = etc/openafs/cacheinfo
 	backup = etc/openafs/CellServDB
-	source = http://openafs.org/dl/1.6.22.2/openafs-1.6.22.2-src.tar.bz2
-	source = http://openafs.org/dl/1.6.22.2/openafs-1.6.22.2-doc.tar.bz2
+	source = http://openafs.org/dl/openafs/1.8.0/openafs-1.8.0-src.tar.bz2
+	source = http://openafs.org/dl/openafs/1.8.0/openafs-1.8.0-doc.tar.bz2
 	source = 0001-Adjust-RedHat-config-and-service-files.patch
-	source = 0002-Add-configure-option-to-not-install-kauth.patch
-	source = 0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
-	source = 0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
 	source = tmpfiles.d-openafs.conf
-	sha256sums = cecf7c002ae9ff977a43435a8e63d57ffcac3ff3f99025cbfe4edb175f3c4196
-	sha256sums = b55bffc7be9dfb848a0690ebeb21dc7ff53ad5b069d1bb71bda5db92146bfed2
-	sha256sums = ba928939b0a7e987d522d734730b0c4b857a5f26b1821a630ee6c579aeb01817
-	sha256sums = afb6040350d01580177d5a83fa9fc72a04a95fd79791f276617c09a75fa1d946
-	sha256sums = 413a68614fe4d31be1f4eb2e5e266bf9e4ab78d813090c3235b264c1c6111853
-	sha256sums = a1b2fa8937240dfb38a773d088c09417b409f299035823a2040cb6c070118e0a
+	sha256sums = 63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d
+	sha256sums = e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8
+	sha256sums = 2fc6176c05ed77f0f113e966d8bf860799f0a132d98d323ebb1e9f7903661d89
 	sha256sums = 18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68
 
 pkgname = openafs
diff --git a/0001-Adjust-RedHat-config-and-service-files.patch b/0001-Adjust-RedHat-config-and-service-files.patch
index ac650659a578..ade1f287ad84 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,7 +1,7 @@
-From 86d19acffad859c74e949b9a9042ede1ff4fbc77 Mon Sep 17 00:00:00 2001
+From e30c4fdcabb7e2500c632636d99e7e987870fac4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20La=C3=9F?= <lass@mail.uni-paderborn.de>
 Date: Thu, 19 Feb 2015 19:34:00 +0100
-Subject: [PATCH 1/4] Adjust RedHat config and service files
+Subject: [PATCH] Adjust RedHat config and service files
 
 Basically we reuse upstream's config for RedHat but we change a few things:
 
@@ -10,7 +10,7 @@ Basically we reuse upstream's config for RedHat but we change a few things:
  * enable network traffic encryption by default
  * wait for dkms if dkms is used
 
-Change-Id: Iddf101a047458dda34a000dec62feefd81c13421
+Change-Id: I44dea414d837f51fc69c52e54d99aee130820e30
 ---
  src/packaging/RedHat/openafs-cacheinfo      |  2 +-
  src/packaging/RedHat/openafs-client.service | 17 ++++++++---------
@@ -74,5 +74,5 @@ index ac9d3c411..0a4b3bfea 100644
  
  [Install]
 -- 
-2.16.1
+2.17.0
 
diff --git a/0002-Add-configure-option-to-not-install-kauth.patch b/0002-Add-configure-option-to-not-install-kauth.patch
deleted file mode 100644
index fee62bcf6d3c..000000000000
--- a/0002-Add-configure-option-to-not-install-kauth.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 6ab70ae5f395160d41fd33477c329d5af921ab42 Mon Sep 17 00:00:00 2001
-From: Ben Kaduk <kaduk@mit.edu>
-Date: Thu, 8 Nov 2012 18:40:57 -0500
-Subject: [PATCH 2/4] Add configure option to not install kauth
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per http://www.openafs.org/pages/no-more-des.html the kaserver
-suite of utilities is deprecated and is not supposed to be built
-anymore in this post-1.6 world.
-Not building them at all requires some effort, but not installing
-them is pretty easy.  Do the easy part for now, and leave the hard
-parts for a follow-up commit.
-
-Change-Id: I1c400a7398b8708e7c9dc6613cd183b9b67e7a7f
-Reviewed-on: http://gerrit.openafs.org/8457
-Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
-Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit 5afe7a882b0bb90a515e505d9ffce4f644633f06)
----
- acinclude.m4          |  15 +++++++
- src/kauth/Makefile.in | 110 ++++++++++++++++++++++++++------------------------
- 2 files changed, 73 insertions(+), 52 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 0bb3b1746..3c1f04004 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -159,6 +159,14 @@ AC_ARG_ENABLE([transarc-paths],
-     , 
-     [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],
-@@ -1541,6 +1549,13 @@ else
- 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([ \
- 	daemon \
- 	flock \
-diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
-index dd1452e74..ad24e66f0 100644
---- a/src/kauth/Makefile.in
-+++ b/src/kauth/Makefile.in
-@@ -12,6 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
-+INSTALL_KAUTH = @INSTALL_KAUTH@
-+
- INCLS=${TOP_INCDIR}/ubik.h \
-              ${TOP_INCDIR}/lwp.h \
-              ${TOP_INCDIR}/lock.h  \
-@@ -266,62 +268,66 @@ rebuild: rebuild.o kautils.o $(LIBS)
- 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
--- 
-2.16.1
-
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
deleted file mode 100644
index 864d357a6fb4..000000000000
--- a/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 06b3c36f6e4d93537855f8d2a61b4c09f6ba072b 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/4] 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 1eed6a1fa..ee6bb1551 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.16.1
-
diff --git a/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch b/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
deleted file mode 100644
index 569a4c67a87e..000000000000
--- a/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 72cfb6ff6ea9bf762f39f1d8a367d04c530b1020 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20La=C3=9F?= <lass@mail.uni-paderborn.de>
-Date: Thu, 2 Nov 2017 21:16:49 +0100
-Subject: [PATCH 4/4] gtx: link against libtinfo if termlib is seperated
-
-If ncurses is built with "./configure --with-termlib=tinfo", gtx fails
-to link because of an undefined reference to the LINES symbol which is
-then provided by libtinfo.so and not libncurses.so.
-
-If ncurses is present, additionally check whether LINES is provided by
-ncurses or tinfo and set $LIB_curses accordingly.
-
-This change is based on a patch provided by Bastian Beischer.
-
-FIXES 134420
-
-Reviewed-on: https://gerrit.openafs.org/12760
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-(cherry picked from commit 311f1d28a2f626350b33ad432e674055b62511bd)
-
-Change-Id: I2f69fe51bbefeeb2a17145a88aa9c891644f2f61
----
- src/cf/curses.m4 | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/cf/curses.m4 b/src/cf/curses.m4
-index dc01469f5..261305ce1 100644
---- a/src/cf/curses.m4
-+++ b/src/cf/curses.m4
-@@ -16,7 +16,10 @@ AC_DEFUN([OPENAFS_CURSES_LIB],
- [AC_CACHE_VAL([openafs_cv_curses_lib],
-    [save_LIBS="$LIBS"
-     openafs_cv_curses_lib=
--    AC_CHECK_LIB([ncurses], [initscr], [openafs_cv_curses_lib=-lncurses])
-+    AC_CHECK_LIB([ncurses], [initscr],
-+		 [AC_CHECK_LIB([ncurses], [LINES], [openafs_cv_curses_lib=-lncurses],
-+			       [AC_CHECK_LIB([tinfo], [LINES],
-+					     [openafs_cv_curses_lib="-lncurses -ltinfo"])])])
-     AS_IF([test "x$openafs_cv_curses_lib" = x],
- 	  [AC_CHECK_LIB([Hcurses], [initscr], [openafs_cv_curses_lib=-lHcurses])])
-     AS_IF([test "x$openafs_cv_curses_lib" = x],
--- 
-2.16.1
-
diff --git a/PKGBUILD b/PKGBUILD
index c871f41aac46..64a0232c99f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://github.com/michaellass/AUR
 
 pkgname=openafs
-pkgver=1.6.22.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Open source implementation of the AFS distributed file system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -21,23 +21,17 @@ backup=(etc/conf.d/openafs
         etc/openafs/CellServDB)
 options=(!emptydirs)
 install=openafs.install
-source=(http://openafs.org/dl/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
-        http://openafs.org/dl/${pkgver}/${pkgname}-${pkgver}-doc.tar.bz2
+source=(http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
+        http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-doc.tar.bz2
         0001-Adjust-RedHat-config-and-service-files.patch
-        0002-Add-configure-option-to-not-install-kauth.patch
-        0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
-        0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
         tmpfiles.d-openafs.conf)
-sha256sums=('cecf7c002ae9ff977a43435a8e63d57ffcac3ff3f99025cbfe4edb175f3c4196'
-            'b55bffc7be9dfb848a0690ebeb21dc7ff53ad5b069d1bb71bda5db92146bfed2'
-            'ba928939b0a7e987d522d734730b0c4b857a5f26b1821a630ee6c579aeb01817'
-            'afb6040350d01580177d5a83fa9fc72a04a95fd79791f276617c09a75fa1d946'
-            '413a68614fe4d31be1f4eb2e5e266bf9e4ab78d813090c3235b264c1c6111853'
-            'a1b2fa8937240dfb38a773d088c09417b409f299035823a2040cb6c070118e0a'
+sha256sums=('63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d'
+            'e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8'
+            '2fc6176c05ed77f0f113e966d8bf860799f0a132d98d323ebb1e9f7903661d89'
             '18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68')
 
 # If you need the kauth tools set this to 1. But be aware that these tools
-# are considered insecure since 2003!
+# are considered insecure since 2003! This also affects the PAM libs.
 ENABLE_KAUTH=0
 
 prepare() {
@@ -46,19 +40,8 @@ prepare() {
   # Adjust RedHat config and service files to our needs
   patch -p1 < ${srcdir}/0001-Adjust-RedHat-config-and-service-files.patch
 
-  # Backport possibility to disable kauth
-  patch -p1 < ${srcdir}/0002-Add-configure-option-to-not-install-kauth.patch
-  patch -p1 < ${srcdir}/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
-
-  # Fix build when ncurses was compiled with --with-termlib=tinfo
-  # https://rt.central.org/rt/Ticket/Display.html?id=134420
-  # https://gerrit.openafs.org/12760/
-  # Should not be required anymore: https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/ncurses&id=987faeb8442d44e76a7a58642e8e6432eb220c25
-  # but let's keep it for future ncurses updates.
-  patch -p1 < ${srcdir}/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
-
   # Only needed when changes to configure were made
-  ./regen.sh -q
+  # ./regen.sh -q
 }
 
 build() {
@@ -83,6 +66,7 @@ build() {
               --libexecdir=/usr/lib \
               --disable-fuse-client \
               --disable-kernel-module \
+              --without-swig \
               --with-afs-sysname=$sysname \
               --$kauth
 
@@ -95,10 +79,6 @@ package() {
 
   make DESTDIR=${pkgdir} install_nolibafs
 
-  # move PAM libs
-  install -dm755 ${pkgdir}/usr/lib/security
-  mv ${pkgdir}/usr/lib/pam_afs.krb.so.1 ${pkgdir}/usr/lib/pam_afs.so.1 ${pkgdir}/usr/lib/security/
-
   # install systemd service files
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/packaging/RedHat/openafs-client.service ${pkgdir}/usr/lib/systemd/system/openafs-client.service
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/packaging/RedHat/openafs-server.service ${pkgdir}/usr/lib/systemd/system/openafs-server.service
@@ -110,13 +90,15 @@ package() {
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/packaging/RedHat/openafs-cacheinfo ${pkgdir}/etc/${pkgname}/cacheinfo
 
   # install license
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
   # install tmpfiles.d entry for /afs
   install -Dm644 ${srcdir}/tmpfiles.d-openafs.conf ${pkgdir}/usr/lib/tmpfiles.d/openafs.conf
 
-  # if kauth was installed rename kpasswd which is already provided by krb5
+  # if kauth was installed rename kpasswd which is already provided by krb5 and move PAM libs
   if [ $ENABLE_KAUTH -eq 1 ]; then
+    install -dm755 ${pkgdir}/usr/lib/security
+    mv ${pkgdir}/usr/lib/pam_afs.krb.so ${pkgdir}/usr/lib/pam_afs.so ${pkgdir}/usr/lib/security/
     mv ${pkgdir}/usr/bin/kpasswd ${pkgdir}/usr/bin/kpasswd-openafs
     mv ${pkgdir}/usr/share/man/man1/kpasswd.1 ${pkgdir}/usr/share/man/man1/kpasswd-openafs.1
   fi
author	Michael Lass	2018-04-13 21:16:24 +0200
committer	Michael Lass	2018-04-13 21:16:24 +0200
commit	ff4743e4f63defcf7bfb1a59b815e5c56ba643b5 (patch)
tree	9808ac04a2f6555202edbd0cce0491d16d05e438
parent	7b0d146a3f57068b0be584f11ac0082b64d2c2b2 (diff)
download	aur-ff4743e4f63defcf7bfb1a59b815e5c56ba643b5.tar.gz