Update to 1.6.20.2

5 files changed, 28 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad7cca928b00..6bbf2d748975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Dec 16 19:55:34 UTC 2016
+# Sat Apr 15 09:21:38 UTC 2017
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
-	pkgver = 1.6.20.1
+	pkgver = 1.6.20.2
 	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.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 = http://openafs.org/dl/1.6.20.2/openafs-1.6.20.2-src.tar.bz2
+	source = http://openafs.org/dl/1.6.20.2/openafs-1.6.20.2-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 = dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826
-	sha256sums = 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c
-	sha256sums = 1b115a0db1c749ead1b5b5653a5752bdedf2a46a7a6deafa242f11577a5a52f0
-	sha256sums = 8ca587677a4b68e2957b6f3062c22da307fa4030cb7f6c0904500709a3bf8a02
-	sha256sums = 0f6968388b3feb784026366f8f4acc974bb9051dcab5977b2c15dbc2c1a99b5e
+	sha256sums = 50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614
+	sha256sums = ec19f00594d8dd0b201aa8a2799ccab54994d8ca4ce621f843d8c4c2283f4259
+	sha256sums = b7a08cf65cead4a5f929e8220d8e8c6fade472f9376ebf64614947e89b5f3047
+	sha256sums = 5d6c1cbbf3aa9407828f04e9c2ecbcb8d57e334bc8a619e8918a750ad7f024b0
+	sha256sums = e9c6fd1de9f7a21dd67d60a130709177b6308d4aa1e90396c5216c138b995e69
 	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 2040e4b2a005..37a18a36d6cf 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,4 +1,4 @@
-From b4c088f3e398bdf6e1f4df947442a6e9ac958fd7 Mon Sep 17 00:00:00 2001
+From c8d7a1659883e4e3632291d5ec14690c6e11da24 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
@@ -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: I44dea414d837f51fc69c52e54d99aee130820e30
+Change-Id: Iddf101a047458dda34a000dec62feefd81c13421
 ---
  src/packaging/RedHat/openafs-cacheinfo      |  2 +-
  src/packaging/RedHat/openafs-client.service | 17 ++++++++---------
@@ -25,10 +25,10 @@ index dd0fd05cb..1663c79b5 100755
 -/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 cc206318c..c0b4d85f3 100644
+index 09379bea3..a63fce486 100644
 --- a/src/packaging/RedHat/openafs-client.service
 +++ b/src/packaging/RedHat/openafs-client.service
-@@ -1,20 +1,19 @@
+@@ -1,21 +1,20 @@
  [Unit]
  Description=OpenAFS Client Service
  Wants=network-online.target
@@ -40,6 +40,8 @@ index cc206318c..c0b4d85f3 100644
  Type=forking
  RemainAfterExit=true
 -EnvironmentFile=/etc/sysconfig/openafs
++EnvironmentFile=/etc/conf.d/openafs
+ ExecStartPre=/bin/bash -c "fs sysname > /dev/null 2>/dev/null; test $? -ne 0 || (echo AFS client appears to be running -- not starting && exit 1)"
 -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
 -ExecStartPre=/sbin/modprobe openafs
@@ -47,7 +49,6 @@ index cc206318c..c0b4d85f3 100644
 -ExecStop=/bin/umount /afs
 -ExecStop=/usr/vice/etc/afsd -shutdown
 -ExecStop=/sbin/rmmod openafs
-+EnvironmentFile=/etc/conf.d/openafs
 +ExecStartPre=/usr/bin/modprobe openafs
 +ExecStart=/usr/bin/afsd $AFSD_ARGS
 +ExecStartPost=/usr/bin/fs setcrypt on
@@ -73,5 +74,5 @@ index ac9d3c411..0a4b3bfea 100644
  
  [Install]
 -- 
-2.11.0
+2.12.2
 
diff --git a/0002-Add-configure-option-to-not-install-kauth.patch b/0002-Add-configure-option-to-not-install-kauth.patch
index 321232572190..86eaa80f6aa9 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 ecc9961565149cc2963142e299abac676f31f70d Mon Sep 17 00:00:00 2001
+From f6ef240c6fb82f4faacf92da4feb0c2487609f35 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 bcf8ecf48..6df258db2 100644
+index 464f356cb..5e70d3b68 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -159,6 +159,14 @@ AC_ARG_ENABLE([transarc-paths],
@@ -43,7 +43,7 @@ index bcf8ecf48..6df258db2 100644
  dnl Optimization and debugging flags.
  AC_ARG_ENABLE([strip-binaries],
      [AS_HELP_STRING([--disable-strip-binaries],
-@@ -1519,6 +1527,13 @@ else
+@@ -1523,6 +1531,13 @@ else
  fi
  AC_SUBST(BUILD_LOGIN)
  
@@ -190,5 +190,5 @@ index dd1452e74..ad24e66f0 100644
  #
  # Misc. targets
 -- 
-2.11.0
+2.12.2
 
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 b109544637e8..d9f9a43f47f4 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 533a0b92b457be8bb67dac4ff457353422d76c82 Mon Sep 17 00:00:00 2001
+From 55491d241235156d27b1e12b837399333abbc966 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
@@ -109,5 +109,5 @@ index 1eed6a1fa..ee6bb1551 100644
  	test -h $(DESTDIR)/$(mandir)/man8/dafssync-debug.8 \
  	    || ln -s fssync-debug.8 $(DESTDIR)/$(mandir)/man8/dafssync-debug.8
 -- 
-2.11.0
+2.12.2
 
diff --git a/PKGBUILD b/PKGBUILD
index f6cec845e7d3..9c1e19dcbfb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://github.com/michaellass/AUR
 
 pkgname=openafs
-pkgver=1.6.20.1
+pkgver=1.6.20.2
 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=('dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826'
-            '2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c'
-            '1b115a0db1c749ead1b5b5653a5752bdedf2a46a7a6deafa242f11577a5a52f0'
-            '8ca587677a4b68e2957b6f3062c22da307fa4030cb7f6c0904500709a3bf8a02'
-            '0f6968388b3feb784026366f8f4acc974bb9051dcab5977b2c15dbc2c1a99b5e'
+sha256sums=('50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614'
+            'ec19f00594d8dd0b201aa8a2799ccab54994d8ca4ce621f843d8c4c2283f4259'
+            'b7a08cf65cead4a5f929e8220d8e8c6fade472f9376ebf64614947e89b5f3047'
+            '5d6c1cbbf3aa9407828f04e9c2ecbcb8d57e334bc8a619e8918a750ad7f024b0'
+            'e9c6fd1de9f7a21dd67d60a130709177b6308d4aa1e90396c5216c138b995e69'
             '5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0')
 
 # If you need the kauth tools set this to 1. But be aware that these tools