meta-openembedded: subtree update:ea8604a0e3..d0748372d2
Adrian Bunk (1):
libnih: Remove
Alexander Kanavin (3):
sysprof: add a recipe from oe-core
sysprof: update to 3.34.1
sysprof: fix ARM builds
Andreas Müller (2):
evolution-data-server: remove pythonnative from inherit
fontforge: rework for python3
Diego Rondini (2):
cups-filters: use libexecdir and cleanup
cups-filters: upgrade 1.26.0 -> 1.26.2
Gianfranco Costamagna (2):
websocketpp: refresh clang patch
vboxguestdrivers: update to new version 6.1.2
Khem Raj (14):
sysprof: avoid namesapace conflict with glibc headers
jack: Use c++ compiler for programs which use c++ source files
iozone3: Do not define prototype for pread64()
libhugetlbfs: Fix missing file mode in create() API
rdma-core: Use overloadable attribute with clang
sysprof: Correct systemdunitdir location
opencv: Tend for the compiler --param option rename in gcc10
grpc: Link with libatomic on powerpc
ssiapi: Needs boost/ppc support
fluentbit: Fix build on powerpc
mozjs: extend --with-intl-api=build to ppc
mpv: Disable lua support on powerpc
packagegroup-meta-oe: Remove unbuildable recipes for ppc64le from rdeps
opensc: Upgrade to 0.20.0
Mingde (Matthew) Zeng (2):
byacc: upgrade 20191103 -> 20191125
keyutils: upgrade 1.6 -> 1.6.1
Peter Kjellerstedt (1):
gitpkgv.bbclass: Add support for extending the supported tag formats
S. Lockwood-Childs (1):
lcov: geninfo needs another perl module
Wang Mingyu (15):
python3-cheetah: upgrade 3.2.3 -> 3.2.4
python3-coverage: 4.4.2 -> 5.0.2
python3-keras-applications: upgrade 1.0.6 -> 1.0.8
python3-keras-preprocessing: upgrade 1.0.5 -> 1.1.0
python3-more-itertools: 7.2.0 -> 8.1.0
python3-multidict: 4.5.2 -> 4.7.4
python3-ordered-set: 3.0.1 -> 3.1.1
python3-pulsectl: upgrade 18.12.5 -> 20.1.2
python-cmd2: upgrade 0.9.22 -> 0.9.23
python-engineio: upgrade 3.11.1 -> 3.11.2
python-javaobj-py3: upgrade 0.3.0 -> 0.4.0.1
python-kconfiglib: upgrade 10.42.0 -> 13.7.0
python-packaging: 19.2 -> 20.0
python-periphery: 2.0.0 -> 2.0.1
python-pyrsistent: upgrade 0.15.5 -> 0.15.7
William A. Kennington III via Openembedded-devel (1):
cppzmq: bump to version 4.6.0
Yi Zhao (3):
crda: fix UDEV_RULE_DIR
open-vm-tools: fix build error with usrmerge feature
multipath-tools: fix libudevdir
Zang Ruochen (14):
dhcpcd: upgrade 8.1.1 -> 8.1.5
fio: upgrade 3.16 -> 3.17
libencode-perl: upgrade 3.01 -> 3.02
zabbix: modify service file
libmicrohttpd: upgrade 0.9.68 -> 0.9.69
libsass: upgrade 3.6.1 -> 3.6.3
pcsc-lite: upgrade 1.8.25 -> 1.8.26
python3-yarl: upgrade 1.3.0 -> 1.4.2
python3-wheel: upgrade 0.32.3 -> 0.33.6
python3-websockets: upgrade 8.0.2 -> 8.1
python-wcwidth: upgrade 0.1.7 -> 0.1.8
python-waitress: upgrade 1.4.1 -> 1.4.2
python-tqdm: upgrade 4.38.0 -> 4.41.1
python-supervisor: upgrade 4.0.2 -> 4.1.0
Change-Id: I2c394941fc3140bfeadcec3542cd72892fdcda6e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch b/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch
deleted file mode 100644
index eb71b9d..0000000
--- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 283578519ec83a8792b026c10322789784d629de Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Dec 2019 11:33:57 -0800
-Subject: [PATCH] Fix misleading code indentation
-
-Fixes
-error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
- if(cipher)
- ^
-../../../git/src/libopensc/card-entersafe.c:369:2: note: previous statement is here
- if(sbuf)
- ^
-Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1894]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libopensc/card-entersafe.c | 12 ++++++------
- src/tools/pkcs15-init.c | 4 ++--
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c
-index 3e42c11f..abb9fd81 100644
---- a/src/libopensc/card-entersafe.c
-+++ b/src/libopensc/card-entersafe.c
-@@ -352,10 +352,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu,
- size_t cipher_data_size,mac_data_size;
- int blocks;
- int r=SC_SUCCESS;
-- u8 *sbuf=NULL;
-- size_t ssize=0;
-+ u8 *sbuf=NULL;
-+ size_t ssize=0;
-
-- SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
-+ SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
-
- assert(card);
- assert(apdu);
-@@ -363,10 +363,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu,
- if((cipher||mac) && (!key||(keylen!=8 && keylen!=16)))
- SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, SC_ERROR_INVALID_ARGUMENTS);
-
-- r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
-- if (r == SC_SUCCESS)
-+ r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
-+ if (r == SC_SUCCESS)
- sc_apdu_log(card->ctx, SC_LOG_DEBUG_VERBOSE, sbuf, ssize, 1);
-- if(sbuf)
-+ if(sbuf)
- free(sbuf);
-
- if(cipher)
-diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c
-index 1ce79f45..9a73121c 100644
---- a/src/tools/pkcs15-init.c
-+++ b/src/tools/pkcs15-init.c
-@@ -2311,8 +2311,8 @@ do_read_private_key(const char *filename, const char *format,
- r = util_getpass(&passphrase, &len, stdin);
- if (r < 0 || !passphrase)
- return SC_ERROR_INTERNAL;
-- r = do_read_pkcs12_private_key(filename,
-- passphrase, pk, certs, max_certs);
-+ r = do_read_pkcs12_private_key(filename,
-+ passphrase, pk, certs, max_certs);
- }
- } else {
- util_error("Error when reading private key. "
---
-2.24.1
-
diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch b/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch
deleted file mode 100644
index 291f1a2..0000000
--- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c012f46965b3fe24e31367796e52c2d0b14ca5d9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 17 Dec 2018 18:44:23 -0800
-Subject: [PATCH] Remove redundant logging
-
-Same information is printed a few line below in same function, the only
-difference is that there it takes care of case when label is NULL pointer
-unlike this line
-
-secondly, every function call to cosm_write_tokeninfo() in this file
-passes label=NULL, and then it tries to print a null pointer
-
-Fixes errors like
-src/libopensc/log.h:48:47: error: '%s' directive argument is null
-[-Werror=format-overflow=]
-
-Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1557]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/pkcs15init/pkcs15-oberthur.c | 1 -
- 1 file changed, 1 deletion(-)
-
-Index: git/src/pkcs15init/pkcs15-oberthur.c
-===================================================================
---- git.orig/src/pkcs15init/pkcs15-oberthur.c
-+++ git/src/pkcs15init/pkcs15-oberthur.c
-@@ -70,7 +70,6 @@ cosm_write_tokeninfo (struct sc_pkcs15_c
- ctx = p15card->card->ctx;
-
- SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_VERBOSE);
-- sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "cosm_write_tokeninfo() label '%s'; flags 0x%X", label, flags);
- 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");
diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.0.bb
similarity index 88%
rename from meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
rename to meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.0.bb
index 0d744e2..a815980 100644
--- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.0.bb
@@ -12,10 +12,8 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
#v0.19.0
-SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47"
+SRCREV = "45e29056ccde422e70ed3585084a7f150c632515"
SRC_URI = "git://github.com/OpenSC/OpenSC \
- file://0001-Remove-redundant-logging.patch \
- file://0001-Fix-misleading-code-indentation.patch \
"
DEPENDS = "virtual/libiconv openssl"