upgpkg: trousers 0.3.14-4

Apply trousers-0.3.14-fno-common.patch from Gentoo to fix build

3 files changed, 30 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6463658ba2e1..686628681d3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Jun 10 22:14:15 UTC 2017
 pkgbase = trousers
 	pkgdesc = Open-source TCG Software Stack implementation for use with a TPM
 	pkgver = 0.3.14
-	pkgrel = 3
+	pkgrel = 4
 	url = http://sourceforge.net/projects/trousers
 	arch = i686
 	arch = x86_64
@@ -17,12 +15,14 @@ pkgbase = trousers
 	source = tcsd.service
 	source = 70-tpmd.rules
 	source = 01-tss-user.patch
+	source = trousers-0.3.14-fno-common.patch
 	sha256sums = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47
 	sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7
 	sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de
 	sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd
 	sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884
 	sha256sums = 169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7
+	sha256sums = 770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27
 
 pkgname = trousers
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b2d465efd4c..2732270fc59c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,32 +8,35 @@
 
 pkgname=trousers
 pkgver=0.3.14
-pkgrel=3
+pkgrel=4
 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/trousers"
 license=('CPL')
 depends=('openssl')
 options=('libtool')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        sysusers.conf
-        tmpfiles.conf
-        tcsd.service
-        70-tpmd.rules
-        01-tss-user.patch)
-noextract=(${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'sysusers.conf'
+        'tmpfiles.conf'
+        'tcsd.service'
+        '70-tpmd.rules'
+        '01-tss-user.patch'
+        'trousers-0.3.14-fno-common.patch')
+noextract=("${pkgname}-${pkgver}.tar.gz")
 sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47'
             '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7'
             '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de'
             '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd'
             'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884'
-            '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7')
+            '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7'
+            '770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27')
 
 prepare() {
   mkdir -p ${pkgname}-${pkgver}
   bsdtar -x -f ${pkgname}-${pkgver}.tar.gz -C ${pkgname}-${pkgver}
   cd ${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/01-tss-user.patch
+  patch -p1 -i ${srcdir}/trousers-0.3.14-fno-common.patch
 }
 
 build() {
diff --git a/trousers-0.3.14-fno-common.patch b/trousers-0.3.14-fno-common.patch
new file mode 100644
index 000000000000..5046bc70883b
--- /dev/null
+++ b/trousers-0.3.14-fno-common.patch
@@ -0,0 +1,15 @@
+diff --git a/src/include/tcsd.h b/src/include/tcsd.h
+index 5b9462b..05bae97 100644
+--- a/src/include/tcsd.h
++++ b/src/include/tcsd.h
+@@ -166,8 +166,8 @@ void	   thread_signal_init();
+ 
+ /* signal handling */
+ #ifndef __APPLE__
+-struct sigaction tcsd_sa_int;
+-struct sigaction tcsd_sa_chld;
++extern struct sigaction tcsd_sa_int;
++extern struct sigaction tcsd_sa_chld;
+ #endif
+ 
+ #endif