Update to 1.6.20.1

5 files changed, 32 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39f752ddb61d..ad7cca928b00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec  1 06:29:10 UTC 2016
+# Fri Dec 16 19:55:34 UTC 2016
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
-	pkgver = 1.6.20
+	pkgver = 1.6.20.1
 	pkgrel = 1
 	url = http://www.openafs.org
 	install = openafs.install
@@ -19,17 +19,17 @@ pkgbase = openafs
 	backup = etc/openafs/ThisCell
 	backup = etc/openafs/cacheinfo
 	backup = etc/openafs/CellServDB
-	source = http://openafs.org/dl/1.6.20/openafs-1.6.20-src.tar.bz2
-	source = http://openafs.org/dl/1.6.20/openafs-1.6.20-doc.tar.bz2
+	source = http://openafs.org/dl/1.6.20.1/openafs-1.6.20.1-src.tar.bz2
+	source = http://openafs.org/dl/1.6.20.1/openafs-1.6.20.1-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 = tmpfiles.d-openafs.conf
-	sha256sums = 7106c63dc7e840689036651830254e0a069cd0e1d466ca88e6b3a59e26495961
-	sha256sums = 518377143fe037be5c890bd5007f1ebc1dc32e8918e9f385651f657782639751
-	sha256sums = 49f8169a20479df0d0b6d9f8829d6ab700cf97f87ff8403ac158bb56e6616792
-	sha256sums = e7de3cc83b7ff51fde9fefc54697bebd5149b46ce3bf633a607d00a34b53702b
-	sha256sums = fbb7aa32c033c2a4a00a38f66ecb02e90b4b45bf1c3b0787dd7d34f1638d3bb9
+	sha256sums = dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826
+	sha256sums = 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c
+	sha256sums = 1b115a0db1c749ead1b5b5653a5752bdedf2a46a7a6deafa242f11577a5a52f0
+	sha256sums = 8ca587677a4b68e2957b6f3062c22da307fa4030cb7f6c0904500709a3bf8a02
+	sha256sums = 0f6968388b3feb784026366f8f4acc974bb9051dcab5977b2c15dbc2c1a99b5e
 	sha256sums = 5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0
 
 pkgname = openafs
diff --git a/0001-Adjust-RedHat-config-and-service-files.patch b/0001-Adjust-RedHat-config-and-service-files.patch
index c9ca6f445f40..2040e4b2a005 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,4 +1,4 @@
-From 3a2182249e0d4963a895b769f07c1d971ec37f87 Mon Sep 17 00:00:00 2001
+From b4c088f3e398bdf6e1f4df947442a6e9ac958fd7 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/3] Adjust RedHat config and service files
@@ -9,6 +9,8 @@ Basically we reuse upstream's config for RedHat but we change a few things:
  * remove the dynamic creation of CellServDB
  * enable network traffic encryption by default
  * wait for dkms if dkms is used
+
+Change-Id: I44dea414d837f51fc69c52e54d99aee130820e30
 ---
  src/packaging/RedHat/openafs-cacheinfo      |  2 +-
  src/packaging/RedHat/openafs-client.service | 17 ++++++++---------
@@ -16,17 +18,17 @@ Basically we reuse upstream's config for RedHat but we change a few things:
  3 files changed, 11 insertions(+), 12 deletions(-)
 
 diff --git a/src/packaging/RedHat/openafs-cacheinfo b/src/packaging/RedHat/openafs-cacheinfo
-index dd0fd05..1663c79 100755
+index dd0fd05cb..1663c79b5 100755
 --- a/src/packaging/RedHat/openafs-cacheinfo
 +++ b/src/packaging/RedHat/openafs-cacheinfo
 @@ -1 +1 @@
 -/afs:/usr/vice/cache:100000
 +/afs:/var/cache/openafs:100000
 diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
-index 1a34c0c..bcc6de6 100644
+index cc206318c..c0b4d85f3 100644
 --- a/src/packaging/RedHat/openafs-client.service
 +++ b/src/packaging/RedHat/openafs-client.service
-@@ -1,19 +1,18 @@
+@@ -1,20 +1,19 @@
  [Unit]
  Description=OpenAFS Client Service
  Wants=network-online.target
@@ -36,6 +38,7 @@ index 1a34c0c..bcc6de6 100644
  
  [Service]
  Type=forking
+ RemainAfterExit=true
 -EnvironmentFile=/etc/sysconfig/openafs
 -ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist
 -ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB
@@ -55,7 +58,7 @@ index 1a34c0c..bcc6de6 100644
  
  [Install]
 diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
-index ac9d3c4..0a4b3bf 100644
+index ac9d3c411..0a4b3bfea 100644
 --- a/src/packaging/RedHat/openafs-server.service
 +++ b/src/packaging/RedHat/openafs-server.service
 @@ -3,8 +3,8 @@ Description=OpenAFS Server Service
