Update to 1.6.22.1

8 files changed, 30 insertions, 152 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf09af3a45e5..cd1edd6878fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec  5 17:35:15 UTC 2017
+# Fri Dec 22 13:21:21 UTC 2017
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
-	pkgver = 1.6.22
+	pkgver = 1.6.22.1
 	pkgrel = 1
 	url = http://www.openafs.org
 	install = openafs.install
@@ -19,23 +19,19 @@ pkgbase = openafs
 	backup = etc/openafs/ThisCell
 	backup = etc/openafs/cacheinfo
 	backup = etc/openafs/CellServDB
-	source = http://openafs.org/dl/1.6.22/openafs-1.6.22-src.tar.bz2
-	source = http://openafs.org/dl/1.6.22/openafs-1.6.22-doc.tar.bz2
+	source = http://openafs.org/dl/1.6.22.1/openafs-1.6.22.1-src.tar.bz2
+	source = http://openafs.org/dl/1.6.22.1/openafs-1.6.22.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 = 0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
-	source = 0005-Correct-m4-conditionals-in-curses.m4.patch
-	source = 0006-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
+	source = 0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
 	source = tmpfiles.d-openafs.conf
-	sha256sums = 835410b75d14aec1ac6a1138d8194897f1badeffa3a0c282963ad51996712347
-	sha256sums = 0e177e007ea802891d23bcecd5a836f7c768e9af0d70aab4259233cd2d474a0f
-	sha256sums = d8f7a86b38e23b4cf87e0ee2316dff7181bbc665bda67a675dc038ee863d75e9
-	sha256sums = 58d4c6ccf6593c1d636f754151f519f1739fadb8b58f09876eac1b186830d53b
-	sha256sums = 637301787ee0097c879065f1f22a3b240692d97f5d735ec1a3bfb12571c761c6
-	sha256sums = a4a944df1b23a1ae90b9af05382b09a624ec80629f3c307dc9f8b245ace7b73e
-	sha256sums = 0e374c821390685fbb90beab178da9381e765b57608e95ed339d864facd71150
-	sha256sums = ee998d2e06c5443f19cfbad811459e962052c1adabf29058d3802dbe54c22681
+	sha256sums = 5c617948b6bf5a079c14fb7ee86b99e97d23fe6267ca5e079364acc3f55ccea6
+	sha256sums = e3311dbeabd0294d4b5834c6e1c21477e7dbf3856622255924b2d39d9185e5a0
+	sha256sums = 02def7965bdca50b27ab96b9232cf83a9925bd2ff3f5c5f8e1849ccf884ca246
+	sha256sums = 1b4bd52e9f82eee9d687b0b3c37800d75181922ec81d0cd33314d1689fe66f34
+	sha256sums = b9bac6683202a47366f69bc144d505be6f4a8123913f832b539ac44c1c27b462
+	sha256sums = d0f0fef4ce6704708ed27f9de3b91b10538961668a84d9a10768bb69370867d1
 	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 84adefc4c5ab..7bc2901b5580 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,7 +1,7 @@
-From 2993aa722b69b7afbfe61baec7be1fcb7467e773 Mon Sep 17 00:00:00 2001
+From 5f29e42b563b7b5975948720135ec624fdcc7763 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/6] Adjust RedHat config and service files
+Subject: [PATCH 1/4] Adjust RedHat config and service files
 
 Basically we reuse upstream's config for RedHat but we change a few things:
 
