Skip to content

Commit 2aeee4b

Browse files
committed
opensc: Upgrade to 0.19.0
Switch fetcher to use github Add patch to build with gcc9 Remove upstreamed patch Inherit bash-completion Signed-off-by: Khem Raj <[email protected]>
1 parent 08f2eaa commit 2aeee4b

File tree

3 files changed

+42
-84
lines changed

3 files changed

+42
-84
lines changed

meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch

Lines changed: 0 additions & 73 deletions
This file was deleted.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From c012f46965b3fe24e31367796e52c2d0b14ca5d9 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <[email protected]>
3+
Date: Mon, 17 Dec 2018 18:44:23 -0800
4+
Subject: [PATCH] Remove redundant logging
5+
6+
Same information is printed a few line below in same function, the only
7+
difference is that there it takes care of case when label is NULL pointer
8+
unlike this line
9+
10+
secondly, every function call to cosm_write_tokeninfo() in this file
11+
passes label=NULL, and then it tries to print a null pointer
12+
13+
Fixes errors like
14+
src/libopensc/log.h:48:47: error: '%s' directive argument is null
15+
[-Werror=format-overflow=]
16+
17+
Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1557]
18+
Signed-off-by: Khem Raj <[email protected]>
19+
---
20+
src/pkcs15init/pkcs15-oberthur.c | 1 -
21+
1 file changed, 1 deletion(-)
22+
23+
Index: git/src/pkcs15init/pkcs15-oberthur.c
24+
===================================================================
25+
--- git.orig/src/pkcs15init/pkcs15-oberthur.c
26+
+++ git/src/pkcs15init/pkcs15-oberthur.c
27+
@@ -70,7 +70,6 @@ cosm_write_tokeninfo (struct sc_pkcs15_c
28+
ctx = p15card->card->ctx;
29+
30+
SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_VERBOSE);
31+
- sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "cosm_write_tokeninfo() label '%s'; flags 0x%X", label, flags);
32+
if (sc_profile_get_file(profile, COSM_TITLE"-token-info", &file)) {
33+
rv = SC_ERROR_INCONSISTENT_PROFILE;
34+
SC_TEST_GOTO_ERR(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot find "COSM_TITLE"-token-info");

meta-oe/recipes-support/opensc/opensc_0.18.0.bb renamed to meta-oe/recipes-support/opensc/opensc_0.19.0.bb

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,19 @@ eID cards have also been confirmed to work."
88

99
HOMEPAGE = "http://www.opensc-project.org/opensc/"
1010
SECTION = "System Environment/Libraries"
11+
LICENSE = "LGPLv2+"
12+
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
1113

12-
SRC_URI = "https://snapshot.debian.org/archive/debian/20180521T101428Z/pool/main/o/opensc/opensc_0.18.0.orig.tar.gz \
13-
file://0001-Fixed-gcc-8-compilation-errors-1353.patch \
14+
#v0.19.0
15+
SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47"
16+
SRC_URI = "git://github.com/OpenSC/OpenSC \
17+
file://0001-Remove-redundant-logging.patch \
1418
"
15-
16-
SRC_URI[md5sum] = "bce516f752e0db5327aa06cc0136fe27"
17-
SRC_URI[sha256sum] = "6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033"
18-
1919
DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
2020

21-
LICENSE = "LGPLv2+"
22-
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
23-
24-
inherit autotools pkgconfig
21+
S = "${WORKDIR}/git"
22+
inherit autotools pkgconfig bash-completion
2523

26-
S = "${WORKDIR}/OpenSC-${PV}"
2724
EXTRA_OECONF = " \
2825
--disable-static \
2926
--enable-openct \

0 commit comments

Comments
 (0)