@@ -70,5 +73,5 @@ index ac9d3c4..0a4b3bf 100644
  
  [Install]
 -- 
-2.9.0
+2.11.0
 
diff --git a/0002-Add-configure-option-to-not-install-kauth.patch b/0002-Add-configure-option-to-not-install-kauth.patch
index fe09f1334719..321232572190 100644
--- a/0002-Add-configure-option-to-not-install-kauth.patch
+++ b/0002-Add-configure-option-to-not-install-kauth.patch
@@ -1,4 +1,4 @@
-From ade83876fe44df64598080cd270cd4bba9637c97 Mon Sep 17 00:00:00 2001
+From ecc9961565149cc2963142e299abac676f31f70d 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/3] Add configure option to not install kauth
@@ -25,7 +25,7 @@ Tested-by: BuildBot <buildbot@rampaginggeek.com>
  2 files changed, 73 insertions(+), 52 deletions(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index aa682ea..265253a 100644
+index bcf8ecf48..6df258db2 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -159,6 +159,14 @@ AC_ARG_ENABLE([transarc-paths],
@@ -43,7 +43,7 @@ index aa682ea..265253a 100644
  dnl Optimization and debugging flags.
  AC_ARG_ENABLE([strip-binaries],
      [AS_HELP_STRING([--disable-strip-binaries],
-@@ -1491,6 +1499,13 @@ else
+@@ -1519,6 +1527,13 @@ else
  fi
  AC_SUBST(BUILD_LOGIN)
  
@@ -58,7 +58,7 @@ index aa682ea..265253a 100644
  	daemon \
  	flock \
 diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
-index dd1452e..ad24e66 100644
+index dd1452e74..ad24e66f0 100644
 --- a/src/kauth/Makefile.in
 +++ b/src/kauth/Makefile.in
 @@ -12,6 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
@@ -190,5 +190,5 @@ index dd1452e..ad24e66 100644
  #
  # Misc. targets
 -- 
-2.9.0
+2.11.0
 
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
index aced7e77812a..b109544637e8 100644
--- a/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
+++ b/0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
@@ -1,4 +1,4 @@
-From 7127627b0976b7f606da74dff8665418d6d9bb07 Mon Sep 17 00:00:00 2001
+From 533a0b92b457be8bb67dac4ff457353422d76c82 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
@@ -25,7 +25,7 @@ Reviewed-by: D Brashear <shadow@your-file-system.com>
  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
+index 1eed6a1fa..ee6bb1551 100644
 --- a/doc/man-pages/Makefile.in
 +++ b/doc/man-pages/Makefile.in
 @@ -7,7 +7,7 @@ INSTALL_DATA = @INSTALL_DATA@
@@ -109,5 +109,5 @@ index 1eed6a1..ee6bb15 100644
  	test -h $(DESTDIR)/$(mandir)/man8/dafssync-debug.8 \
  	    || ln -s fssync-debug.8 $(DESTDIR)/$(mandir)/man8/dafssync-debug.8
 -- 
-2.9.0
+2.11.0
 
diff --git a/PKGBUILD b/PKGBUILD
index e617e8e16c3f..f6cec845e7d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://github.com/michaellass/AUR
 
 pkgname=openafs
-pkgver=1.6.20
+pkgver=1.6.20.1
 pkgrel=1
 pkgdesc="Open source implementation of the AFS distributed file system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -27,11 +27,11 @@ source=(http://openafs.org/dl/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
         0002-Add-configure-option-to-not-install-kauth.patch
         0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
         tmpfiles.d-openafs.conf)
-sha256sums=('7106c63dc7e840689036651830254e0a069cd0e1d466ca88e6b3a59e26495961'
-            '518377143fe037be5c890bd5007f1ebc1dc32e8918e9f385651f657782639751'
-            '49f8169a20479df0d0b6d9f8829d6ab700cf97f87ff8403ac158bb56e6616792'
-            'e7de3cc83b7ff51fde9fefc54697bebd5149b46ce3bf633a607d00a34b53702b'
-            'fbb7aa32c033c2a4a00a38f66ecb02e90b4b45bf1c3b0787dd7d34f1638d3bb9'
+sha256sums=('dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826'
+            '2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c'
+            '1b115a0db1c749ead1b5b5653a5752bdedf2a46a7a6deafa242f11577a5a52f0'
+            '8ca587677a4b68e2957b6f3062c22da307fa4030cb7f6c0904500709a3bf8a02'
+            '0f6968388b3feb784026366f8f4acc974bb9051dcab5977b2c15dbc2c1a99b5e'
             '5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0')
 
 # If you need the kauth tools set this to 1. But be aware that these tools