Update to 1.6.21.1

3 files changed, 11 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b34fd5820ff..44eddde9223a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 12 18:32:01 UTC 2017
+# Fri Sep 22 14:46:25 UTC 2017
 pkgbase = openafs-modules-dkms
 	pkgdesc = Kernel module for OpenAFS (dkms)
-	pkgver = 1.6.21
-	pkgrel = 2
+	pkgver = 1.6.21.1
+	pkgrel = 1
 	url = http://www.openafs.org
 	arch = i686
 	arch = x86_64
@@ -11,17 +11,15 @@ pkgbase = openafs-modules-dkms
 	license = custom:"IBM Public License Version 1.0"
 	depends = dkms
 	depends = openafs
-	provides = openafs-modules=1.6.21
+	provides = openafs-modules=1.6.21.1
 	conflicts = openafs-features-libafs
 	conflicts = openafs-modules
 	conflicts = openafs<1.6.6-2
 	options = !emptydirs
-	source = http://openafs.org/dl/1.6.21/openafs-1.6.21-src.tar.bz2
+	source = http://openafs.org/dl/1.6.21.1/openafs-1.6.21.1-src.tar.bz2
 	source = dkms.conf
-	source = 0001-Linux-4.13-use-designated-initializers-where-require.patch
-	sha256sums = ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f
+	sha256sums = aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a
 	sha256sums = ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf
-	sha256sums = 84e8686a04e27edfc040fccfa7fd2553eb2cfd1e0f254741b8da0018bdee4b55
 
 pkgname = openafs-modules-dkms
 
diff --git a/0001-Linux-4.13-use-designated-initializers-where-require.patch b/0001-Linux-4.13-use-designated-initializers-where-require.patch
deleted file mode 100644
index 70f882203b0f..000000000000
--- a/0001-Linux-4.13-use-designated-initializers-where-require.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From cbf9f6f27ce73ca54e54c672e349e66459d11b25 Mon Sep 17 00:00:00 2001
-From: Stephan Wiesand <stephan.wiesand@desy.de>
-Date: Mon, 24 Jul 2017 11:37:54 +0200
-Subject: [PATCH] Linux 4.13: use designated initializers where required
-
-struct path is declared with the "designated_init" attribute,
-and module builds now use -Werror=designated-init. Cope.
-
-And as pointed out by Michael Meffie, struct ctl_table has
-the same requirement now, so use a designated initializer
-for the final element of the sysctl table too.
-
-Reviewed-on: https://gerrit.openafs.org/12663
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-Tested-by: Benjamin Kaduk <kaduk@mit.edu>
-(cherry picked from commit d55b41072ce873210481baa4cae5c7143011869b)
-
-Change-Id: I9797f8b1e16ab095775c53ac03e258affaa4d303
----
- src/afs/LINUX/osi_misc.c   | 2 +-
- src/afs/LINUX/osi_sysctl.c | 8 ++++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
-index 32ee5a620..50dd625e9 100644
---- a/src/afs/LINUX/osi_misc.c
-+++ b/src/afs/LINUX/osi_misc.c
-@@ -143,7 +143,7 @@ int osi_abspath(char *aname, char *buf, int buflen,
-     code = osi_lookupname_internal(name, followlink, &mnt, &dp);
-     if (!code) {
- #if defined(D_PATH_TAKES_STRUCT_PATH)
--	afs_linux_path_t p = { mnt, dp };
-+	afs_linux_path_t p = { .mnt = mnt, .dentry = dp };
- 	path = d_path(&p, buf, buflen);
- #else
- 	path = d_path(dp, mnt, buf, buflen);
-diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
-index 2b1be3b0c..4d56c4eb9 100644
---- a/src/afs/LINUX/osi_sysctl.c
-+++ b/src/afs/LINUX/osi_sysctl.c
-@@ -231,7 +231,9 @@ static struct ctl_table afs_sysctl_table[] = {
- 	.mode		= 0644,
-      	.proc_handler	= &proc_dointvec
-     },
--    {0}
-+    {
-+	.procname	= 0
-+    }
- };
- 
- static struct ctl_table fs_sysctl_table[] = {
-@@ -247,7 +249,9 @@ static struct ctl_table fs_sysctl_table[] = {
- 	.mode		= 0555, 
- 	.child		= afs_sysctl_table
-     },
--    {0}
-+    {
-+	.procname	= 0
-+    }
- };
- 
- int
--- 
-2.14.1
-
diff --git a/PKGBUILD b/PKGBUILD
index c47ff868f0af..a709e937441e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=openafs-modules-dkms
 _srcname=openafs
-pkgver=1.6.21
-pkgrel=2
+pkgver=1.6.21.1
+pkgrel=1
 pkgdesc="Kernel module for OpenAFS (dkms)"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.openafs.org"
@@ -17,18 +17,13 @@ provides=("openafs-modules=$pkgver")
 conflicts=('openafs-features-libafs' 'openafs-modules' 'openafs<1.6.6-2')
 options=(!emptydirs)
 source=(http://openafs.org/dl/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2
-        dkms.conf
-        0001-Linux-4.13-use-designated-initializers-where-require.patch)
-sha256sums=('ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f'
-            'ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf'
-            '84e8686a04e27edfc040fccfa7fd2553eb2cfd1e0f254741b8da0018bdee4b55')
+        dkms.conf)
+sha256sums=('aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a'
+            'ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf')
 
 prepare() {
   cd ${srcdir}/${_srcname}-${pkgver}
 
-  # Fix build with Linux 4.13
-  patch -p1 < ${srcdir}/0001-Linux-4.13-use-designated-initializers-where-require.patch
-
   # Only needed when changes to configure were made
   # ./regen.sh -q
 }