Patch review Aug 21st
cover Patch review Aug 21st
Please have comments back by Monday
The following changes since commit 85f8047c71047d93cf79a954142157f85079968d:
php: Upgrade to 7.4.16 (2021-07-26 16:05:08 -0700)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut
Anatol Belski (1):
backport: xmlsec1: Fix configure QA error caused by host lookup path
Jate Sujjavanich (1):
ufw: Fix interpreter for installed ufw and test ufw
Joe Slater (1):
php: move to version 7.4.21
Kai Kang (1):
libdbi-perl: fix CVE-2014-10402
Khem Raj (2):
fvwm: Package extra files and man pages
fvwm: Fix build time paths in target perl/python scripts
Michael Opdenacker (1):
bigbuckbunny-1080p: fix sample video URL
.../sample-content/bigbuckbunny-1080p.bb | 2 +-
...tect-openembedded-python-interpreter.patch | 8 +--
...setup-only-make-one-reference-to-env.patch | 14 +----
.../perl/libdbi-perl/CVE-2014-10402.patch | 56 +++++++++++++++++++
.../perl/libdbi-perl_1.643.bb | 4 +-
.../php/{php_7.4.16.bb => php_7.4.21.bb} | 3 +-
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 23 ++++++--
.../xmlsec1/ensure-search-path-non-host.patch | 22 ++++++++
.../recipes-support/xmlsec1/xmlsec1_1.2.30.bb | 1 +
9 files changed, 109 insertions(+), 24 deletions(-)
create mode 100644 meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
rename meta-oe/recipes-devtools/php/{php_7.4.16.bb => php_7.4.21.bb} (99%)
create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patchSignature · 1 line
2.25.1
PATCH 1/7 libdbi-perl: fix CVE-2014-10402
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2014-10402.
CVE: CVE-2014-10402
Ref:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12
--- .../perl/libdbi-perl/CVE-2014-10402.patch | 56 +++++++++++++++++++ .../perl/libdbi-perl_1.643.bb | 4 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch new file +56 -0
@@ -0,0 +1,56 @@ +Backport patch to fix CVE-2014-10402. + +CVE: CVE-2014-10402 +Upstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1] + +Ref: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12 + +Signed-off-by: Kai Kang <[email protected]> + + +From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <[email protected]> +Date: Tue, 6 Oct 2020 10:22:17 +0200 +Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401 + +Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and +figure out that DBI->parse_dsn is the wrong helper to parse our attributes in +DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes +parse_dsn to bailout. + +Parsing on our own similar to parse_dsn shows the way out. + +Signed-off-by: Jens Rehsack <[email protected]> +--- + lib/DBD/File.pm | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm +index fb14e9a..f55076f 100644 +--- a/lib/DBD/File.pm ++++ b/lib/DBD/File.pm +@@ -109,7 +109,11 @@ sub connect + # We do not (yet) care about conflicting attributes here + # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" }); + # will test here that both test and text should exist +- if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) { ++ # ++ # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter. ++ if ($dbname) { ++ my @attrs = split /;/ => $dbname; ++ my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs }; + if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) { + my $msg = "No such directory '$attr_hash->{f_dir}"; + $drh->set_err (2, $msg); +@@ -120,7 +124,6 @@ sub connect + if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) { + my $msg = "No such directory '$attr->{f_dir}"; + $drh->set_err (2, $msg); +- $attr->{RaiseError} and croak $msg; + return; + } + +-- +2.17.1 +
meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb +3 -1
@@ -9,7 +9,9 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" +SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz \ + file://CVE-2014-10402.patch \ + " SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"
Signature · 1 line
2.25.1
PATCH 2/7 bigbuckbunny-1080p: fix sample video URL
In reply to Armin KusterFrom: Michael Opdenacker <[email protected]>
Replace a link that's now broken.
The original download link on blender.org still works
(https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_surround.avi)
but is still extremely slow.
--- .../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "CC-BY-3.0" # http://www.bigbuckbunny.org/index.php/about/ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7" -SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi" +SRC_URI = "https://www.mediaspip.net/IMG/avi/big_buck_bunny_1080p_surround.avi" SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a" SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c20c06ea"
Signature · 1 line
2.25.1
PATCH 3/7 fvwm: Package extra files and man pages
In reply to Armin KusterFrom: Khem Raj <[email protected]>
Avoids using installed-vs-shipped
--- meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +12 -6
@@ -88,6 +88,8 @@ do_install_append() { # as well) PACKAGES = " \ ${PN} \ + ${PN}-extra \ + ${PN}-doc \ ${PN}-dbg \ "
@@ -98,12 +100,16 @@ FILES_${PN} = " \ ${datadir}/fvwm/ConfigFvwmDefaults \ " -RDEPENDS_${PN} = " \ - xuser-account \ +FILES_${PN}-extra = " \ + ${bindir} \ + ${libexecdir} \ + ${sysconfdir}/xdg/fvwm \ +" +FILES_${PN}-doc = " \ + ${mandir} \ + ${datadir}/fvwm \ " -# by default a lot of stuff is installed and it's not easy to control what to -# install, so install everything, but skip the check -INSANE_SKIP_${PN} = " \ - installed-vs-shipped \ +RDEPENDS_${PN} = " \ + xuser-account \ "
Signature · 1 line
2.25.1
PATCH 4/7 fvwm: Fix build time paths in target perl/python scripts
In reply to Armin KusterFrom: Khem Raj <[email protected]>
Add rdeps as needed
Fixes shebang-size QA warnings
--- meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 7 +++++++ 1 file changed, 7 insertions(+)
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +7 -0
@@ -82,6 +82,9 @@ do_install_append() { install -d -m 0755 ${D}/${datadir}/fvwm touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults + sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* + sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* + sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop } # the only needed packages (note: locale packages are automatically generated
@@ -113,3 +116,7 @@ FILES_${PN}-doc = " \ RDEPENDS_${PN} = " \ xuser-account \ " +RDEPENDS_${PN}-extra += "\ + perl \ + python3-core \ +"
Signature · 1 line
2.25.1
PATCH 5/7 php: move to version 7.4.21
In reply to Armin KusterFrom: Joe Slater <[email protected]>
Lots of bug fixes.
CVE: CVE-2021-21704 CVE-2021-21705
---
meta-oe/recipes-devtools/php/{php_7.4.16.bb => php_7.4.21.bb} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
rename meta-oe/recipes-devtools/php/{php_7.4.16.bb => php_7.4.21.bb} (99%)meta-oe/recipes-devtools/php/php_7.4.21.bb renamed from meta-oe/recipes-devtools/php/php_7.4.16.bb +2 -1
@@ -33,7 +33,8 @@ SRC_URI_append_class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "85710f007cfd0fae94e13a02a3a036f4e81ef43693260cae8a2e1ca93659ce3e" +SRC_URI[sha256sum] = "36ec6102e757e2c2b7742057a700bbff77c76fa0ccbe9c860398c3d24e32822a" + inherit autotools pkgconfig python3native gettext
Signature · 1 line
2.25.1
PATCH 6/7 backport: xmlsec1: Fix configure QA error caused by host lookup path
In reply to Armin KusterFrom: Anatol Belski <[email protected]>
The configure script contains hardcoded lookup paths to /usr and other paths that might interfere with the host. These are overwritten with the staging dir locations for Poky compatibility.
Backport from meta-oe master rev. 74b66d1911118bac53033f77ba6d3923f4809d5a
--- .../xmlsec1/ensure-search-path-non-host.patch | 22 +++++++++++++++++++ .../recipes-support/xmlsec1/xmlsec1_1.2.30.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file +22 -0
@@ -0,0 +1,22 @@ +xmlsec1: Fix configure QA error caused by host lookup path + +ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. + +It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Anatol Belski <[email protected]> + +--- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000 ++++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000 +@@ -250,8 +250,8 @@ + dnl ========================================================================== + dnl Common installation locations + dnl ========================================================================== +-COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" ++COMMON_INCLUDE_DIR="${STAGING_INCDIR}" ++COMMON_LIB_DIR="${STAGING_LIBDIR}" + case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb +1 -0
@@ -19,6 +19,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://xmlsec1-examples-allow-build-in-separate-dir.patch \ file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ + file://ensure-search-path-non-host.patch \ " SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966"
Signature · 1 line
2.25.1
PATCH 7/7 ufw: Fix interpreter for installed ufw and test ufw
In reply to Armin KusterFrom: Jate Sujjavanich <[email protected]>
Revert patch to setup-only-make-one-reference-to-env.patch and make patch for python3 interpreter fix apply to runs of setup.py during self test as well as installs.
--- ...to-detect-openembedded-python-interpreter.patch | 8 ++++---- .../ufw/setup-only-make-one-reference-to-env.patch | 14 ++------------ 2 files changed, 6 insertions(+), 16 deletions(-)
meta-networking/recipes-connectivity/ufw/ufw/Add-code-to-detect-openembedded-python-interpreter.patch +4 -4
@@ -1,7 +1,7 @@ Add code to detect openembedded python interpreter -OE does not use /usr/bin/env as part of the interpreter, so it does not -update ufw with the interpreter name. +OE does not use /usr/bin/env as part of the interpreter, Instead, it's a +full path in sys.executable. Upstream-Status: Inappropriate (Embedded) Signed-off-by: Jate Sujjavanich <[email protected]>
@@ -17,9 +17,9 @@ index 75c1105..3f9a5e0 100644 "-i.jjm", "1s%^#.*python.*%#! " + sys.executable + "%g", 'staging/ufw']) -+ elif '-native/python' in sys.executable and \ ++ elif '/python' in sys.executable and \ + os.path.basename(sys.executable) in ['python', 'python3']: -+ print("Detected oe native python " + os.path.basename(sys.executable)) ++ print("Detected full path " + sys.executable + ". substituting " + os.path.basename(sys.executable)) + subprocess.call(["sed", + "-i.jjm", + "1s%python$%"
meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch +2 -12
@@ -14,10 +14,6 @@ detected or specified on the build line. Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Joe MacDonald <[email protected]> - -Added conditional to handle sys.executable without env on python3 - -Signed-off-by Jate Sujjavanich <[email protected]> --- setup.py | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
@@ -47,7 +43,7 @@ index b13d11c..73acdef 100644 # Now byte-compile everything super(Install, self).run() -@@ -107,12 +112,29 @@ class Install(_install, object): +@@ -107,12 +112,23 @@ class Install(_install, object): for f in [ script, manpage, manpage_f ]: self.mkpath(os.path.dirname(f))
@@ -66,13 +62,7 @@ index b13d11c..73acdef 100644 - 'staging/ufw']) + print("Updating staging/ufw to use (%s)" % (sys.executable)) + -+ if not re.search("(/usr/bin/env)", sys.executable): -+ print("Did not find 'env' in sys.executable (%s)" % (sys.executable)) -+ subprocess.call(["sed", -+ "-i", -+ "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", -+ 'staging/ufw']) -+ elif re.search("(/usr/bin/env)", sys.executable): ++ if re.search("(/usr/bin/env)", sys.executable): + print("found 'env' in sys.executable (%s)" % (sys.executable)) + subprocess.call(["sed", + "-i.jjm",
Signature · 1 line
2.25.1