diff --git a/0002-Add-configure-option-to-not-install-kauth.patch b/0002-Add-configure-option-to-not-install-kauth.patch
index 7a0dabdf3ab8..322784974dc6 100644
--- a/0002-Add-configure-option-to-not-install-kauth.patch
+++ b/0002-Add-configure-option-to-not-install-kauth.patch
@@ -1,7 +1,7 @@
-From e3e870b3fde5b43a5c821caef3b08892768f8b44 Mon Sep 17 00:00:00 2001
+From 561a695fb2aecf0df3382c5bdac793e7a0fc55cd 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/6] Add configure option to not install kauth
+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
@@ -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 d80cacd78..68793c40b 100644
+index ebfa0cb2a..edd6b18b4 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -159,6 +159,14 @@ AC_ARG_ENABLE([transarc-paths],
@@ -43,7 +43,7 @@ index d80cacd78..68793c40b 100644
  dnl Optimization and debugging flags.
  AC_ARG_ENABLE([strip-binaries],
      [AS_HELP_STRING([--disable-strip-binaries],
-@@ -1528,6 +1536,13 @@ else
+@@ -1532,6 +1540,13 @@ else
  fi
  AC_SUBST(BUILD_LOGIN)
  
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 5be8d13c2ae9..b11c56ebd57f 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,7 +1,7 @@
-From d64c31ec792b9bd3515d7c1fdaffcf0585f1ae66 Mon Sep 17 00:00:00 2001
+From 7263e86546d2fb657a0b2e56454acd4ba956ac61 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/6] Do not install kauth manpages when kauth is disabled
+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
diff --git a/0006-gtx-link-against-libtinfo-if-termlib-is-seperated.patch b/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
index 0df3406a0112..6c7d2dcfc911 100644
--- a/0006-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
+++ b/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
@@ -1,7 +1,7 @@
-From d3ed4ce1495d88fbbf76709a63314e10238c5753 Mon Sep 17 00:00:00 2001
+From 7942412eecdf8920e381d8281316ec92c1b88f58 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 6/6] gtx: link against libtinfo if termlib is seperated
+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
diff --git a/0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch b/0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
deleted file mode 100644
index 02531874107f..000000000000
--- a/0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5681d9bcef0bf76453b387cad325cd6c3c527919 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20La=C3=9F?= <lass@mail.uni-paderborn.de>
-Date: Tue, 12 Sep 2017 19:33:15 +0200
-Subject: [PATCH 4/6] vol: add missing include of stdint.h to volinodes.h
-
-volinodes.h requires stdint.h for use of uintptr_t:
-
-In file included from vutil.c:55:0:
-volinodes.h: In function 'init_inode_info':
-volinodes.h:109:45: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'?
-  stuff[i].inode = (Inode*)((char*)header + (uintptr_t)stuff[i].inode);
-                                             ^~~~~~~~~
-                                             intptr_t
-
-Similar changes have been applied earlier in 1e53da3.
-
-This change does not apply to master since e2b4fde added an include of roken.h
-to all affected source files which in turn includes stdint.h.
-
-Change-Id: Iddd174e844583e06f66d910052e11feff928ba40
----
- src/vol/volinodes.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/vol/volinodes.h b/src/vol/volinodes.h
-index 181b441d9..2dec0ceeb 100644
---- a/src/vol/volinodes.h
-+++ b/src/vol/volinodes.h
-@@ -18,6 +18,9 @@
- #define __volinodes_h_
- 
- #include <stddef.h>
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
- 
- /* Used by vutil.c and salvager.c */
- 
--- 
-2.15.1
-
diff --git a/0005-Correct-m4-conditionals-in-curses.m4.patch b/0005-Correct-m4-conditionals-in-curses.m4.patch
deleted file mode 100644
index 904a14c3bc27..000000000000
--- a/0005-Correct-m4-conditionals-in-curses.m4.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d28fd9531b2dde509b0905be84cac7a20dd2ea39 Mon Sep 17 00:00:00 2001
-From: Benjamin Kaduk <kaduk@mit.edu>
-Date: Mon, 16 Oct 2017 16:53:22 -0500
-Subject: [PATCH 5/6] Correct m4 conditionals in curses.m4
-
-AS_IF does not invoke the test(1) shell builtin for us, so we must
-take care to consistently use it ourself.
-
-While here, sprinkle some missing double-quotes around variable
-expansions in AS_IF statements in this file.
-
-Submitted by Bastian Beischer.
-
-FIXES 134414
-
-Change-Id: Iccfe311011f17de6317cf64abdc58b0812b81b8c
-Reviewed-on: https://gerrit.openafs.org/12738
-Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-Tested-by: Benjamin Kaduk <kaduk@mit.edu>
-(cherry picked from commit e0c5ada214596d5adb6798682d5e280cc99f447c)
-Reviewed-on: https://gerrit.openafs.org/12739
-(cherry picked from commit bc384b7d5e4818c567a64fe4a935f021d936444f)
----
- src/cf/curses.m4 | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/cf/curses.m4 b/src/cf/curses.m4
-index a0cdc60f1..dc01469f5 100644
---- a/src/cf/curses.m4
-+++ b/src/cf/curses.m4
-@@ -55,7 +55,7 @@ AC_DEFUN([_OPENAFS_CURSES_GETMAXYX_BSD43],
-  dnl possibly this may need to be done as above in some cases?
-  AC_CHECK_FUNCS([getmaxx getmaxy], [], [_openafs_curses_bsd43=no])
-  LIBS="$save_LIBS"
-- AS_IF([$_openafs_curses_bsd43 = yes], [$1], [$2])])
-+ AS_IF([test "$_openafs_curses_bsd43" = yes], [$1], [$2])])
- 
- dnl _OPENAFS_CURSES_GETMAXYX_BSDVI([ACTION-IF-SUCCESS], [ACTION_IF_FAILURE])
- dnl test for getmaxx() and getmaxy() as from BSD curses as bodily ripped
-@@ -68,7 +68,7 @@ AC_DEFUN([_OPENAFS_CURSES_GETMAXYX_BSDVI],
-  AC_CHECK_MEMBERS([WINDOW._maxx WINDOW._maxy], [], [_openafs_curses_bsdvi=no],
- 		  _OPENAFS_CURSES_HEADERS)
-  LIBS="$save_LIBS"
-- AS_IF([$_openafs_curses_bsdvi = yes], [$1], [$2])])
-+ AS_IF([test "$_openafs_curses_bsdvi" = yes], [$1], [$2])])
- 
- dnl OPENAFS_CURSES_WINDOW_EXTENTS([ACTION-IF-SUCCESS], [ACTION_IF_FAILURE])
- dnl check for standard getmaxyx macro. failing that, try the
-@@ -78,11 +78,11 @@ AC_DEFUN([OPENAFS_CURSES_WINDOW_EXTENTS],
- [OPENAFS_CURSES_LIB
-  openafs_curses_extent=none
-  _OPENAFS_CURSES_GETMAXYX_XTI([openafs_curses_extent=xti])
-- AS_IF([test $openafs_curses_extent = none],
-+ AS_IF([test "$openafs_curses_extent" = none],
-        [_OPENAFS_CURSES_GETMAXYX_BSD43([openafs_curses_extent=bsd])])
-- AS_IF([test $openafs_curses_extent = none],
-+ AS_IF([test "$openafs_curses_extent" = none],
-        [_OPENAFS_CURSES_GETMAXYX_BSDVI([openafs_curses_extent=vi])],)
-- AS_IF([test $openafs_curses_extent != none], [$1], [$2])])
-+ AS_IF([test "$openafs_curses_extent" != none], [$1], [$2])])
- 
- dnl The top level curses group
- AC_DEFUN([OPENAFS_CURSES],
--- 
-2.15.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d6711c1314bd..0426833ce551 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://github.com/michaellass/AUR
 
 pkgname=openafs
-pkgver=1.6.22
+pkgver=1.6.22.1
 pkgrel=1
 pkgdesc="Open source implementation of the AFS distributed file system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -26,18 +26,14 @@ source=(http://openafs.org/dl/${pkgver}/${pkgname}-${pkgver}-src.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-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
-        0005-Correct-m4-conditionals-in-curses.m4.patch
-        0006-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
+        0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
         tmpfiles.d-openafs.conf)
