uftrace: Upgrade to 0.8.3
PATCH 1/3 uftrace: Upgrade to 0.8.3
* Deliberately provide a non existing path to with_elfutils so it does not copy libelf.so into its staged install and become a provider for that library while elfutils should be the legit provider and this package should just list it in its rdeps
Signed-off-by Khem Raj <[email protected]>
---
.../uftrace/{uftrace_0.8.bb => uftrace_0.8.3.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/uftrace/{uftrace_0.8.bb => uftrace_0.8.3.bb} (76%)meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb renamed from meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb +5 -3
@@ -10,15 +10,17 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -SRCREV = "5af9ff9fa89c340617e52c8ed05798b352a7145c" +# v0.8.3 +SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" SRC_URI = "git://github.com/namhyung/${BPN}" S = "${WORKDIR}/git" LDFLAGS_append_libc-musl = " -largp" -EXTRA_OECONF = "ARCH=${TARGET_ARCH}" +EXTRA_UFTRACE_OECONF = "ARCH=${TARGET_ARCH} \ + with_elfutils=/use/libelf/from/sysroot" do_configure() { - ${S}/configure ${EXTRA_OECONF} + ${S}/configure ${EXTRA_UFTRACE_OECONF} } FILES_SOLIBSDEV = ""
Signature · 1 line
2.18.0
PATCH 2/3 rtorrent: Upgrade to 0.9.7 release point
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +3 -2
@@ -8,9 +8,10 @@ DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" SRC_URI = "git://github.com/rakshasa/rtorrent \ file://don-t-run-code-while-configuring-package.patch \ " -SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740" +# v0.9.7 +SRCREV = "327164f9d86aafcd2500a317d485374df32ea622" -PV = "0.9.6+git${SRCPV}" +PV = "0.9.7+git${SRCPV}" S = "${WORKDIR}/git"
Signature · 1 line
2.18.0
PATCH v2 3/3 opensc: Upgrade to 0.18.0
In reply to Khem Raj* Fixes build with OpenSSL 1.1.x
* Fix build with gcc8
Signed-off-by Khem Raj <[email protected]>
---
v2: Fix build with gcc8
...-Fixed-gcc-8-compilation-errors-1353.patch | 73 +++++++++++++++++++
.../{opensc_0.16.0.bb => opensc_0.18.0.bb} | 9 ++-
2 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch
rename meta-oe/recipes-support/opensc/{opensc_0.16.0.bb => opensc_0.18.0.bb} (82%)meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch new file +73 -0
@@ -0,0 +1,73 @@ +From 87857d5cae7db94fdd776904886392b1e86053bd Mon Sep 17 00:00:00 2001 +From: Florian Bezdeka <[email protected]> +Date: Fri, 18 May 2018 18:54:56 +0200 +Subject: [PATCH] Fixed gcc 8 compilation errors (#1353) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The following errors occured during a compilation using gcc 8: + +In function »gids_create_file.constprop«, + inserted by »gids_save_certificate.isra.8« beicard-gids.c:1548:7: +card-gids.c:465:2: Error: »strncpy« output may be truncated copying 8 bytes from a string of length 8 [-Werror=stringop-truncation] + strncpy(record->filename, filename, 8); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +pkcs15-oberthur.c: In function »sc_pkcs15emu_oberthur_add_prvkey«: +pkcs15-oberthur.c:741:5: Error: »strncpy« output may be truncated copying 254 bytes from a string of length 254 [-Werror=stringop-truncation] + strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/OpenSC/OpenSC/pull/1353] +Signed-off-by Khem Raj <[email protected]> +--- + src/libopensc/card-gids.c | 3 ++- + src/libopensc/pkcs15-oberthur.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/libopensc/card-gids.c b/src/libopensc/card-gids.c +index fc5d2a7..ac3e579 100644 +--- a/src/libopensc/card-gids.c ++++ b/src/libopensc/card-gids.c +@@ -33,6 +33,7 @@ Some features are undocumented like the format used to store certificates. They + + #include <stdlib.h> + #include <string.h> ++#include "../common/compat_strlcpy.h" + + #ifdef ENABLE_OPENSSL + /* openssl only needed for card administration */ +@@ -462,7 +463,7 @@ static int gids_create_file(sc_card_t *card, char* directory, char* filename) { + memset(masterfilebuffer + offset, 0, sizeof(gids_mf_record_t)); + record = (gids_mf_record_t*) (masterfilebuffer + offset); + strncpy(record->directory, directory, 8); +- strncpy(record->filename, filename, 8); ++ strlcpy(record->filename, filename, sizeof(record->filename)); + record->fileIdentifier = fileIdentifier; + record->dataObjectIdentifier = dataObjectIdentifier; + +diff --git a/src/libopensc/pkcs15-oberthur.c b/src/libopensc/pkcs15-oberthur.c +index 4f841ed..3415be7 100644 +--- a/src/libopensc/pkcs15-oberthur.c ++++ b/src/libopensc/pkcs15-oberthur.c +@@ -29,6 +29,7 @@ + #include <stdlib.h> + #include <string.h> + #include <stdio.h> ++#include "../common/compat_strlcpy.h" + + #include "pkcs15.h" + #include "log.h" +@@ -738,7 +739,7 @@ sc_pkcs15emu_oberthur_add_prvkey(struct sc_pkcs15_card *p15card, + unsigned int id = path.value[path.len - 2] * 0x100 + path.value[path.len - 1]; + + if (id == ccont.id_cert) { +- strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1); ++ strlcpy(kobj.label, objs[ii]->label, sizeof(kobj.label)); + break; + } + } +-- +2.18.0 +
meta-oe/recipes-support/opensc/opensc_0.18.0.bb renamed from meta-oe/recipes-support/opensc/opensc_0.16.0.bb +6 -3
@@ -9,10 +9,12 @@ eID cards have also been confirmed to work." HOMEPAGE = "http://www.opensc-project.org/opensc/" SECTION = "System Environment/Libraries" -SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ + file://0001-Fixed-gcc-8-compilation-errors-1353.patch \ + " -SRC_URI[md5sum] = "724d128f23cd7a74b28d04300ce7bcbd" -SRC_URI[sha256sum] = "3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729" +SRC_URI[md5sum] = "bce516f752e0db5327aa06cc0136fe27" +SRC_URI[sha256sum] = "6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033" DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
@@ -21,6 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" inherit autotools pkgconfig +S = "${WORKDIR}/OpenSC-${PV}" EXTRA_OECONF = " \ --disable-static \ --enable-openct \
Signature · 1 line
2.18.0