[packages/opensc] - fix tests build, rel 6
baggins
baggins at pld-linux.org
Fri Oct 15 22:39:52 CEST 2021
commit 0ad4458f3449fa73158472d315a39c9339eb3a2e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Oct 15 22:39:38 2021 +0200
- fix tests build, rel 6
build.patch | 13 ++++++++++++-
opensc.spec | 3 ++-
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/opensc.spec b/opensc.spec
index 260fab1..ecff28d 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -7,7 +7,7 @@ Summary: OpenSC library - for accessing SmartCard devices using PC/SC Lite
Summary(pl.UTF-8): Biblioteka OpenSC - do korzystania z kart procesorowych przy użyciu PC/SC Lite
Name: opensc
Version: 0.19.0
-Release: 5
+Release: 6
License: LGPL v2.1+
Group: Applications
#Source0Download: https://github.com/OpenSC/OpenSC/releases
@@ -18,6 +18,7 @@ Patch1: no-Werror.patch
URL: https://github.com/OpenSC/OpenSC/wiki
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
+BuildRequires: cmocka-devel
BuildRequires: docbook-style-xsl
BuildRequires: libltdl-devel
BuildRequires: libtool >= 1:1.4.2-9
diff --git a/build.patch b/build.patch
index 0549b0d..048c2d8 100644
--- a/build.patch
+++ b/build.patch
@@ -86,7 +86,7 @@
+ size_t num_keygen_mechs;
+} token_info_t;
+
-+token_info_t token;
++extern token_info_t token;
+
+#endif /* P11TEST_COMMON_H */
+
@@ -124,3 +124,14 @@ Index: git/src/pkcs15init/pkcs15-oberthur.c
if (sc_profile_get_file(profile, COSM_TITLE"-token-info", &file)) {
rv = SC_ERROR_INCONSISTENT_PROFILE;
SC_TEST_GOTO_ERR(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot find "COSM_TITLE"-token-info");
+--- opensc-0.19.0/src/tests/p11test/p11test.c~ 2018-09-13 13:52:42.000000000 +0200
++++ opensc-0.19.0/src/tests/p11test/p11test.c 2021-10-15 22:37:12.303953281 +0200
+@@ -33,6 +33,8 @@
+
+ #define DEFAULT_P11LIB "../../pkcs11/.libs/opensc-pkcs11.so"
+
++token_info_t token;
++
+ void display_usage() {
+ fprintf(stdout,
+ " Usage:\n"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opensc.git/commitdiff/0ad4458f3449fa73158472d315a39c9339eb3a2e
More information about the pld-cvs-commit
mailing list