Date   

[meta-python][PATCH 2/5] python3-elementpath: Upgrade 2.1.2 -> 2.1.3

Leon Anavi
 

Upgrade to release 2.1.3:

- Extend tests for XPath 2.0 with minor fixes
- Fix fn:round-half-to-even

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
...thon3-elementpath_2.1.2.bb => python3-elementpath_2.1.3.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-elementpath_2.1.2.bb => python3-elementpath_2.1.3.bb} (74%)

diff --git a/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb b/meta-python/recipes-devtools/python/python3-elementpath_2.1.3.bb
similarity index 74%
rename from meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb
rename to meta-python/recipes-devtools/python/python3-elementpath_2.1.3.bb
index f47f15222..2cba4fb5c 100644
--- a/meta-python/recipes-devtools/python/python3-elementpath_2.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-elementpath_2.1.3.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf"

-SRC_URI[md5sum] = "887f60e9c4fb9b0804a38372b2798101"
-SRC_URI[sha256sum] = "23e1fed8d196d9a6cc4d220ef11fbe7eb8cff3a27848621c447e9d96134b2085"
+SRC_URI[sha256sum] = "b729d9376cc0f76479c9b0cef30cc0d3c9082ccb4507caa0da1a5e4964926960"

PYPI_PACKAGE = "elementpath"
inherit pypi setuptools3
--
2.17.1


[meta-python][PATCH 1/5] python3-cmd2: Upgrade 1.4.0 -> 1.5.0

Leon Anavi
 

Upgrade to release 1.5.0:

- Fixed bug where setting always_show_hint=True did not show a
hint when completing Settables
- Fixed bug in editor detection logic on Linux systems that do not
have which
- Fixed bug in table creator where column headers with tabs would
result in an incorrect width calculation
- Fixed FileNotFoundError which occurred when running history
--clear and no history file existed.
- Added silent_startup_script option to cmd2.Cmd.__init__(). If
True, then the startup script's output will be suppressed.
Anything written to stderr will still display.
- cmd2 now uses pyreadline3 when running Python 3.8 or greater
on Windows
- This is the last release planned to support Python 3.5

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
.../python/{python3-cmd2_1.4.0.bb => python3-cmd2_1.5.0.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-cmd2_1.4.0.bb => python3-cmd2_1.5.0.bb} (75%)

diff --git a/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb b/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb
similarity index 75%
rename from meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb
rename to meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb
index dfe493bd2..18c7a6699 100644
--- a/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def"

DEPENDS += "${PYTHON_PN}-setuptools-scm-native"

-SRC_URI[md5sum] = "520afccc1d46f833d117a23fab76ed8f"
-SRC_URI[sha256sum] = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687"
+SRC_URI[sha256sum] = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"

inherit pypi setuptools3

--
2.17.1


[meta-oe][PATCH] opencv: improve reproducibility

Yu, Mingli
 

From: Mingli Yu <mingli.yu@windriver.com>