-sha256sums=('835410b75d14aec1ac6a1138d8194897f1badeffa3a0c282963ad51996712347'
-            '0e177e007ea802891d23bcecd5a836f7c768e9af0d70aab4259233cd2d474a0f'
-            'd8f7a86b38e23b4cf87e0ee2316dff7181bbc665bda67a675dc038ee863d75e9'
-            '58d4c6ccf6593c1d636f754151f519f1739fadb8b58f09876eac1b186830d53b'
-            '637301787ee0097c879065f1f22a3b240692d97f5d735ec1a3bfb12571c761c6'
-            'a4a944df1b23a1ae90b9af05382b09a624ec80629f3c307dc9f8b245ace7b73e'
-            '0e374c821390685fbb90beab178da9381e765b57608e95ed339d864facd71150'
-            'ee998d2e06c5443f19cfbad811459e962052c1adabf29058d3802dbe54c22681'
+sha256sums=('5c617948b6bf5a079c14fb7ee86b99e97d23fe6267ca5e079364acc3f55ccea6'
+            'e3311dbeabd0294d4b5834c6e1c21477e7dbf3856622255924b2d39d9185e5a0'
+            '02def7965bdca50b27ab96b9232cf83a9925bd2ff3f5c5f8e1849ccf884ca246'
+            '1b4bd52e9f82eee9d687b0b3c37800d75181922ec81d0cd33314d1689fe66f34'
+            'b9bac6683202a47366f69bc144d505be6f4a8123913f832b539ac44c1c27b462'
+            'd0f0fef4ce6704708ed27f9de3b91b10538961668a84d9a10768bb69370867d1'
             '18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68')
 
 # If you need the kauth tools set this to 1. But be aware that these tools
@@ -54,18 +50,12 @@ prepare() {
   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 missing include of stdint.h (under review: https://gerrit.openafs.org/12724/)
-  patch -p1 < ${srcdir}/0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
-
-  # Fix curses checks during configure (https://gerrit.openafs.org/12740/)
-  patch -p1 < ${srcdir}/0005-Correct-m4-conditionals-in-curses.m4.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}/0006-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
+  patch -p1 < ${srcdir}/0004-gtx-link-against-libtinfo-if-termlib-is-seperated.patch
 
   # Only needed when changes to configure were made
   ./regen.sh -q