Patch review Jan 30
cover Patch review Jan 30
Here are the next block of changes for dunfell.
Please have comments back my Tues
Yes, this is out-of-sync with Gatesgath but I am seeing build issues there and did not want to hold up this review cycle.
Clean world build
The following changes since commit 5bba79488b7d393d2258d6e917f7bf7b0d7c4073:
gupnp: Upgrade to 1.2.2 -> 1.2.4 (2021-01-18 08:40:15 -0800)
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
Dan Murphy (1):
mariadb: Fix 64bit builds if pam is enabled
Dmitry Baryshkov (2):
xterm: install xterm and uxterm desktop files
xterm: provide virtual/x-terminal-emulator
Harpritkaur Bhandari (1):
rapidjson: Upgrade SRCREV to latest
Khem Raj (2):
iscsi-initiator-utils: Upgrade to _2.1.2
iscsi-initiator-utils: Silence a clang warning on 64bit systems
Leon Anavi (2):
sip3: Consolidate in a single file
sip3: Upgrade 4.19.19 -> 4.19.23
Martin Jansa (1):
networkd-dispatcher: use git fetcher
Mikko Rapeli (2):
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
Søren Andersen (1):
zram: fix sourcing of zram parameters
zangrc (1):
iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
.../0001-Makefile-Do-not-set-Werror.patch | 31 +++++++++++++++++++
....1.0.bb => iscsi-initiator-utils_2.1.3.bb} | 9 ++----
.../networkd-dispatcher_2.0.1.bb | 7 +++--
meta-oe/recipes-dbs/mysql/mariadb.inc | 8 +++--
.../flatbuffers/flatbuffers_1.12.0.bb | 3 ++
.../giflib/files/CVE-2019-15133.patch | 23 ++++++++++++++
.../recipes-devtools/giflib/giflib_5.1.4.bb | 7 ++++-
.../rapidjson/rapidjson_git.bb | 5 ++-
meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 -------
.../sip/{sip.inc => sip3_4.19.23.bb} | 17 ++++++++--
.../recipes-extended/zram/zram/zram-swap-init | 2 +-
.../recipes-graphics/xorg-app/xterm_353.bb | 16 ++++++++--
12 files changed, 107 insertions(+), 32 deletions(-)
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch
rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.0.bb => iscsi-initiator-utils_2.1.3.bb} (96%)
create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
delete mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
rename meta-oe/recipes-devtools/sip/{sip.inc => sip3_4.19.23.bb} (79%)Signature · 1 line
2.17.1
PATCH 1/13 xterm: install xterm and uxterm desktop files
From: Dmitry Baryshkov <[email protected]>
Modify recipe to install application desktop files for xterm.
--- meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta-oe/recipes-graphics/xorg-app/xterm_353.bb +8 -1
@@ -1,6 +1,6 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
@@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" +# Let xterm install .desktop files +inherit mime-xdg + EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ --x-libraries=${STAGING_LIBDIR} \ FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
@@ -30,6 +33,10 @@ do_configure() { oe_runconf } +do_install_append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + # busybox can supply resize too inherit update-alternatives
Signature · 1 line
2.17.1
PATCH 2/13 xterm: provide virtual/x-terminal-emulator
In reply to akusterFrom: Dmitry Baryshkov <[email protected]>
--- meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta-oe/recipes-graphics/xorg-app/xterm_353.bb +6 -1
@@ -37,7 +37,12 @@ do_install_append() { oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" } +RPROVIDES_${PN} = "virtual/x-terminal-emulator" + # busybox can supply resize too inherit update-alternatives -ALTERNATIVE_${PN} = "resize" +ALTERNATIVE_${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9"
Signature · 1 line
2.17.1
PATCH 3/13 iscsi-initiator-utils: Upgrade to _2.1.2
In reply to akusterFrom: Khem Raj <[email protected]>
Fix build with clang
---
.../0001-Makefile-Do-not-set-Werror.patch | 31 +++++++++++++++++++
....1.0.bb => iscsi-initiator-utils_2.1.2.bb} | 9 ++----
2 files changed, 34 insertions(+), 6 deletions(-)
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch
rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.0.bb => iscsi-initiator-utils_2.1.2.bb} (96%)meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 31d88f46bfc67de2659991674253a5d5dfb92afc Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Aug 2020 12:00:29 -0700 +Subject: [PATCH] Makefile: Do not set -Werror + +clang finds more warnings which causes build to fail, disable treating +warning as errors + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 21bb154..0018605 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -35,7 +35,7 @@ endif + PKG_CONFIG = /usr/bin/pkg-config + + CFLAGS ?= -O2 -g +-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common ++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) +-- +2.28.0 +
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb renamed from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb +3 -6
@@ -12,9 +12,10 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c" +SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ + file://0001-Makefile-Do-not-set-Werror.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \
@@ -23,9 +24,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://set_initiatorname \ " S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -PV .= "+git${SRCPV}" inherit update-rc.d systemd autotools pkgconfig
@@ -34,7 +32,7 @@ EXTRA_OECONF = " \ --host=${BUILD_SYS} \ " -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" EXTRA_OEMAKE = ' \ OS="${TARGET_SYS}" \
@@ -43,7 +41,6 @@ EXTRA_OEMAKE = ' \ MANDIR="${mandir}" \ OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ - NO_SYSTEMD=1 \ '
Signature · 1 line
2.17.1
PATCH 4/13 iscsi-initiator-utils: Silence a clang warning on 64bit systems
In reply to akusterFrom: Khem Raj <[email protected]>
This unbreaks the build with clang as well.
--- ...Compare-with-max-int-instead-of-max-.patch | 48 +++++++++++++++++++ .../iscsi-initiator-utils_2.1.2.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 21 Oct 2020 09:11:20 -0700 +Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long + +This compares value member of int_list_tbl struct which is of unsigned +int type. + +struct int_list_tbl { +const char *name; +unsigned int value; +}; + +Clang compiler reports this comparison when +-Wtautological-constant-out-of-range-compare is enabled + +| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] +| _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| idbm.c:263:23: note: expanded from macro '_rec_int_list' +| if (_org->_name[_i] != ~0UL) { \ +| ~~~~~~~~~~~~~~~ ^ ~~~~ + +Since max value for int can be less than unsinged long e.g. on LP64 its +better to use UINT_MAX here + +Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227] +Signed-off-by: Khem Raj <[email protected]> +--- + libopeniscsiusr/idbm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +index 7bc2381..060196f 100644 +--- a/libopeniscsiusr/idbm.c ++++ b/libopeniscsiusr/idbm.c +@@ -260,7 +260,7 @@ do {\ + _recs[_n].type = TYPE_INT_LIST; \ + _strncpy(_recs[_n].name, _key, NAME_MAXVAL); \ + for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \ +- if (_org->_name[_i] != ~0UL) { \ ++ if (_org->_name[_i] != UINT_MAX) { \ + for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \ + if (_tbl[_j].value == _org->_name[_i]) { \ + strcat(_recs[_n].value, _tbl[_j].name); \ +-- +2.29.0 +
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +1 -0
@@ -16,6 +16,7 @@ SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://0001-Makefile-Do-not-set-Werror.patch \ + file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \
Signature · 1 line
2.17.1
PATCH 5/13 iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
In reply to akusterFrom: zangrc <[email protected]>
Source: git.openembedded.org
MR: 108115, 108125, 108095, 108105
Type: Security Fix
Disposition: Backport from https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-daemons/iscsi-initiator-utils?id=46e30569e3b3d0cc66ce05e9accd759f37705feb
ChangeID: 46e30569e3b3d0cc66ce05e9accd759f37705feb
Description:
0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch Removed since this is included in 2.1.3
Bugfix only update. Also includes these CVE fixes:
CVE-2020-13988
CVE-2020-13987
CVE-2020-17438
CVE-2020-17437
---
...Compare-with-max-int-instead-of-max-.patch | 48 -------------------
....1.2.bb => iscsi-initiator-utils_2.1.3.bb} | 3 +-
2 files changed, 1 insertion(+), 50 deletions(-)
delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.2.bb => iscsi-initiator-utils_2.1.3.bb} (96%)meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch deleted +0 -48
@@ -1,48 +0,0 @@ -From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 21 Oct 2020 09:11:20 -0700 -Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long - -This compares value member of int_list_tbl struct which is of unsigned -int type. - -struct int_list_tbl { -const char *name; -unsigned int value; -}; - -Clang compiler reports this comparison when --Wtautological-constant-out-of-range-compare is enabled - -| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] -| _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| idbm.c:263:23: note: expanded from macro '_rec_int_list' -| if (_org->_name[_i] != ~0UL) { \ -| ~~~~~~~~~~~~~~~ ^ ~~~~ - -Since max value for int can be less than unsinged long e.g. on LP64 its -better to use UINT_MAX here - -Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227] -Signed-off-by: Khem Raj <[email protected]> ---- - libopeniscsiusr/idbm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index 7bc2381..060196f 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -260,7 +260,7 @@ do {\ - _recs[_n].type = TYPE_INT_LIST; \ - _strncpy(_recs[_n].name, _key, NAME_MAXVAL); \ - for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \ -- if (_org->_name[_i] != ~0UL) { \ -+ if (_org->_name[_i] != UINT_MAX) { \ - for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \ - if (_tbl[_j].value == _org->_name[_i]) { \ - strcat(_recs[_n].value, _tbl[_j].name); \ --- -2.29.0 -
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb renamed from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +1 -2
@@ -12,11 +12,10 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" +SRCREV ?= "34e3ffb194f6fa3028c0eb2ff57e7db2d1026771" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://0001-Makefile-Do-not-set-Werror.patch \ - file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \
Signature · 1 line
2.17.1
PATCH 6/13 flatbuffers: whitelist CVE-2020-35864
In reply to akusterFrom: Mikko Rapeli <[email protected]>
CVE-2020-35864 is for the rust crate for flatbuffers, not flatbuffers itself.
https://security-tracker.debian.org/tracker/CVE-2020-35864
"NOT-FOR-US: flatbuffers rust crate"
--- meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb +3 -0
@@ -14,6 +14,9 @@ SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" SRC_URI = "git://github.com/google/flatbuffers.git" +# affects only flatbuffers rust crate +CVE_CHECK_WHITELIST += "CVE-2020-35864" + # Make sure C++11 is used, required for example for GCC 4.9 CXXFLAGS += "-std=c++11 -fPIC" BUILD_CXXFLAGS += "-std=c++11 -fPIC"
Signature · 1 line
2.17.1
PATCH 7/13 rapidjson: Upgrade SRCREV to latest
In reply to akusterFrom: Harpritkaur Bhandari <[email protected]>
Upgrade SRCREV to latest as it fixes the below issue:
Running UndefinedBehaviorSanitizer on projects that use rapidjson triggers 'applying non-zero offset <NN> to null pointer' findings in 'internal/stack.h' which are hard
to suppress by library users.
Removed "0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" as the changes are already incorporated in the latest codebase.
As per abi-compliance-checker report the source compatibility and binary compatibility between previous SRCREV 6a905f9311f82d306da77bd963ec5aa5da07da9c and current
SRCREV 0ccdbf364c577803e2a751f5aededce935314313
is 100% and this patch is already tested on 64bit
ARM (aarch64) in a product with on target CI tests.
--- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +2 -3
@@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ - file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1" -SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c" +SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" PV = "1.1.0+git${SRCPV}"
Signature · 1 line
2.17.1
PATCH 8/13 zram: fix sourcing of zram parameters
In reply to akusterFrom: Søren Andersen <[email protected]>
--- meta-oe/recipes-extended/zram/zram/zram-swap-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/zram/zram/zram-swap-init +1 -1
@@ -14,7 +14,7 @@ fi ZRAM_SIZE_PERCENT=100 ZRAM_ALGORITHM=lz4 -[ -f /etc/default/zram ] && ./etc/default/zram || true +[ -f /etc/default/zram ] && . /etc/default/zram || true memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') memzram=$(($memtotal*${ZRAM_SIZE_PERCENT}/100))
Signature · 1 line
2.17.1
PATCH 9/13 sip3: Consolidate in a single file
In reply to akusterFrom: Leon Anavi <[email protected]>
Consolidate inc and bb files into a single bb file. Fix the broken link for HOMEPAGE.
--- meta-oe/recipes-devtools/sip/sip.inc | 36 ----------------- meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 42 ++++++++++++++++++-- 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-devtools/sip/sip.inc
meta-oe/recipes-devtools/sip/sip.inc deleted +0 -36
@@ -1,36 +0,0 @@ -SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" - -SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" -SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" - -S = "${WORKDIR}/sip-${PV}" - -BBCLASSEXTEND = "native" - -do_configure_prepend_class-target() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" -} -do_configure_prepend_class-native() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} -} -do_install() { - oe_runmake install -}
meta-oe/recipes-devtools/sip/sip3_4.19.19.bb +39 -3
50 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 10/13 sip3: Upgrade 4.19.19 -> 4.19.23
In reply to akusterFrom: Leon Anavi <[email protected]>
Upgrade to release 4.19.23:
- Added some missing quotes to configure.py
- Fixed a race condition when calling the PyQt5-specific meta-call helper.
- Fixed the wrapping of methods that return a Py_Ssize_t.
- The code generator now distinguishes between the copy/assignment helper and the array helper when determining which helpers can be generated.
- Fixed the code generation when making a copy of C++ object on the stack to the heap when the class has no suitable ctor.
- Check there is a public copy ctor when we can't using an assigment operator as a workaround.
- Preserve any current exception in the implementation of the wrapper dealloc functions.
---
.../recipes-devtools/sip/{sip3_4.19.19.bb => sip3_4.19.23.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/sip/{sip3_4.19.19.bb => sip3_4.19.23.bb} (92%)meta-oe/recipes-devtools/sip/sip3_4.19.23.bb renamed from meta-oe/recipes-devtools/sip/sip3_4.19.19.bb +2 -2
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ " -SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" -SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" +SRC_URI[md5sum] = "70adc0c9734e2d9dcd241d3f931dfc74" +SRC_URI[sha256sum] = "22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7" inherit python3-dir python3native
Signature · 1 line
2.17.1
PATCH 11/13 giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
In reply to akusterFrom: Mikko Rapeli <[email protected]>
Backport upstream patch for CVE-2019-15133.
Set CVE_PRODUCT to "giflib_project:giflib" which is used in NVD. https://nvd.nist.gov/vuln/detail/CVE-2019-15133
--- .../giflib/files/CVE-2019-15133.patch | 23 +++++++++++++++++++ .../recipes-devtools/giflib/giflib_5.1.4.bb | 7 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch new file +23 -0
@@ -0,0 +1,23 @@ +From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" <[email protected]> +Date: Sun, 17 Mar 2019 12:37:21 -0400 +Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address + +--- + dgif_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-status: Backport [https://sourceforge.net/p/giflib/code/ci/799eb6a3af8a3dd81e2429bf11a72a57e541f908/] +CVE: CVE-2019-15133 + +--- a/lib/dgif_lib.c 2021-01-13 19:28:18.923493586 +0100 ++++ b/lib/dgif_lib.c 2021-01-13 19:28:55.245863085 +0100 +@@ -1099,7 +1099,7 @@ DGifSlurp(GifFileType *GifFile) + + sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; + /* Allocate memory for the image */ +- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && ++ if (sp->ImageDesc.Width <= 0 && sp->ImageDesc.Height <= 0 && + sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { + return GIF_ERROR; + }
meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb +6 -1
@@ -3,7 +3,12 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" -SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2 \ + file://CVE-2019-15133.patch \ +" + +CVE_PRODUCT = "giflib_project:giflib" inherit autotools
Signature · 1 line
2.17.1
PATCH 12/13 networkd-dispatcher: use git fetcher
In reply to akusterFrom: Martin Jansa <[email protected]>
* now the gitlab QA check was backported to dunfell as well in:
https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=72f2c45880afbba1745e5e0cbd841d7fd666f374
and this started failing with:
ERROR: networkd-dispatcher-2.0.1-r0 do_package_qa: QA Issue: networkd-dispatcher: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad]
--- .../networkd-dispatcher/networkd-dispatcher_2.0.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +4 -3
@@ -12,9 +12,10 @@ inherit features_check systemd RDEPENDS_${PN} = "python3-pygobject python3-dbus" REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI = "https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/${PV}/networkd-dispatcher-${PV}.tar.bz2" -SRC_URI[md5sum] = "304d7dcc21331ea295e207f8493cb8d8" -SRC_URI[sha256sum] = "21f84c3646a043329dc64787e4e58dfce592b2559b0e3069af82c469805660c2" +SRCREV = "333ef1ed1d7c7c17264fcf7629e5c2f78ab4112c" +SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https" + +S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service"
Signature · 1 line
2.17.1
PATCH 13/13 mariadb: Fix 64bit builds if pam is enabled
In reply to akusterFrom: Dan Murphy <[email protected]>
Fix the installation of the pam.so for 64bit builds. This is an indirect backport of commit
8fa0a3ace6b8835ba623fac118e0bdb4ea0f1f24 ("mariadb: upgrade to 10.5.4")
from the master branch.
--- meta-oe/recipes-dbs/mysql/mariadb.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
meta-oe/recipes-dbs/mysql/mariadb.inc +6 -2
@@ -167,8 +167,12 @@ do_install() { mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - mv ${D}/lib/security ${D}/${libdir} - rmdir --ignore-fail-on-non-empty ${D}/lib + pam_so=$(find ${D} -name pam_user_map.so) + if [ x"${pam_so}" != x ]; then + pam_dir=$(dirname ${pam_so}) + mv ${pam_dir} ${D}/${libdir} + rmdir --ignore-fail-on-non-empty ${pam_dir%security} + fi fi }
Signature · 1 line
2.17.1
Hello Armin,
Quoted 3 lines · akuster
Here are the next block of changes for dunfell.
Please have comments back my Tues
Would it be possible to include also the following commit from master:04afc692a gpsd: mark CLEANBROKEN
This solves sporadic build errors for gpsd on dunfell, see
https://lists.openembedded.org/g/openembedded-core/message/147317
Quoted 64 lines
Yes, this is out-of-sync with Gatesgath but I am seeing build issues there and did not want to hold up this review cycle.
Clean world build
The following changes since commit
5bba79488b7d393d2258d6e917f7bf7b0d7c4073:gupnp: Upgrade to 1.2.2 -> 1.2.4 (2021-01-18 08:40:15 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nutDan Murphy (1):
mariadb: Fix 64bit builds if pam is enabledDmitry Baryshkov (2):
xterm: install xterm and uxterm desktop files
xterm: provide virtual/x-terminal-emulatorHarpritkaur Bhandari (1):
rapidjson: Upgrade SRCREV to latestKhem Raj (2):
iscsi-initiator-utils: Upgrade to _2.1.2
iscsi-initiator-utils: Silence a clang warning on 64bit systemsLeon Anavi (2):
sip3: Consolidate in a single file
sip3: Upgrade 4.19.19 -> 4.19.23Martin Jansa (1):
networkd-dispatcher: use git fetcherMikko Rapeli (2):
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and setCVE_PRODUCTSøren Andersen (1):
zram: fix sourcing of zram parameterszangrc (1):
iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3.../0001-Makefile-Do-not-set-Werror.patch | 31 +++++++++++++++++++ ....1.0.bb => iscsi-initiator-utils_2.1.3.bb} | 9 ++---- .../networkd-dispatcher_2.0.1.bb | 7 +++-- meta-oe/recipes-dbs/mysql/mariadb.inc | 8 +++-- .../flatbuffers/flatbuffers_1.12.0.bb | 3 ++ .../giflib/files/CVE-2019-15133.patch | 23 ++++++++++++++ .../recipes-devtools/giflib/giflib_5.1.4.bb | 7 ++++- .../rapidjson/rapidjson_git.bb | 5 ++- meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 ------- .../sip/{sip.inc => sip3_4.19.23.bb} | 17 ++++++++-- .../recipes-extended/zram/zram/zram-swap-init | 2 +- .../recipes-graphics/xorg-app/xterm_353.bb | 16 ++++++++-- 12 files changed, 107 insertions(+), 32 deletions(-) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.0.bb => iscsi-initiator-utils_2.1.3.bb} (96%) create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch delete mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.19.bb rename meta-oe/recipes-devtools/sip/{sip.inc => sip3_4.19.23.bb} (79%)
Quoted 6 lines
--
2.17.1
Thanks a lot!
Signature · 2 lines
Regards, Andrey.
Quoted 7 lines · Andrey Zhizhikin
Hello Armin,
Quoted 2 lines · akuster
Here are the next block of changes for dunfell.
Please have comments back my TuesWould it be possible to include also the following commit from master:
04afc692agpsd: mark CLEANBROKEN
got. thanks for the request.
-armin
Quoted 75 lines
This solves sporadic build errors for gpsd on dunfell, see
https://lists.openembedded.org/g/openembedded-core/message/147317Quoted 63 lines
Yes, this is out-of-sync with Gatesgath but I am seeing build issues there and did not want to hold up this review cycle.
Clean world build
The following changes since commit
5bba79488b7d393d2258d6e917f7bf7b0d7c4073:gupnp: Upgrade to 1.2.2 -> 1.2.4 (2021-01-18 08:40:15 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nutDan Murphy (1):
mariadb: Fix 64bit builds if pam is enabledDmitry Baryshkov (2):
xterm: install xterm and uxterm desktop files
xterm: provide virtual/x-terminal-emulatorHarpritkaur Bhandari (1):
rapidjson: Upgrade SRCREV to latestKhem Raj (2):
iscsi-initiator-utils: Upgrade to _2.1.2
iscsi-initiator-utils: Silence a clang warning on 64bit systemsLeon Anavi (2):
sip3: Consolidate in a single file
sip3: Upgrade 4.19.19 -> 4.19.23Martin Jansa (1):
networkd-dispatcher: use git fetcherMikko Rapeli (2):
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and setCVE_PRODUCTSøren Andersen (1):
zram: fix sourcing of zram parameterszangrc (1):
iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3.../0001-Makefile-Do-not-set-Werror.patch | 31 +++++++++++++++++++ ....1.0.bb => iscsi-initiator-utils_2.1.3.bb} | 9 ++---- .../networkd-dispatcher_2.0.1.bb | 7 +++-- meta-oe/recipes-dbs/mysql/mariadb.inc | 8 +++-- .../flatbuffers/flatbuffers_1.12.0.bb | 3 ++ .../giflib/files/CVE-2019-15133.patch | 23 ++++++++++++++ .../recipes-devtools/giflib/giflib_5.1.4.bb | 7 ++++- .../rapidjson/rapidjson_git.bb | 5 ++- meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 ------- .../sip/{sip.inc => sip3_4.19.23.bb} | 17 ++++++++-- .../recipes-extended/zram/zram/zram-swap-init | 2 +- .../recipes-graphics/xorg-app/xterm_353.bb | 16 ++++++++-- 12 files changed, 107 insertions(+), 32 deletions(-) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.0.bb => iscsi-initiator-utils_2.1.3.bb} (96%) create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch delete mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.19.bb rename meta-oe/recipes-devtools/sip/{sip.inc => sip3_4.19.23.bb} (79%)Quoted 6 lines
--
2.17.1Thanks a lot!