[arch-commits] Commit in tpm2-pkcs11/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Friday, May 14, 2021 @ 17:33:27
  Author: diabonas
Revision: 934274

Fix compilation with GCC 11

Fix the new warnings issued by GCC 11. A patch to disabled -Werror for release
builds altogether has been upstreamed and should be part of the next release.

Modified:
  tpm2-pkcs11/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-14 17:27:31 UTC (rev 934273)
+++ PKGBUILD	2021-05-14 17:33:27 UTC (rev 934274)
@@ -11,11 +11,22 @@
 makedepends=('cmocka' 'python-setuptools')
 checkdepends=('expect' 'iproute2' 'java-hamcrest' 'junit' 'libp11' 'opensc'
               'python-python-pkcs11' 'swtpm' 'tpm2-abrmd' 'tpm2-tss-engine' 'wget' 'xxd')
-source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
+        "tpm2-pkcs11-1.6.0_test-fix-build-for-gcc11.patch::$url/commit/83c484d0b40fac4a6320cf0a16456da1764849bf.patch"
+        "tpm2-pkcs11-1.6.0_fix-stringop-overread-in-str_padded_copy.patch::$url/commit/9af101b54035f25c0b03685bc34f22a4c5e934b7.patch")
 sha512sums=('db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea'
-            'SKIP')
+            'SKIP'
+            '538894af5f6aa713a9b73db8afe3a0de023c4337dc96d299b9a8368e51f0eb55883850e717abd1027f35cdd67989bfde4e1f90b85d8cb7069494d40a27616468'
+            '8983f1046e72f0ebeced4004d91e27d12cd635889c6514afc07bd75749597ac6d9828ec0c7f4f47b16893c622fd7e54f3d2c8d05e4c07965ba0529daa458ecef')
 validpgpkeys=('5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1') # William Roberts (Bill Roberts) <william.c.roberts at intel.com>
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	# Fix compilation with GCC 11
+	patch --forward --strip=1 --input="$srcdir/tpm2-pkcs11-1.6.0_test-fix-build-for-gcc11.patch"
+	patch --forward --strip=1 --input="$srcdir/tpm2-pkcs11-1.6.0_fix-stringop-overread-in-str_padded_copy.patch"
+}
+
 build() {
 	cd "$pkgname-$pkgver"
 	export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar:$CLASSPATH"