Add patch to fix missing include of stdint.h

No bump of pkgrel as this only fixes a build-time failure and the
compilation result should not change.

6 files changed, 61 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5c7b83503c7..4204bf2d1d4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Jul  6 21:40:17 UTC 2017
+# Tue Sep 12 18:11:44 UTC 2017
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
 	pkgver = 1.6.21
@@ -24,12 +24,14 @@ pkgbase = openafs
 	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 = tmpfiles.d-openafs.conf
 	sha256sums = ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f
 	sha256sums = 5bc07340fc6b6db12e92f88a33c70478d22c93de7ae1725c4b25ef43caac6e8c
-	sha256sums = 27024228ed81ed75db86a715b103385931bc0a16af38f8978b321b6ca2b7810b
-	sha256sums = 994b91acf6374f8adf7e9dfda1596c7a226691c65745bc5f4a3883590963291f
-	sha256sums = bdd244a1408a70bf81a4fa4961aa09922f8b84921ebf21017332f3000c87748b
+	sha256sums = 41360c7fa447e1d52fc10a797d890c47380535b7962906e9e7df75c8ede0dbd0
+	sha256sums = c03ee12577c6d3b26cd18e7ccb435f71829fe263f38c2496aed3b8fbfcf458ca
+	sha256sums = 7337c71896e451a9ffc9c4dbb455b700d794549382a5bb167ff5e28c2eeb15bb
+	sha256sums = 2baa8c4a83b45ea49256956803881c30735ad915ad3e7aa8ec9b58c91963b8d0
 	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 a9bc83123027..cde60af0506c 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,7 +1,7 @@
 From 6baafd46f4af7959fdaacc2a12894990e0cf6b5a 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
+Subject: [PATCH 1/4] Adjust RedHat config and service files
 
 Basically we reuse upstream's config for RedHat but we change a few things:
 
@@ -74,5 +74,5 @@ index ac9d3c411..0a4b3bfea 100644
  
  [Install]
 -- 
-2.13.2
+2.14.1
 
diff --git a/0002-Add-configure-option-to-not-install-kauth.patch b/0002-Add-configure-option-to-not-install-kauth.patch
index a611da7c8015..168c69f9ac3b 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 a828ba26835e23674b8ac9a1b452f3444faab0dd 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
+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
@@ -190,5 +190,5 @@ index dd1452e74..ad24e66f0 100644
  #
  # Misc. targets
 -- 
-2.13.2
+2.14.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
index 9518cde50fd8..ec53973b334d 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 fa88b8d50e39fad56e8c3fa7d6ef213a9819d3bc 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
+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
@@ -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.13.2
+2.14.1
 
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
new file mode 100644
index 000000000000..205ca936fffc
--- /dev/null
+++ b/0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
@@ -0,0 +1,41 @@
+From f718c1e4de1254cdcaae5f06a257e3895d9de2a8 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/4] 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.14.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 2ebadd3762b2..8369d3c8ad94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,12 +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
         tmpfiles.d-openafs.conf)
 sha256sums=('ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f'
             '5bc07340fc6b6db12e92f88a33c70478d22c93de7ae1725c4b25ef43caac6e8c'
-            '27024228ed81ed75db86a715b103385931bc0a16af38f8978b321b6ca2b7810b'
-            '994b91acf6374f8adf7e9dfda1596c7a226691c65745bc5f4a3883590963291f'
-            'bdd244a1408a70bf81a4fa4961aa09922f8b84921ebf21017332f3000c87748b'
+            '41360c7fa447e1d52fc10a797d890c47380535b7962906e9e7df75c8ede0dbd0'
+            'c03ee12577c6d3b26cd18e7ccb435f71829fe263f38c2496aed3b8fbfcf458ca'
+            '7337c71896e451a9ffc9c4dbb455b700d794549382a5bb167ff5e28c2eeb15bb'
+            '2baa8c4a83b45ea49256956803881c30735ad915ad3e7aa8ec9b58c91963b8d0'
             '5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0')
 
 # If you need the kauth tools set this to 1. But be aware that these tools
@@ -48,6 +50,9 @@ 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
+
   # Only needed when changes to configure were made
   ./regen.sh -q
 }