patch review
cover patch review
Lastest thud changes. Most have been on the list already.
Commnets by Thursday
The following changes since commit f5be8c8309a932cde507ba24d042880a922df0b6:
linux-yocto/4.14: update to v4.14.143 (2019-09-24 08:28:04 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/thud-nmut
http://cgit.openembedded.org//log/?h=stable/thud-nmut
Adrian Bunk (1):
json-c: Don't --enable-rdrand
Andrii Bordunov via Openembedded-core (1):
wget: Security fixes CVE-2018-20483
Armin Kuster (1):
qemu: fix build issue on new hosts with glibc 2.30
Chen Qi (1):
oeqa/selftest/context: ensure log directory exists
Dan Tran (3):
qemu: Fix 4 CVEs
unzip: fix CVE-2019-13232
perl: Fix CVE-2018-18311 to 18314
Khem Raj (1):
gnupg: Do not apply -Woverride-init guard for gcc >= 9
Michael Halstead (1):
uninative: Update to 2.7 release
Sean Nyekjaer (1):
libgpg-error: Fix build with gawk 5.x
Shubham Agrawal (2):
elfutils: CVE fix for elfutils
sqlite3: Security fix for CVE-2019-8457
meta/conf/distro/include/yocto-uninative.inc | 10 +- meta/lib/oeqa/selftest/context.py | 1 + meta/recipes-devtools/elfutils/elfutils_0.175.bb | 2 + .../elfutils/files/CVE-2019-7664.patch | 65 ++++ .../elfutils/files/CVE-2019-7665.patch | 154 +++++++++ meta/recipes-devtools/json-c/json-c_0.13.1.bb | 2 - .../perl/perl/CVE-2018-18311.patch | 183 +++++++++++ .../perl/perl/CVE-2018-18312.patch | Bin 0 -> 2125 bytes .../perl/perl/CVE-2018-18313.patch | 60 ++++ .../perl/perl/CVE-2018-18314.patch | 271 ++++++++++++++++ meta/recipes-devtools/perl/perl_5.24.4.bb | 4 + ...nux-user-assume-__NR_gettid-always-exists.patch | 49 +++ ...rename-gettid-to-sys_gettid-to-avoid-clas.patch | 95 ++++++ .../qemu/qemu/CVE-2018-10839.patch | 2 +- .../qemu/qemu/CVE-2018-17958.patch | 52 --- .../qemu/qemu/CVE-2018-18954.patch | 50 +++ .../recipes-devtools/qemu/qemu/CVE-2019-3812.patch | 39 +++ .../recipes-devtools/qemu/qemu/CVE-2019-6778.patch | 41 +++ .../recipes-devtools/qemu/qemu/CVE-2019-8934.patch | 215 +++++++++++++ meta/recipes-devtools/qemu/qemu_3.0.0.bb | 8 +- .../unzip/unzip/CVE-2019-13232_p1.patch | 33 ++ .../unzip/unzip/CVE-2019-13232_p2.patch | 356 +++++++++++++++++++++ .../unzip/unzip/CVE-2019-13232_p3.patch | 121 +++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 3 + .../wget/wget/CVE-2018-20483_p1.patch | 73 +++++ .../wget/wget/CVE-2018-20483_p2.patch | 127 ++++++++ meta/recipes-extended/wget/wget_1.19.5.bb | 2 + ...1-Woverride-init-is-not-needed-with-gcc-9.patch | 31 ++ ...c-use-a-custom-value-for-the-location-of-.patch | 6 +- meta/recipes-support/gnupg/gnupg/relocate.patch | 2 +- meta/recipes-support/gnupg/gnupg_2.2.12.bb | 3 +- .../libgpg-error-1.35-gawk5-support.patch | 161 ++++++++++ .../libgpg-error/libgpg-error_1.32.bb | 1 + .../sqlite/files/CVE-2019-8457.patch | 126 ++++++++ meta/recipes-support/sqlite/sqlite3_3.23.1.bb | 1 + 35 files changed, 2283 insertions(+), 66 deletions(-) create mode 100644 meta/recipes-devtools/elfutils/files/CVE-2019-7664.patch create mode 100644 meta/recipes-devtools/elfutils/files/CVE-2019-7665.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18311.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18312.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18313.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18314.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-17958.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-18954.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-3812.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-6778.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-8934.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p1.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p2.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p3.patch create mode 100644 meta/recipes-extended/wget/wget/CVE-2018-20483_p1.patch create mode 100644 meta/recipes-extended/wget/wget/CVE-2018-20483_p2.patch create mode 100644 meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch create mode 100644 meta/recipes-support/sqlite/files/CVE-2019-8457.patch
Signature · 1 line
2.7.4
PATCH 1/12 oeqa/selftest/context: ensure log directory exists
From: Chen Qi <[email protected]>
Ensure log directory exists to avoid the following error.
FileNotFoundError: [Errno 2] No such file or directory: '/.../build-selftest/tmp/log/oe-selftest-results-20181207043431.log'
--- meta/lib/oeqa/selftest/context.py | 1 + 1 file changed, 1 insertion(+)
meta/lib/oeqa/selftest/context.py +1 -0
@@ -108,6 +108,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): logdir = os.environ.get("BUILDDIR") if 'LOG_DIR' in bbvars: logdir = bbvars['LOG_DIR'] + bb.utils.mkdirhier(logdir) args.output_log = logdir + '/%s-results-%s.log' % (self.name, args.test_start_time) super(OESelftestTestContextExecutor, self)._process_args(logger, args)
Signature · 1 line
2.7.4
PATCH 2/12 qemu: Fix 4 CVEs
In reply to Armin KusterFrom: Dan Tran <[email protected]>
Fixes CVE-2018-18954, CVE-2019-3812, CVE-2019-6778, and CVE-2019-8934. Also deleted duplicated patch and cleanup.
--- .../qemu/qemu/CVE-2018-10839.patch | 2 +- .../qemu/qemu/CVE-2018-17958.patch | 52 ----- .../qemu/qemu/CVE-2018-18954.patch | 50 +++++ .../recipes-devtools/qemu/qemu/CVE-2019-3812.patch | 39 ++++ .../recipes-devtools/qemu/qemu/CVE-2019-6778.patch | 41 ++++ .../recipes-devtools/qemu/qemu/CVE-2019-8934.patch | 215 +++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_3.0.0.bb | 6 +- 7 files changed, 351 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-17958.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2018-18954.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-3812.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-6778.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-8934.patch
meta/recipes-devtools/qemu/qemu/CVE-2018-10839.patch +1 -1
@@ -19,7 +19,7 @@ Signed-off-by: Jason Wang <[email protected]> Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff ;h=fdc89e90fac40c5ca2686733df17b6423fb8d8fb#patch1] -CVE: CVE-2018-10839 +CVE: CVE-2018-10839 CVE-2018-17958 Signed-off-by: Changqing Li <[email protected]> ---
meta/recipes-devtools/qemu/qemu/CVE-2018-17958.patch deleted +0 -52
52 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2018-18954.patch new file +50 -0
50 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2019-3812.patch new file +39 -0
@@ -0,0 +1,39 @@ +From b664d9d003d1a98642dcfb8e6fceef6dbf3d52d8 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <[email protected]> +Date: Tue, 8 Jan 2019 11:23:01 +0100 +Subject: [PATCH] i2c-ddc: fix oob read +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Suggested-by: Michael Hanselmann <[email protected]> +Signed-off-by: Gerd Hoffmann <[email protected]> +Reviewed-by: Michael Hanselmann <[email protected]> +Reviewed-by: Philippe Mathieu-Daudé <[email protected]> +Message-id: [email protected] + +CVE: CVE-2019-3812 +Upstream-Status: Backport +[https://git.qemu.org/?p=qemu.git;a=commit;h=b05b267840515730dbf6753495d5b7bd8b04ad1c] + +Signed-off-by: Dan Tran <[email protected]> +--- + hw/i2c/i2c-ddc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c +index bec0c91e2d..89e659288e 100644 +--- a/hw/i2c/i2c-ddc.c ++++ b/hw/i2c/i2c-ddc.c +@@ -247,7 +247,7 @@ static int i2c_ddc_rx(I2CSlave *i2c) + I2CDDCState *s = I2CDDC(i2c); + + int value; +- value = s->edid_blob[s->reg]; ++ value = s->edid_blob[s->reg % sizeof(s->edid_blob)]; + s->reg++; + return value; + } +-- +2.22.0.vfs.1.1.57.gbaf16c8 +
meta/recipes-devtools/qemu/qemu/CVE-2019-6778.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/CVE-2019-8934.patch new file +215 -0
215 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu_3.0.0.bb +5 -1
@@ -21,8 +21,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0009-apic-fixup-fallthrough-to-PIC.patch \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ + file://CVE-2018-10839.patch\ file://CVE-2018-15746.patch \ - file://CVE-2018-17958.patch \ file://CVE-2018-17962.patch \ file://CVE-2018-17963.patch \ file://CVE-2018-16867.patch \
@@ -36,6 +36,10 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2018-20815_p2.patch \ file://CVE-2019-9824.patch \ file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \ + file://CVE-2018-18954.patch \ + file://CVE-2019-3812.patch \ + file://CVE-2019-6778.patch \ + file://CVE-2019-8934.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.7.4
PATCH 3/12 elfutils: CVE fix for elfutils
In reply to Armin KusterFrom: Shubham Agrawal <[email protected]>
CVE: CVE-2019-7664.patch
CVE: CVE-2019-7665.patch
Sign off: Shubham Agrawal <[email protected]>
--- meta/recipes-devtools/elfutils/elfutils_0.175.bb | 2 + .../elfutils/files/CVE-2019-7664.patch | 65 +++++++++ .../elfutils/files/CVE-2019-7665.patch | 154 +++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/files/CVE-2019-7664.patch create mode 100644 meta/recipes-devtools/elfutils/files/CVE-2019-7665.patch
meta/recipes-devtools/elfutils/elfutils_0.175.bb +2 -0
@@ -31,6 +31,8 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://CVE-2019-7150.patch \ file://CVE-2019-7146_p1.patch \ file://CVE-2019-7146_p2.patch \ + file://CVE-2019-7664.patch \ + file://CVE-2019-7665.patch \ " SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
meta/recipes-devtools/elfutils/files/CVE-2019-7664.patch new file +65 -0
65 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/CVE-2019-7665.patch new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 4/12 unzip: fix CVE-2019-13232
In reply to Armin KusterFrom: Dan Tran <[email protected]>
--- .../unzip/unzip/CVE-2019-13232_p1.patch | 33 ++ .../unzip/unzip/CVE-2019-13232_p2.patch | 356 +++++++++++++++++++++ .../unzip/unzip/CVE-2019-13232_p3.patch | 121 +++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 3 + 4 files changed, 513 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p1.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p2.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2019-13232_p3.patch
meta/recipes-extended/unzip/unzip/CVE-2019-13232_p1.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 080d52c3c9416c731f637f9c6e003961ef43f079 Mon Sep 17 00:00:00 2001 +From: Mark Adler <[email protected]> +Date: Mon, 27 May 2019 08:20:32 -0700 +Subject: [PATCH 1/3] Fix bug in undefer_input() that misplaced the input + state. + +CVE: CVE-2019-13232 +Upstream-Status: Backport +[https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213] + +Signed-off-by: Dan Tran <[email protected]> +--- + fileio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fileio.c b/fileio.c +index 7605a29..14460f3 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -532,8 +532,10 @@ void undefer_input(__G) + * This condition was checked when G.incnt_leftover was set > 0 in + * defer_leftover_input(), and it is NOT allowed to touch G.csize + * before calling undefer_input() when (G.incnt_leftover > 0) +- * (single exception: see read_byte()'s "G.csize <= 0" handling) !! ++ * (single exception: see readbyte()'s "G.csize <= 0" handling) !! + */ ++ if (G.csize < 0L) ++ G.csize = 0L; + G.incnt = G.incnt_leftover + (int)G.csize; + G.inptr = G.inptr_leftover - (int)G.csize; + G.incnt_leftover = 0; +-- +2.22.0.vfs.1.1.57.gbaf16c8
meta/recipes-extended/unzip/unzip/CVE-2019-13232_p2.patch new file +356 -0
356 lines not on this page · raw message
meta/recipes-extended/unzip/unzip/CVE-2019-13232_p3.patch new file +121 -0
121 lines not on this page · raw message
meta/recipes-extended/unzip/unzip_6.0.bb +3 -0
@@ -22,6 +22,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://symlink.patch \ file://0001-unzip-fix-CVE-2018-1000035.patch \ file://CVE-2018-18384.patch \ + file://CVE-2019-13232_p1.patch \ + file://CVE-2019-13232_p2.patch \ + file://CVE-2019-13232_p3.patch \ " UPSTREAM_VERSION_UNKNOWN = "1"
Signature · 1 line
2.7.4
PATCH 5/12 json-c: Don't --enable-rdrand
In reply to Armin KusterFrom: Adrian Bunk <[email protected]>
In recent years AMD CPUs have had various problems with RDRAND giving either non-random data or no result at all, which is problematic if either build or target machine has a CPU with this problem.
The fallback is /dev/urandom, and I'd trust the kernel here.
--enable-rdrand was added in an upgrade to a new upstream version without mentioning any reason.
[YOCTO #13534]
--- meta/recipes-devtools/json-c/json-c_0.13.1.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-devtools/json-c/json-c_0.13.1.bb +0 -2
@@ -20,8 +20,6 @@ RPROVIDES_${PN} = "libjson" inherit autotools -EXTRA_OECONF = "--enable-rdrand" - do_configure_prepend() { # Clean up autoconf cruft that should not be in the tarball rm -f ${S}/config.status
Signature · 1 line
2.7.4
PATCH 6/12 perl: Fix CVE-2018-18311 to 18314
In reply to Armin KusterFrom: Dan Tran <[email protected]>
--- .../perl/perl/CVE-2018-18311.patch | 183 ++++++++++++++ .../perl/perl/CVE-2018-18312.patch | Bin 0 -> 2125 bytes .../perl/perl/CVE-2018-18313.patch | 60 +++++ .../perl/perl/CVE-2018-18314.patch | 271 +++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.24.4.bb | 4 + 5 files changed, 518 insertions(+) create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18311.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18312.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18313.patch create mode 100644 meta/recipes-devtools/perl/perl/CVE-2018-18314.patch
meta/recipes-devtools/perl/perl/CVE-2018-18311.patch new file +183 -0
@@ -0,0 +1,183 @@ +From 4706b65d7c835c0bb219db160fbcdbcd98efab2d Mon Sep 17 00:00:00 2001 +From: David Mitchell <[email protected]> +Date: Fri, 29 Jun 2018 13:37:03 +0100 +Subject: [PATCH] Perl_my_setenv(); handle integer wrap + +RT #133204 + +Wean this function off int/I32 and onto UV/Size_t. +Also, replace all malloc-ish calls with a wrapper that does +overflow checks, + +In particular, it was doing (nlen + vlen + 2) which could wrap when +the combined length of the environment variable name and value +exceeded around 0x7fffffff. + +The wrapper check function is probably overkill, but belt and braces... + +NB this function has several variant parts, #ifdef'ed by platform +type; I have blindly changed the parts that aren't compiled under linux. + +(cherry picked from commit 34716e2a6ee2af96078d62b065b7785c001194be) + +CVE: CVE-2018-18311 +Upstream-Status: Backport +[https://perl5.git.perl.org/perl.git/commit/5737d31aac51360cc1eb412ef059e36147c9d6d6] + +Signed-off-by: Dan Tran <[email protected]> +--- + util.c | 76 ++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 53 insertions(+), 23 deletions(-) + +diff --git a/util.c b/util.c +index 7c3d271f51..27f4eddf3b 100644 +--- a/util.c ++++ b/util.c +@@ -2160,8 +2160,40 @@ Perl_new_warnings_bitfield(pTHX_ STRLEN *buffer, const char *const bits, + *(s+(nlen+1+vlen)) = '\0' + + #ifdef USE_ENVIRON_ARRAY +- /* VMS' my_setenv() is in vms.c */ ++ ++/* small wrapper for use by Perl_my_setenv that mallocs, or reallocs if ++ * 'current' is non-null, with up to three sizes that are added together. ++ * It handles integer overflow. ++ */ ++static char * ++S_env_alloc(void *current, Size_t l1, Size_t l2, Size_t l3, Size_t size) ++{ ++ void *p; ++ Size_t sl, l = l1 + l2; ++ ++ if (l < l2) ++ goto panic; ++ l += l3; ++ if (l < l3) ++ goto panic; ++ sl = l * size; ++ if (sl < l) ++ goto panic; ++ ++ p = current ++ ? safesysrealloc(current, sl) ++ : safesysmalloc(sl); ++ if (p) ++ return (char*)p; ++ ++ panic: ++ croak_memory_wrap(); ++} ++ ++ ++/* VMS' my_setenv() is in vms.c */ + #if !defined(WIN32) && !defined(NETWARE) ++ + void + Perl_my_setenv(pTHX_ const char *nam, const char *val) + { +@@ -2177,28 +2209,27 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val) + #ifndef PERL_USE_SAFE_PUTENV + if (!PL_use_safe_putenv) { + /* most putenv()s leak, so we manipulate environ directly */ +- I32 i; +- const I32 len = strlen(nam); +- int nlen, vlen; ++ UV i; ++ Size_t vlen, nlen = strlen(nam); + + /* where does it go? */ + for (i = 0; environ[i]; i++) { +- if (strnEQ(environ[i],nam,len) && environ[i][len] == '=') ++ if (strnEQ(environ[i], nam, nlen) && environ[i][nlen] == '=') + break; + } + + if (environ == PL_origenviron) { /* need we copy environment? */ +- I32 j; +- I32 max; ++ UV j, max; + char **tmpenv; + + max = i; + while (environ[max]) + max++; +- tmpenv = (char**)safesysmalloc((max+2) * sizeof(char*)); ++ /* XXX shouldn't that be max+1 rather than max+2 ??? - DAPM */ ++ tmpenv = (char**)S_env_alloc(NULL, max, 2, 0, sizeof(char*)); + for (j=0; j<max; j++) { /* copy environment */ +- const int len = strlen(environ[j]); +- tmpenv[j] = (char*)safesysmalloc((len+1)*sizeof(char)); ++ const Size_t len = strlen(environ[j]); ++ tmpenv[j] = S_env_alloc(NULL, len, 1, 0, 1); + Copy(environ[j], tmpenv[j], len+1, char); + } + tmpenv[max] = NULL; +@@ -2217,15 +2248,15 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val) + #endif + } + if (!environ[i]) { /* does not exist yet */ +- environ = (char**)safesysrealloc(environ, (i+2) * sizeof(char*)); ++ environ = (char**)S_env_alloc(environ, i, 2, 0, sizeof(char*)); + environ[i+1] = NULL; /* make sure it's null terminated */ + } + else + safesysfree(environ[i]); +- nlen = strlen(nam); ++ + vlen = strlen(val); + +- environ[i] = (char*)safesysmalloc((nlen+vlen+2) * sizeof(char)); ++ environ[i] = S_env_alloc(NULL, nlen, vlen, 2, 1); + /* all that work just for this */ + my_setenv_format(environ[i], nam, nlen, val, vlen); + } else { +@@ -2250,22 +2281,21 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val) + if (environ) /* old glibc can crash with null environ */ + (void)unsetenv(nam); + } else { +- const int nlen = strlen(nam); +- const int vlen = strlen(val); +- char * const new_env = +- (char*)safesysmalloc((nlen + vlen + 2) * sizeof(char)); ++ const Size_t nlen = strlen(nam); ++ const Size_t vlen = strlen(val); ++ char * const new_env = S_env_alloc(NULL, nlen, vlen, 2, 1); + my_setenv_format(new_env, nam, nlen, val, vlen); + (void)putenv(new_env); + } + # else /* ! HAS_UNSETENV */ + char *new_env; +- const int nlen = strlen(nam); +- int vlen; ++ const Size_t nlen = strlen(nam); ++ Size_t vlen; + if (!val) { + val = ""; + } + vlen = strlen(val); +- new_env = (char*)safesysmalloc((nlen + vlen + 2) * sizeof(char)); ++ new_env = S_env_alloc(NULL, nlen, vlen, 2, 1); + /* all that work just for this */ + my_setenv_format(new_env, nam, nlen, val, vlen); + (void)putenv(new_env); +@@ -2288,14 +2318,14 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val) + { + dVAR; + char *envstr; +- const int nlen = strlen(nam); +- int vlen; ++ const Size_t nlen = strlen(nam); ++ Size_t vlen; + + if (!val) { + val = ""; + } + vlen = strlen(val); +- Newx(envstr, nlen+vlen+2, char); ++ envstr = S_env_alloc(NULL, nlen, vlen, 2, 1); + my_setenv_format(envstr, nam, nlen, val, vlen); + (void)PerlEnv_putenv(envstr); + Safefree(envstr); +-- +2.22.0.vfs.1.1.57.gbaf16c8 +
meta/recipes-devtools/perl/perl/CVE-2018-18312.patch new file binary +0 -0
meta/recipes-devtools/perl/perl/CVE-2018-18313.patch new file +60 -0
60 lines not on this page · raw message
meta/recipes-devtools/perl/perl/CVE-2018-18314.patch new file +271 -0
271 lines not on this page · raw message
meta/recipes-devtools/perl/perl_5.24.4.bb +4 -0
@@ -65,6 +65,10 @@ SRC_URI += " \ file://perl-5.26.1-guard_old_libcrypt_fix.patch \ file://CVE-2018-12015.patch \ file://0001-ExtUtils-MM_Unix.pm-fix-race-issues.patch \ + file://CVE-2018-18311.patch \ + file://CVE-2018-18312.patch \ + file://CVE-2018-18313.patch \ + file://CVE-2018-18314.patch \ " # Fix test case issues
Signature · 1 line
2.7.4
PATCH 7/12 sqlite3: Security fix for CVE-2019-8457
In reply to Armin KusterFrom: Shubham Agrawal <[email protected]>
--- .../sqlite/files/CVE-2019-8457.patch | 126 +++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.23.1.bb | 1 + 2 files changed, 127 insertions(+) create mode 100644 meta/recipes-support/sqlite/files/CVE-2019-8457.patch
meta/recipes-support/sqlite/files/CVE-2019-8457.patch new file +126 -0
@@ -0,0 +1,126 @@ +From fbf2392644f0ae4282fa4583c9bb67260995d983 Mon Sep 17 00:00:00 2001 +From: Shubham Agrawal <[email protected]> +Date: Mon, 23 Sep 2019 20:58:47 +0000 +Subject: [PATCH] sqlite: fix for CVE-2019-8457 + +Upstream-Status: Backport +CVE: CVE-2019-8457 +Signed-off-by: Shubham Agrawal <[email protected]> +--- + sqlite3.c | 50 +++++++++++++++++++++++++++++++------------------- + 1 file changed, 31 insertions(+), 19 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 00513d4..5c8c7f4 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -172325,6 +172325,33 @@ + } + + ++/* Allocate and initialize a new dynamic string object */ ++StrAccum *sqlite3_str_new(sqlite3 *db){ ++ StrAccum *p = sqlite3DbMallocRaw(db, sizeof(*p)); ++ if( p ){ ++ sqlite3StrAccumInit(p, db, 0, 0, SQLITE_MAX_LENGTH); ++ } ++ return p; ++} ++ ++/* Finalize a string created using sqlite3_str_new(). ++*/ ++ ++char *sqlite3_str_finish(StrAccum *p){ ++ char *z; ++ if( p ){ ++ z = sqlite3StrAccumFinish(p); ++ sqlite3DbFree(p->db, p); ++ }else{ ++ z = 0; ++ } ++ return z; ++} ++/* Return any error code associated with p */ ++int sqlite3_str_errcode(StrAccum *p){ ++ return p ? p->accError : SQLITE_NOMEM; ++} ++ + /* + ** Implementation of a scalar function that decodes r-tree nodes to + ** human readable strings. This can be used for debugging and analysis. +@@ -172342,49 +172369,53 @@ + ** <num-dimension>*2 coordinates. + */ + static void rtreenode(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){ +- char *zText = 0; ++ + RtreeNode node; + Rtree tree; + int ii; ++ int nData; ++ int errCode; ++ StrAccum *pOut; + + UNUSED_PARAMETER(nArg); + memset(&node, 0, sizeof(RtreeNode)); + memset(&tree, 0, sizeof(Rtree)); + tree.nDim = (u8)sqlite3_value_int(apArg[0]); ++ if( tree.nDim<1 || tree.nDim>5 ) return; + tree.nDim2 = tree.nDim*2; + tree.nBytesPerCell = 8 + 8 * tree.nDim; + node.zData = (u8 *)sqlite3_value_blob(apArg[1]); ++ nData = sqlite3_value_bytes(apArg[1]); ++ if( nData<4 ) return; ++ if( nData<NCELL(&node)*tree.nBytesPerCell ) return; + ++ pOut = sqlite3_str_new(0); + for(ii=0; ii<NCELL(&node); ii++){ +- char zCell[512]; +- int nCell = 0; ++ ++ + RtreeCell cell; + int jj; + + nodeGetCell(&tree, &node, ii, &cell); +- sqlite3_snprintf(512-nCell,&zCell[nCell],"%lld", cell.iRowid); +- nCell = (int)strlen(zCell); ++ if( ii>0 ) sqlite3StrAccumAppend(pOut, " ", 1); ++ sqlite3XPrintf(pOut, "{%lld", cell.iRowid); ++ + for(jj=0; jj<tree.nDim2; jj++){ + #ifndef SQLITE_RTREE_INT_ONLY +- sqlite3_snprintf(512-nCell,&zCell[nCell], " %g", +- (double)cell.aCoord[jj].f); ++ ++ sqlite3XPrintf(pOut, " %g", (double)cell.aCoord[jj].f); + #else +- sqlite3_snprintf(512-nCell,&zCell[nCell], " %d", +- cell.aCoord[jj].i); ++ ++ sqlite3XPrintf(pOut, " %d", cell.aCoord[jj].i); + #endif +- nCell = (int)strlen(zCell); +- } + +- if( zText ){ +- char *zTextNew = sqlite3_mprintf("%s {%s}", zText, zCell); +- sqlite3_free(zText); +- zText = zTextNew; +- }else{ +- zText = sqlite3_mprintf("{%s}", zCell); + } ++ sqlite3StrAccumAppend(pOut, "}", 1); + } +- +- sqlite3_result_text(ctx, zText, -1, sqlite3_free); ++ ++ errCode = sqlite3_str_errcode(pOut); ++ sqlite3_result_text(ctx, sqlite3_str_finish(pOut), -1, sqlite3_free); ++ sqlite3_result_error_code(ctx, errCode); + } + + /* This routine implements an SQL function that returns the "depth" parameter +-- +2.7.4 +
meta/recipes-support/sqlite/sqlite3_3.23.1.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI = "\ http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \ file://CVE-2018-20505.patch \ file://CVE-2018-20506.patch \ + file://CVE-2019-8457.patch \ " SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa" SRC_URI[sha256sum] = "92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25"
Signature · 1 line
2.7.4
PATCH 8/12 wget: Security fixes CVE-2018-20483
In reply to Armin KusterFrom: Andrii Bordunov via Openembedded-core <[email protected]>
Source: http://git.savannah.gnu.org/cgit/wget.git/
Type: Security Fix
Disposition: Backport from http://git.savannah.gnu.org/cgit/wget.git/
Description:
Fixes CVE-2018-20483
--- .../wget/wget/CVE-2018-20483_p1.patch | 73 ++++++++++++ .../wget/wget/CVE-2018-20483_p2.patch | 127 +++++++++++++++++++++ meta/recipes-extended/wget/wget_1.19.5.bb | 2 + 3 files changed, 202 insertions(+) create mode 100644 meta/recipes-extended/wget/wget/CVE-2018-20483_p1.patch create mode 100644 meta/recipes-extended/wget/wget/CVE-2018-20483_p2.patch
meta/recipes-extended/wget/wget/CVE-2018-20483_p1.patch new file +73 -0
@@ -0,0 +1,73 @@ +From 6c5471e4834aebd7359d88b760b087136473bac8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]> +Date: Wed, 26 Dec 2018 13:51:48 +0100 +Subject: [PATCH 1/2] Don't use extended attributes (--xattr) by default + +* src/init.c (defaults): Set enable_xattr to false by default +* src/main.c (print_help): Reverse option logic of --xattr +* doc/wget.texi: Add description for --xattr + +Users may not be aware that the origin URL and Referer are saved +including credentials, and possibly access tokens within +the urls. + +CVE: CVE-2018-20483 patch 1 +Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/wget.git/commit/?id=c125d24762962d91050d925fbbd9e6f30b2302f8] +Signed-off-by: Aviraj CJ <[email protected]> +--- + doc/wget.texi | 8 ++++++++ + src/init.c | 4 ---- + src/main.c | 2 +- + 3 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/doc/wget.texi b/doc/wget.texi +index eaf6b380..3f9d7c1c 100644 +--- a/doc/wget.texi ++++ b/doc/wget.texi +@@ -540,6 +540,14 @@ right NUMBER. + Set preferred location for Metalink resources. This has effect if multiple + resources with same priority are available. + ++@cindex xattr ++@item --xattr ++Enable use of file system's extended attributes to save the ++original URL and the Referer HTTP header value if used. ++ ++Be aware that the URL might contain private information like ++access tokens or credentials. ++ + + @cindex force html + @item -F +diff --git a/src/init.c b/src/init.c +index eb81ab47..800970c5 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -509,11 +509,7 @@ defaults (void) + opt.hsts = true; + #endif + +-#ifdef ENABLE_XATTR +- opt.enable_xattr = true; +-#else + opt.enable_xattr = false; +-#endif + } + + /* Return the user's home directory (strdup-ed), or NULL if none is +diff --git a/src/main.c b/src/main.c +index 81db9319..6ac1621b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -754,7 +754,7 @@ Download:\n"), + #endif + #ifdef ENABLE_XATTR + N_("\ +- --no-xattr turn off storage of metadata in extended file attributes\n"), ++ --xattr turn on storage of metadata in extended file attributes\n"), + #endif + "\n", + +-- +2.19.1 +
meta/recipes-extended/wget/wget/CVE-2018-20483_p2.patch new file +127 -0
127 lines not on this page · raw message
meta/recipes-extended/wget/wget_1.19.5.bb +2 -0
@@ -2,6 +2,8 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-improve-reproducibility.patch \ file://CVE-2019-5953.patch \ + file://CVE-2018-20483_p1.patch \ + file://CVE-2018-20483_p2.patch \ " SRC_URI[md5sum] = "2db6f03d655041f82eb64b8c8a1fa7da"
Signature · 1 line
2.7.4
PATCH 9/12 qemu: fix build issue on new hosts with glibc 2.30
In reply to Armin KusterThis fixes the following error:
TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:254:16: error: static declaration of ‘gettid’ follows non-static declaration
254 | _syscall0(int, gettid)
| ^~~~~~
TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:185:13: note: in definition of macro ‘_syscall0’
185 | static type name (void) \
| ^~~~
In file included from /usr/include/unistd.h:1170,
from TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/include/qemu/osdep.h:90,
from TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:20:
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
34 | extern __pid_t gettid (void) __THROW;
| ^~~~~~
--- ...nux-user-assume-__NR_gettid-always-exists.patch | 49 +++++++++++ ...rename-gettid-to-sys_gettid-to-avoid-clas.patch | 95 ++++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_3.0.0.bb | 2 + 3 files changed, 146 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch
meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 184943d827ce09375284e6fbb9fd5eeb9e369529 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]> +Date: Wed, 20 Mar 2019 16:18:41 +0000 +Subject: [PATCH] linux-user: assume __NR_gettid always exists +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The gettid syscall was introduced in Linux 2.4.11. This is old enough +that we can assume it always exists and thus not bother with the +conditional backcompat logic. + +Signed-off-by: Daniel P. Berrangé <[email protected]> +Reviewed-by: Richard Henderson <[email protected]> +Reviewed-by: Laurent Vivier <[email protected]> +Message-Id: <[email protected]> +Signed-off-by: Laurent Vivier <[email protected]> + +Upstream-Status: Backport +dependancy patch for fix + +Signed-off-by: Armin Kuster <[email protected]> + +--- + + + linux-user/syscall.c | 8 -------- + 1 file changed, 8 deletions(-) + +Index: qemu-3.0.0/linux-user/syscall.c +=================================================================== +--- qemu-3.0.0.orig/linux-user/syscall.c ++++ qemu-3.0.0/linux-user/syscall.c +@@ -251,15 +251,7 @@ static type name (type1 arg1,type2 arg2, + #define TARGET_NR__llseek TARGET_NR_llseek + #endif + +-#ifdef __NR_gettid + _syscall0(int, gettid) +-#else +-/* This is a replacement for the host gettid() and must return a host +- errno. */ +-static int gettid(void) { +- return -ENOSYS; +-} +-#endif + + /* For the 64-bit guest on 32-bit host case we must emulate + * getdents using getdents64, because otherwise the host
meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch new file +95 -0
95 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu_3.0.0.bb +2 -0
@@ -40,6 +40,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2019-3812.patch \ file://CVE-2019-6778.patch \ file://CVE-2019-8934.patch \ + file://0001-linux-user-assume-__NR_gettid-always-exists.patch \ + file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.7.4
PATCH 10/12 libgpg-error: Fix build with gawk 5.x
In reply to Armin KusterFrom: Sean Nyekjaer <[email protected]>
Based on poky master, but for version 1.35
[backported to thud
yocto# 13580]
--- .../libgpg-error-1.35-gawk5-support.patch | 161 +++++++++++++++++++++ .../libgpg-error/libgpg-error_1.32.bb | 1 + 2 files changed, 162 insertions(+) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch new file +161 -0
@@ -0,0 +1,161 @@ +Upstream-Status: Backport [https://dev.gnupg.org/T4459] +Signed-off-by: Sean Nyekjaer <[email protected]> + +From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka <[email protected]> +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk +index ae29043..9a1fc18 100644 +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/Makefile.am b/src/Makefile.am +index 42998e4..0ceac9f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk +index 46d436c..e9c857c 100644 +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk +index a771a73..4578e29 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk +index ea58503..188f7a4 100644 +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk +index f79df66..15b1aad 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index c9de9c1..285e45f 100644 +--- a/src/mkstrtable.awk ++++ b/src/mkstrtable.awk +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ header { + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ END { + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ END { + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + +-- +2.23.0 +
meta/recipes-support/libgpg-error/libgpg-error_1.32.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \ file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \ + file://libgpg-error-1.35-gawk5-support.patch \ " SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64" SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca"
Signature · 1 line
2.7.4
PATCH 11/12 gnupg: Do not apply -Woverride-init guard for gcc >= 9
In reply to Armin KusterFrom: Khem Raj <[email protected]>
--- ...1-Woverride-init-is-not-needed-with-gcc-9.patch | 31 ++++++++++++++++++++++ ...c-use-a-custom-value-for-the-location-of-.patch | 6 ++--- meta/recipes-support/gnupg/gnupg/relocate.patch | 2 +- meta/recipes-support/gnupg/gnupg_2.2.12.bb | 3 ++- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 20 Dec 2018 17:37:48 -0800 +Subject: [PATCH] Woverride-init is not needed with gcc 9 + +Fixes +| ../../gnupg-2.2.12/dirmngr/dns.h:525:16: error: lvalue required as +unary '&' operand | +525 | dns_rr_i_init(&dns_quietinit((struct dns_rr_i){ 0, __VA_ARGS__ +}), (P)) + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + dirmngr/dns.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dirmngr/dns.h b/dirmngr/dns.h +index 30d0b45..98fe412 100644 +--- a/dirmngr/dns.h ++++ b/dirmngr/dns.h +@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void); + + #define dns_quietinit(...) \ + DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP +-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 ++#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9) + #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push") + #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"") + #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +3 -3
@@ -1,4 +1,4 @@ -From 8eb4d25c25a1c1323797d94e0727a3e42b7f3287 Mon Sep 17 00:00:00 2001 +From c69c3a49f3295179c247db5ceb3ef8952928a724 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4d66af9..b9ef235 100644 +index 919ab31..cd58fdb 100644 --- a/configure.ac +++ b/configure.ac -@@ -1848,7 +1848,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1855,7 +1855,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
meta/recipes-support/gnupg/gnupg/relocate.patch +1 -1
@@ -1,4 +1,4 @@ -From f9fc214b0bf2f67b515ca8a5333f39c497d1b518 Mon Sep 17 00:00:00 2001 +From 6d31b04d7a75f1d73c3518bf043b5b0a2dc40cb1 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its
meta/recipes-support/gnupg/gnupg_2.2.12.bb +2 -1
@@ -14,7 +14,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ - " + file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ + " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch"
Signature · 1 line
2.7.4
PATCH 12/12 uninative: Update to 2.7 release
In reply to Armin KusterFrom: Michael Halstead <[email protected]>
The 2.7 release updates glibc to version 2.30. Recently added to openSUSE Tumbleweed and needed for Fedora Core 31.
--- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/conf/distro/include/yocto-uninative.inc +5 -5
@@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.29" +UNINATIVE_MAXGLIBCVERSION = "2.30" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.6/" -UNINATIVE_CHECKSUM[aarch64] ?= "a37118fc8b423f48146120707b81dd15017512c3e8ef9e6ca2cb3a033f4f4046" -UNINATIVE_CHECKSUM[i686] ?= "3234fc3ded810225071f23a0e9a99f4f8c2480059945a848eff076ce78122ade" -UNINATIVE_CHECKSUM[x86_64] ?= "133387753a9acf3e1b788103c59fac91e968e2ee331d7a4b9498e926ada7be57" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.7/" +UNINATIVE_CHECKSUM[aarch64] ?= "e76a45886ee8a0b3904b761c17ac8ff91edf9811ee455f1832d10763ba794dfc" +UNINATIVE_CHECKSUM[i686] ?= "810d027dfb1c7675226afbcec07808770516c969ee7378f6d8240281083f8924" +UNINATIVE_CHECKSUM[x86_64] ?= "9498d8bba047499999a7310ac2576d0796461184965351a56f6d32c888a1f216"
Signature · 1 line
2.7.4