Remove the build host info to improve reproducibility.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
meta-oe/recipes-support/opencv/opencv_4.5.0.bb | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.0.bb b/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
index b223334a5..5263ffc03 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
@@ -213,6 +213,11 @@ do_install_append() {
mv ${D}/usr/lib/* ${D}/${libdir}/
rm -rf ${D}/usr/lib
fi
+ # remove build host path to improve reproducibility
+ if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then
+ sed -e 's@${STAGING_DIR_HOST}@@g' \
+ -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake
+ fi
}

TOOLCHAIN = "gcc"
--
2.17.1


[meta-oe][PATCH 0/1] add crash to NON_MULTILIB_RECIPES

kai
 

From: Kai Kang <kai.kang@windriver.com>

It fixes Yocto #4148. But there is no such kind of information in
previous commit messages of layer meta-openembedded. So record it here.

Kai Kang (1):
meta-oe: add crash to NON_MULTILIB_RECIPES

meta-oe/conf/layer.conf | 2 ++
1 file changed, 2 insertions(+)

--
2.17.1


[PATCH 1/1] meta-oe: add crash to NON_MULTILIB_RECIPES

kai
 

From: Kai Kang <kai.kang@windriver.com>

Crash has to be built as the same bitsize (32-bit/64-bit) as the kernel.
So add it to NON_MULTILIB_RECIPES to make it keeps same bitsize with the
kernel. For example, it is 'crash' rather than 'lib32-crash' which is
installed to 32-bit rootfs with 64-bit kernel.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta-oe/conf/layer.conf | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 1f6086164..3de301550 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -98,3 +98,5 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
"

DEFAULT_TEST_SUITES_pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}"
+
+NON_MULTILIB_RECIPES_append = " crash"
--
2.17.1


[meta-oe][PATCH] mozjs: improve reproducibility

Yu, Mingli
 

From: Mingli Yu <mingli.yu@windriver.com>

Remove the build path from the file js60-config.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
index 130ff13ec..614cdf6e3 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
@@ -125,6 +125,8 @@ MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config"

do_install_append() {
oe_multilib_header mozjs-60/js-config.h
+ sed -e 's@${STAGING_DIR_HOST}@@g' \
+ -i ${D}${bindir}/js60-config
}

PACKAGES =+ "lib${BPN}"
--
2.29.2


[meta-qt5][PATCH] qtdeclarative: overwrite do_install_ptest

kai
 

From: Kai Kang <kai.kang@windriver.com>

Overwrite and extend do_install_ptest for qtdeclarative. It fixes
runtime errors:

| FAIL! : TestQmllint::initTestCase() '!m_dataDirectory.isEmpty()'
returned FALSE. ('data' directory not found)

With this change, more tests have been run and the results are better:

passed: 993 -> 2318
failed: 182 -> 113

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
recipes-qt/qt5/qtdeclarative_git.bb | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)

diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 3ff69d6..91e239f 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -27,6 +27,25 @@ PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network"
PACKAGECONFIG[static] = ",,qtdeclarative-native"

+do_install_ptest() {
+ mkdir -p ${D}${PTEST_PATH}
+ for var in `find ${B}/tests/auto/ -name tst_*`; do
+ case=$(basename ${var})
+ if [ -z `echo ${case} | grep '\.'` ]; then
+ dname=$(dirname ${var})
+ pdir=$(basename ${dname})
+ echo ${pdir}/${case} >> ${D}${PTEST_PATH}/tst_list
+
+ mkdir ${D}${PTEST_PATH}/${pdir}
+ install -m 0744 ${var} ${D}${PTEST_PATH}/${pdir}
+ data_dir=${S}/${dname##${B}}/data
+ if [ -d ${data_dir} ]; then
+ cp -r ${data_dir} ${D}${PTEST_PATH}/${pdir}
+ fi
+ fi
+ done
+}
+
do_install_append_class-nativesdk() {
# qml files not needed in nativesdk
rm -rf ${D}${OE_QMAKE_PATH_QML}
--
2.17.1


Re: [dunfell 00/13] Patch review Jan 30

Armin Kuster
 

On 1/30/21 1:53 PM, Andrey Zhizhikin wrote:
Hello Armin,

On Sat, Jan 30, 2021 at 8:37 PM akuster <akuster808@gmail.com> wrote:
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
got. thanks for the request.

-armin

This solves sporadic build errors for gpsd on dunfell, see
https://lists.openembedded.org/g/openembedded-core/message/147317

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%)

--
2.17.1



Thanks a lot!


[meta-python2][PATCH] python-native: Fix parsing with default RPROVIDES dropped in oe-core

Martin Jansa
 

* adapt to:
https://git.openembedded.org/openembedded-core/commit/?id=b8bbc1bbe282cce2ea4d0ff293f931f6caf6153b
* fixes:
ERROR: meta-python2/recipes-devtools/python/python-native_2.7.18.bb: Error executing a python function in <code>: | ETA: 0:00:32

The stack trace of python calls that resulted in this exception/failure was:
File: '<code>', lineno: 13, function: <module>
0009:__anon_35__oe_core_meta_classes_devshell_bbclass(d)
0010:__anon_151__oe_core_meta_classes_sstate_bbclass(d)
0011:__anon_20__oe_core_meta_classes_blacklist_bbclass(d)
0012:__anon_177__oe_core_meta_classes_siteinfo_bbclass(d)
*** 0013:__anon_90__meta_python2_recipes_devtools_python_python_native_2_7_18_bb(d)
File: 'meta-python2/recipes-devtools/python/python-native_2.7.18.bb', lineno: 76, function: __anon_90__meta_python2_recipes_devtools_python_python_native_2_7_18_bb
0072: manifest_file.seek(json_start)
0073: manifest_str = manifest_file.read()
0074: python_manifest = json.loads(manifest_str)
0075:
*** 0076: rprovides = d.getVar('RPROVIDES').split()
0077:
0078: # Hardcoded since it cant be python-native-foo, should be python-foo-native
0079: pn = 'python'
0080:
Exception: AttributeError: 'NoneType' object has no attribute 'split'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-devtools/python/python-native_2.7.18.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/python/python-native_2.7.18.bb b/recipes-devtools/python/python-native_2.7.18.bb
index 72aa34c..5b29c9f 100644
--- a/recipes-devtools/python/python-native_2.7.18.bb
+++ b/recipes-devtools/python/python-native_2.7.18.bb
@@ -73,7 +73,7 @@ python(){
manifest_str = manifest_file.read()
python_manifest = json.loads(manifest_str)

- rprovides = d.getVar('RPROVIDES').split()
+ rprovides = (d.getVar('RPROVIDES') or "").split()

# Hardcoded since it cant be python-native-foo, should be python-foo-native
pn = 'python'
--
2.27.0


[meta-python2][PATCH] python-setuptools: simplify RDEPENDS setting

Martin Jansa
 

* python2 version from meta-python2 caused parsing error now, which unfortunately left bitbake stuck after:
ERROR: meta-python2/recipes-devtools/python/python-setuptools_42.0.2.bb: QA Issue: meta-python2/recipes-devtools/python/python-setuptools_42.0.2.bb: Variable RPROVIDES is set as not being package specific, please fix this. [pkgvarcheck]
ERROR: meta-python2/recipes-devtools/python/python-setuptools_42.0.2.bb: Fatal QA errors found, failing task.
ERROR: Failed to parse recipe: meta-python2/recipes-devtools/python/python-setuptools_42.0.2.bb

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-devtools/python/python-setuptools.inc | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/recipes-devtools/python/python-setuptools.inc b/recipes-devtools/python/python-setuptools.inc
index d8bce71..5f427fd 100644
--- a/recipes-devtools/python/python-setuptools.inc
+++ b/recipes-devtools/python/python-setuptools.inc
@@ -24,6 +24,7 @@ RDEPENDS_${PN} = "\
${PYTHON_PN}-html \
${PYTHON_PN}-netserver \
${PYTHON_PN}-numbers \
+ ${PYTHON_PN}-pkg-resources \
${PYTHON_PN}-pkgutil \
${PYTHON_PN}-plistlib \
${PYTHON_PN}-shell \
@@ -43,8 +44,3 @@ BBCLASSEXTEND = "native nativesdk"
# minimal distributions.
PACKAGES =+ "${PYTHON_PN}-pkg-resources "
FILES_${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*"
-# Due to the way OE-Core implemented native recipes, the native class cannot
-# have a dependency on something that is not a recipe name. Work around that by
-# manually setting RPROVIDES.
-RDEPENDS_${PN}_append = " ${PYTHON_PN}-pkg-resources"
-RPROVIDES_append_class-native = " ${PYTHON_PN}-pkg-resources-native"
--
2.27.0


Re: [dunfell 00/13] Patch review Jan 30

Andrey Zhizhikin
 

Hello Armin,

On Sat, Jan 30, 2021 at 8:37 PM akuster <akuster808@gmail.com> wrote:

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


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%)

--
2.17.1



Thanks a lot!

--
Regards,
Andrey.


[dunfell 13/13] mariadb: Fix 64bit builds if pam is enabled

Armin Kuster
 

From: Dan Murphy <dmurphy@ti.com>

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.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-dbs/mysql/mariadb.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 1a86bc0446..9f7203c40d 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -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
}

--
2.17.1


[dunfell 12/13] networkd-dispatcher: use git fetcher

Armin Kuster
 

From: Martin Jansa <Martin.Jansa@gmail.com>

* 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]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../networkd-dispatcher/networkd-dispatcher_2.0.1.bb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb
index 6b73506c2a..61d656b7ca 100644
--- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb
+++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb
@@ -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"
--
2.17.1


[dunfell 11/13] giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT

Armin Kuster
 

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


[dunfell 10/13] sip3: Upgrade 4.19.19 -> 4.19.23

Armin Kuster
 

From: Leon Anavi <leon.anavi@konsulko.com>

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.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 358b3982583c93fdc0a4cebdab31f923d77b7f8b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../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%)

diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
similarity index 92%
rename from meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
rename to meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
index e6a4653b59..320755b844 100644
--- a/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
+++ b/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb
@@ -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

--
2.17.1


[dunfell 09/13] sip3: Consolidate in a single file

Armin Kuster
 

From: Leon Anavi <leon.anavi@konsulko.com>

Consolidate inc and bb files into a single bb file.
Fix the broken link for HOMEPAGE.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2bc281393aa6c6b83218f2996c32b793ac79a42a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
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

diff --git a/meta-oe/recipes-devtools/sip/sip.inc b/meta-oe/recipes-devtools/sip/sip.inc
deleted file mode 100644
index d8e32a7687..0000000000
--- a/meta-oe/recipes-devtools/sip/sip.inc
+++ /dev/null
@@ -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
-}
diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
index 010fa30fe3..e6a4653b59 100644
--- a/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
+++ b/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb
@@ -1,11 +1,47 @@
-require sip.inc
+SUMMARY = "SIP is a C++/Python Wrapper Generator"
+HOMEPAGE = "https://riverbankcomputing.com/software/sip/"
+SECTION = "devel"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"

-DEPENDS = "python3"
+SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \
+"
+SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88"
+SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44"

inherit python3-dir python3native

+S = "${WORKDIR}/sip-${PV}"
+
+DEPENDS = "python3"
+
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}"
+}
+
+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
+}
+
FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
-
--
2.17.1


[dunfell 08/13] zram: fix sourcing of zram parameters

Armin Kuster
 

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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
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


[dunfell 07/13] rapidjson: Upgrade SRCREV to latest

Armin Kuster
 

From: Harpritkaur Bhandari <harpritkaur.bhandari@kpit.com>

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.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 04d9ea0ba7ece968244bf049893dd5636675b76f)
Signed-off-by: Harpritkaur Bhandari <Harpritkaur.Bhandari@kpit.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index e3ed9c6a17..5b5c8b2570 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -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}"

--
2.17.1


[dunfell 06/13] flatbuffers: whitelist CVE-2020-35864

Armin Kuster
 

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: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb | 3 +++
1 file changed, 3 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 c31cef63cf..7b8d47d8df 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,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"
--
2.17.1


[dunfell 05/13] iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3

Armin Kuster
 

From: zangrc <zangrc.fnst@cn.fujitsu.com>

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

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster@mvista.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

5001 - 5020 of 94208