* [gatesgargh 00/10] patch review Feb 06
@ 2021-02-06 23:16 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:16 UTC (permalink / raw)
To: openembedded-devel
Next Gatesgarth patch review.
Please have comments back by Monday.
The following changes since commit 6ff4bd4f345b4e8030b9197d13097308df521576:
postgresql: Update to 12.5 (2021-01-18 08:20:58 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/gatesgarth-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/gatesgarth-nut
Anatol Belski (1):
xmlsec1: Fix configure QA error caused by host lookup path
Dmitry Baryshkov (2):
xterm: install xterm and uxterm desktop files
xterm: provide virtual/x-terminal-emulator
Mikko Rapeli (2):
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
S. Lockwood-Childs (1):
sip3: simplify recipe
Søren Andersen (1):
zram: fix sourcing of zram parameters
zangrc (2):
iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
openldap: upgrade 2.4.51 -> 2.4.56
zhengruoqin (1):
openldap: upgrade 2.4.56 -> 2.4.57
...Compare-with-max-int-instead-of-max-.patch | 48 -------------------
....1.2.bb => iscsi-initiator-utils_2.1.3.bb} | 3 +-
.../flatbuffers/flatbuffers_1.12.0.bb | 2 +
.../giflib/files/CVE-2019-15133.patch | 23 +++++++++
.../recipes-devtools/giflib/giflib_5.1.4.bb | 7 ++-
meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 17 ++-----
.../recipes-extended/zram/zram/zram-swap-init | 2 +-
.../recipes-graphics/xorg-app/xterm_353.bb | 16 ++++++-
...{openldap_2.4.51.bb => openldap_2.4.57.bb} | 6 +--
.../xmlsec1/ensure-search-path-non-host.patch | 22 +++++++++
.../recipes-support/xmlsec1/xmlsec1_1.2.30.bb | 1 +
11 files changed, 78 insertions(+), 69 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%)
create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
rename meta-oe/recipes-support/openldap/{openldap_2.4.51.bb => openldap_2.4.57.bb} (97%)
create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
--
2.17.1
^ permalink raw reply [flat|nested] 24+ messages in thread* [gatesgargh 01/10] xterm: install xterm and uxterm desktop files
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:16 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Modify recipe to install application desktop files for xterm.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 593f21eda5b119f6408975c6b15e94fb168cc9dc)
---
meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
index 6de704d0b7..6376388c27 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 01/10] xterm: install xterm and uxterm desktop files
@ 2021-02-06 23:16 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:16 UTC (permalink / raw)
To: openembedded-devel
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Modify recipe to install application desktop files for xterm.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 593f21eda5b119f6408975c6b15e94fb168cc9dc)
---
meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
index 6de704d0b7..6376388c27 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 02/10] xterm: provide virtual/x-terminal-emulator
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:16 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8826791d795e65851ad20bbc0f34e74b2bf72e07)
---
meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
index 6376388c27..06c285924d 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 02/10] xterm: provide virtual/x-terminal-emulator
@ 2021-02-06 23:16 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:16 UTC (permalink / raw)
To: openembedded-devel
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8826791d795e65851ad20bbc0f34e74b2bf72e07)
---
meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
index 6376388c27..06c285924d 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_353.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 03/10] xmlsec1: Fix configure QA error caused by host lookup path
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:16 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Anatol Belski <anbelski@linux.microsoft.com>
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.
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 74b66d1911118bac53033f77ba6d3923f4809d5a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
new file mode 100644
index 0000000000..a5a298af0d
--- /dev/null
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
@@ -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 <anbelski@linux.microsoft.com>
+
+--- 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" ;;
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
index 93b0d6a67f..2a74d18899 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 03/10] xmlsec1: Fix configure QA error caused by host lookup path
@ 2021-02-06 23:16 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:16 UTC (permalink / raw)
To: openembedded-devel
From: Anatol Belski <anbelski@linux.microsoft.com>
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.
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 74b66d1911118bac53033f77ba6d3923f4809d5a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
new file mode 100644
index 0000000000..a5a298af0d
--- /dev/null
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
@@ -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 <anbelski@linux.microsoft.com>
+
+--- 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" ;;
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
index 93b0d6a67f..2a74d18899 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 04/10] iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: zangrc <zangrc.fnst@cn.fujitsu.com>
0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
Removed since this is included in 2.1.3
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 46e30569e3b3d0cc66ce05e9accd759f37705feb)
[Bug fix only update. Includes several CVE fixes.
CVE-2020-17437
CVE-2020-17438
CVE-2020-13987
CVE-2020-13988 ]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...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%)
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
deleted file mode 100644
index c71f01299b..0000000000
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
similarity index 96%
rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb
rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
index dfcd4ee3cb..4a9cf9db40 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
@@ -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 \
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 04/10] iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@cn.fujitsu.com>
0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
Removed since this is included in 2.1.3
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 46e30569e3b3d0cc66ce05e9accd759f37705feb)
[Bug fix only update. Includes several CVE fixes.
CVE-2020-17437
CVE-2020-17438
CVE-2020-13987
CVE-2020-13988 ]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...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%)
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
deleted file mode 100644
index c71f01299b..0000000000
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
similarity index 96%
rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb
rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
index dfcd4ee3cb..4a9cf9db40 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb
@@ -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 \
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 05/10] sip3: simplify recipe
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: "S. Lockwood-Childs" <sjl@vctlabs.com>
The custom configure block can be shared between target
and native if you just configure the sysroot option accordingly
and use STAGING_INCDIR to locate the python headers to build
against.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5fe362171c7f3426fced0c7889facec397c9cc5e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
index 320755b844..ae8df5055a 100644
--- a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
+++ b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
@@ -19,24 +19,17 @@ PACKAGES += "python3-sip3"
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}"
-}
+CONFIGURE_SYSROOT = "${STAGING_DIR_HOST}"
+CONFIGURE_SYSROOT_class-native = "${STAGING_DIR_NATIVE}"
-do_configure_prepend_class-native() {
+do_configure_prepend() {
echo "py_platform = linux" > sip.cfg
- echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg
+ echo "py_inc_dir = ${STAGING_INCDIR}/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}
+ ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
}
do_install() {
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 05/10] sip3: simplify recipe
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: "S. Lockwood-Childs" <sjl@vctlabs.com>
The custom configure block can be shared between target
and native if you just configure the sysroot option accordingly
and use STAGING_INCDIR to locate the python headers to build
against.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5fe362171c7f3426fced0c7889facec397c9cc5e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
index 320755b844..ae8df5055a 100644
--- a/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
+++ b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
@@ -19,24 +19,17 @@ PACKAGES += "python3-sip3"
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}"
-}
+CONFIGURE_SYSROOT = "${STAGING_DIR_HOST}"
+CONFIGURE_SYSROOT_class-native = "${STAGING_DIR_NATIVE}"
-do_configure_prepend_class-native() {
+do_configure_prepend() {
echo "py_platform = linux" > sip.cfg
- echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg
+ echo "py_inc_dir = ${STAGING_INCDIR}/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}
+ ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${CONFIGURE_SYSROOT} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
}
do_install() {
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 06/10] flatbuffers: whitelist CVE-2020-35864
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Mikko Rapeli <mikko.rapeli@bmw.de>
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"
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
index 1abfc8819d..65f7beec40 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
@@ -14,6 +14,8 @@ SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
SRC_URI = "git://github.com/google/flatbuffers.git"
+CVE_CHECK_WHITELIST += "CVE-2020-35864"
+
CXXFLAGS += "-fPIC"
BUILD_CXXFLAGS += "-fPIC"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 06/10] flatbuffers: whitelist CVE-2020-35864
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: Mikko Rapeli <mikko.rapeli@bmw.de>
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"
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
index 1abfc8819d..65f7beec40 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb
@@ -14,6 +14,8 @@ SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
SRC_URI = "git://github.com/google/flatbuffers.git"
+CVE_CHECK_WHITELIST += "CVE-2020-35864"
+
CXXFLAGS += "-fPIC"
BUILD_CXXFLAGS += "-fPIC"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 07/10] giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Mikko Rapeli <mikko.rapeli@bmw.de>
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
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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
diff --git a/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch b/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
new file mode 100644
index 0000000000..9957be82f3
--- /dev/null
+++ b/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
@@ -0,0 +1,23 @@
+From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr@thyrsus.com>
+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;
+ }
diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
index 21fa352cdc..1871bab46e 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 07/10] giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: Mikko Rapeli <mikko.rapeli@bmw.de>
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
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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
diff --git a/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch b/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
new file mode 100644
index 0000000000..9957be82f3
--- /dev/null
+++ b/meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
@@ -0,0 +1,23 @@
+From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr@thyrsus.com>
+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;
+ }
diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
index 21fa352cdc..1871bab46e 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 08/10] zram: fix sourcing of zram parameters
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: Søren Andersen <san@skov.dk>
Signed-off-by: Søren Andersen <san@skov.dk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 3c8ad9192c1c9f4323bdc7ff28456f11db689adb)
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
meta-oe/recipes-extended/zram/zram/zram-swap-init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-oe/recipes-extended/zram/zram/zram-swap-init
index 0643dbca23..ccc3aafe3a 100755
--- a/meta-oe/recipes-extended/zram/zram/zram-swap-init
+++ b/meta-oe/recipes-extended/zram/zram/zram-swap-init
@@ -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))
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 08/10] zram: fix sourcing of zram parameters
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: Søren Andersen <san@skov.dk>
Signed-off-by: Søren Andersen <san@skov.dk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 3c8ad9192c1c9f4323bdc7ff28456f11db689adb)
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
meta-oe/recipes-extended/zram/zram/zram-swap-init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-oe/recipes-extended/zram/zram/zram-swap-init
index 0643dbca23..ccc3aafe3a 100755
--- a/meta-oe/recipes-extended/zram/zram/zram-swap-init
+++ b/meta-oe/recipes-extended/zram/zram/zram-swap-init
@@ -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))
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 09/10] openldap: upgrade 2.4.51 -> 2.4.56
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: zangrc <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 768345053e83623e286ce3140756036e75c023bc)
[Maintenance update only]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openldap/{openldap_2.4.51.bb => openldap_2.4.56.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/openldap/{openldap_2.4.51.bb => openldap_2.4.56.bb} (98%)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb b/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
similarity index 98%
rename from meta-oe/recipes-support/openldap/openldap_2.4.51.bb
rename to meta-oe/recipes-support/openldap/openldap_2.4.56.bb
index d2c5746080..4c0f179cb0 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
@@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531"
-SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62"
+SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
+SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
DEPENDS = "util-linux groff-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 09/10] openldap: upgrade 2.4.51 -> 2.4.56
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 768345053e83623e286ce3140756036e75c023bc)
[Maintenance update only]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openldap/{openldap_2.4.51.bb => openldap_2.4.56.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/openldap/{openldap_2.4.51.bb => openldap_2.4.56.bb} (98%)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb b/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
similarity index 98%
rename from meta-oe/recipes-support/openldap/openldap_2.4.51.bb
rename to meta-oe/recipes-support/openldap/openldap_2.4.56.bb
index d2c5746080..4c0f179cb0 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
@@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531"
-SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62"
+SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
+SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
DEPENDS = "util-linux groff-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gatesgargh 10/10] openldap: upgrade 2.4.56 -> 2.4.57
2021-02-06 23:16 ` akuster
@ 2021-02-06 23:17 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:08 UTC (permalink / raw)
To: bitbake-devel
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
-License-Update: Copyright year updated to 2021.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 0282b8ce6a5a5f082a37cb0863b3e62ad8e56a5a)
[Maintance update only]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openldap/{openldap_2.4.56.bb => openldap_2.4.57.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/openldap/{openldap_2.4.56.bb => openldap_2.4.57.bb} (97%)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.56.bb b/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
similarity index 97%
rename from meta-oe/recipes-support/openldap/openldap_2.4.56.bb
rename to meta-oe/recipes-support/openldap/openldap_2.4.57.bb
index 4c0f179cb0..a282523a3c 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
# basically BSD. opensource.org does not record this license
# at present (so it is apparently not OSI certified).
LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b6dea6c170362fc46381fe3690c722cb \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
"
SECTION = "libs"
@@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
-SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
+SRC_URI[md5sum] = "e3349456c3a66e5e6155be7ddc3f042c"
+SRC_URI[sha256sum] = "c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a"
DEPENDS = "util-linux groff-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gatesgargh 10/10] openldap: upgrade 2.4.56 -> 2.4.57
@ 2021-02-06 23:17 ` akuster
0 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:17 UTC (permalink / raw)
To: openembedded-devel
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
-License-Update: Copyright year updated to 2021.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 0282b8ce6a5a5f082a37cb0863b3e62ad8e56a5a)
[Maintance update only]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openldap/{openldap_2.4.56.bb => openldap_2.4.57.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/openldap/{openldap_2.4.56.bb => openldap_2.4.57.bb} (97%)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.56.bb b/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
similarity index 97%
rename from meta-oe/recipes-support/openldap/openldap_2.4.56.bb
rename to meta-oe/recipes-support/openldap/openldap_2.4.57.bb
index 4c0f179cb0..a282523a3c 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
# basically BSD. opensource.org does not record this license
# at present (so it is apparently not OSI certified).
LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b6dea6c170362fc46381fe3690c722cb \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
"
SECTION = "libs"
@@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
-SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
+SRC_URI[md5sum] = "e3349456c3a66e5e6155be7ddc3f042c"
+SRC_URI[sha256sum] = "c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a"
DEPENDS = "util-linux groff-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [bitbake-devel] [gatesgargh 00/10] patch review Feb 06
2021-02-06 23:16 ` akuster
` (10 preceding siblings ...)
(?)
@ 2021-02-06 23:09 ` Martin Jansa
-1 siblings, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2021-02-06 23:09 UTC (permalink / raw)
To: akuster; +Cc: bitbake-devel
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
On Sun, Feb 7, 2021 at 12:08 AM akuster <akuster808@gmail.com> wrote:
> Next Gatesgarth patch review.
> Please have comments back by Monday.
>
wrong ML :).
[-- Attachment #2: Type: text/html, Size: 445 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [bitbake-devel] [gatesgargh 00/10] patch review Feb 06
2021-02-06 23:16 ` akuster
` (11 preceding siblings ...)
(?)
@ 2021-02-06 23:18 ` akuster
-1 siblings, 0 replies; 24+ messages in thread
From: akuster @ 2021-02-06 23:18 UTC (permalink / raw)
To: bitbake-devel
nothing like getting old and using the wrong mailing list.
sorry for the noise.
Armin
On 2/6/21 3:08 PM, akuster wrote:
> Next Gatesgarth patch review.
> Please have comments back by Monday.
>
>
> The following changes since commit 6ff4bd4f345b4e8030b9197d13097308df521576:
>
> postgresql: Update to 12.5 (2021-01-18 08:20:58 -0800)
>
> are available in the Git repository at:
>
> git://git.openembedded.org/meta-openembedded-contrib stable/gatesgarth-nut
> http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/gatesgarth-nut
>
> Anatol Belski (1):
> xmlsec1: Fix configure QA error caused by host lookup path
>
> Dmitry Baryshkov (2):
> xterm: install xterm and uxterm desktop files
> xterm: provide virtual/x-terminal-emulator
>
> Mikko Rapeli (2):
> flatbuffers: whitelist CVE-2020-35864
> giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
>
> S. Lockwood-Childs (1):
> sip3: simplify recipe
>
> Søren Andersen (1):
> zram: fix sourcing of zram parameters
>
> zangrc (2):
> iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
> openldap: upgrade 2.4.51 -> 2.4.56
>
> zhengruoqin (1):
> openldap: upgrade 2.4.56 -> 2.4.57
>
> ...Compare-with-max-int-instead-of-max-.patch | 48 -------------------
> ....1.2.bb => iscsi-initiator-utils_2.1.3.bb} | 3 +-
> .../flatbuffers/flatbuffers_1.12.0.bb | 2 +
> .../giflib/files/CVE-2019-15133.patch | 23 +++++++++
> .../recipes-devtools/giflib/giflib_5.1.4.bb | 7 ++-
> meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 17 ++-----
> .../recipes-extended/zram/zram/zram-swap-init | 2 +-
> .../recipes-graphics/xorg-app/xterm_353.bb | 16 ++++++-
> ...{openldap_2.4.51.bb => openldap_2.4.57.bb} | 6 +--
> .../xmlsec1/ensure-search-path-non-host.patch | 22 +++++++++
> .../recipes-support/xmlsec1/xmlsec1_1.2.30.bb | 1 +
> 11 files changed, 78 insertions(+), 69 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%)
> create mode 100644 meta-oe/recipes-devtools/giflib/files/CVE-2019-15133.patch
> rename meta-oe/recipes-support/openldap/{openldap_2.4.51.bb => openldap_2.4.57.bb} (97%)
> create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
>
>
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread