gentoo resync : 21.06.2020

3 files changed, 43 insertions, 1 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 859089030687..24cffd3fbb4e 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,3 +1,4 @@
+AUX opensc-0.20.0-gcc10.patch 1132 BLAKE2B 1afde2a2a92c85a1435bf6b2f4cf9d44fec836effb1867c8e28bd4a4b8ec78dbf1d7ea075c77bfa2ff0a585ba62068765a093cfe8925deea4f9c4972bf04930f SHA512 d7cabea0090b6c05ffd5f597261f06afa3ba0f051e1b75f715a6fa50c59cd10663f023f570af8f76532dd5a3bb8a76d5cd6b26872de271e3eadae29c3ba7bd27
 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
-EBUILD opensc-0.20.0.ebuild 1644 BLAKE2B 5d9381c45835959f5b58fed17bcb462c65e57e7cfa97e77b824e1310baf57a73bdc6f60a9ce25ab68cfcbc82e546e8c1f7ff855b52cb70073d716c14447e434e SHA512 3b05dd6371fe7898d5cda9dac9f1ad4da67365b81fa0402b0b77b2d97bebc1a3260cd2dab5028a56f3636e274d97a349a6cf9b26bfa46a3f675ba6591310ce4d
+EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 028e0d4a6c6eb6e627e4f225d264c57eba5e88998912f1eee3474bca5bb24fd7a18cc8a4b5dbca203bda357c82256b402d7c1e23a7aa26a648544f44d8c547d6 SHA512 9b82334aef15c1fb91dd4ca377f2214828b9eb7721f0ec25e0f7e4be5fa1700f55280741e2a79d67ef3c5d5c52d4249f123f1db776ee40775a8dfbee0ae4e533
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
new file mode 100644
index 000000000000..f96a1140872e
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
@@ -0,0 +1,37 @@
+From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Mon, 10 Feb 2020 15:09:17 +0100
+Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
+
+---
+ src/tests/p11test/p11test.c        | 3 +++
+ src/tests/p11test/p11test_common.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
+index feecf6fb42..a16282cba3 100644
+--- a/src/tests/p11test/p11test.c
++++ b/src/tests/p11test/p11test.c
+@@ -34,6 +34,9 @@
+ 
+ #define DEFAULT_P11LIB	"../../pkcs11/.libs/opensc-pkcs11.so"
+ 
++/* Global variable keeping information about token we are using */
++token_info_t token;
++
+ void display_usage() {
+ 	fprintf(stdout,
+ 		" Usage:\n"
+diff --git a/src/tests/p11test/p11test_common.h b/src/tests/p11test/p11test_common.h
+index 2f3b238de0..9eb5cedecb 100644
+--- a/src/tests/p11test/p11test_common.h
++++ b/src/tests/p11test/p11test_common.h
+@@ -84,7 +84,7 @@ typedef struct {
+ 	size_t  num_keygen_mechs;
+ } token_info_t;
+ 
+-token_info_t token;
++extern token_info_t token;
+ 
+ #endif /* P11TEST_COMMON_H */
+ 
diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild b/dev-libs/opensc/opensc-0.20.0.ebuild
index d32490c9e604..fdfd50b8daa8 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -36,6 +36,10 @@ REQUIRED_USE="
 	ctapi? ( !pcsc-lite !openct )
 	|| ( pcsc-lite openct ctapi )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
 	default
 	elibtoolize