Patch review; June 27
cover Patch review; June 27
Please have comments back by wednesday.
The following changes since commit aca88908fd329f5cef6f19995b072397fb2d8ec6:
thunar: fix CVE-2021-32563 (2021-06-13 12:35:48 -0700)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/hardknott-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/hardknott-nut
Andrea Adami (3):
initramfs-kexecboot-image: support cases where machines override
IMAGE_FSTYPES
initramfs-debug-image: support cases where machines override
IMAGE_FSTYPES
rapidjson: remove stale LIB_INSTALL_DIR
Chen Qi (1):
minifi-cpp: set CLEANBROKEN to 1
Geoff Parker (1):
cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has
usrmerge
Leon Anavi (1):
python3-django: Upgrade 3.2.3 -> 3.2.4
Olivier Georget (1):
libpfm4 4.10.1 : enable arm64 host platform
Ovidiu Panait (1):
libeigen: update LICENSE information
Peter Kjellerstedt (2):
net-snmp: A little clean up
net-snmp: Support building for native
Sekine Shigeki (2):
add CVE-2011-2411 to allowlist
ntp: add CVE-2016-9312 to allowlist
Trevor Gamblin (3):
python3-django: upgrade 2.2.22 -> 2.2.23
python3-django: upgrade 3.2.2 -> 3.2.3
python3-django: upgrade 2.2.23 -> 2.2.24
Yi Zhao (1):
minifi-cpp: set correct python processor directory in configure file
[email protected] (2):
cyrus-sasl: add CVE-2020-8032 to allowlist
dovecot: add CVE-2016-4983 to allowlist
zangrc (1):
wireshark: upgrade 3.4.5 -> 3.4.6
zhengruoqin (1):
net-snmp: upgrade 5.9 -> 5.9.1
.../images/initramfs-debug-image.bb | 7 ++-
.../images/initramfs-kexecboot-image.bb | 8 ++-
.../samba/samba_4.10.18.bb | 4 ++
.../cyrus-sasl/cyrus-sasl_2.1.27.bb | 3 ++
....7.2-fix-engineBoots-value-on-SIGHUP.patch | 19 ++++---
.../{net-snmp_5.9.bb => net-snmp_5.9.1.bb} | 53 ++++++++++---------
.../recipes-support/cifs/cifs-utils_6.13.bb | 17 ++++--
.../recipes-support/dovecot/dovecot_2.3.14.bb | 3 ++
.../recipes-support/ntp/ntp_4.2.8p15.bb | 3 ++
...{wireshark_3.4.5.bb => wireshark_3.4.6.bb} | 2 +-
meta-oe/licenses/MINPACK | 51 ++++++++++++++++++
.../rapidjson/rapidjson_git.bb | 2 +-
.../minifi-cpp/minifi-cpp_0.7.0.bb | 5 ++
.../recipes-kernel/libpfm/libpfm4_4.10.1.bb | 3 +-
.../libeigen/libeigen_3.3.7.bb | 9 +++-
...ngo_2.2.22.bb => python3-django_2.2.24.bb} | 4 +-
...jango_3.2.2.bb => python3-django_3.2.4.bb} | 2 +-
17 files changed, 149 insertions(+), 46 deletions(-)
rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.bb => net-snmp_5.9.1.bb} (89%)
rename meta-networking/recipes-support/wireshark/{wireshark_3.4.5.bb => wireshark_3.4.6.bb} (97%)
create mode 100644 meta-oe/licenses/MINPACK
rename meta-python/recipes-devtools/python/{python3-django_2.2.22.bb => python3-django_2.2.24.bb} (41%)
rename meta-python/recipes-devtools/python/{python3-django_3.2.2.bb => python3-django_3.2.4.bb} (77%)Signature · 1 line
2.17.1
PATCH 1/20 libpfm4 4.10.1 : enable arm64 host platform
From: Olivier Georget <[email protected]>
libpfm4 is only enabled for powerpc arch as of now. This enables the lib on Arm 64bit platform as well.
--- meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb +2 -1
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" SECTION = "devel" -COMPATIBLE_HOST = "powerpc64" +COMPATIBLE_HOST = "powerpc64|aarch64" SRC_URI = "${SOURCEFORGE_MIRROR}/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ file://0001-Include-poll.h-instead-of-sys-poll.h.patch \
@@ -24,6 +24,7 @@ EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCON EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE_append_powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" +EXTRA_OEMAKE_append_aarch64 = " ARCH=\"arm64\"" S = "${WORKDIR}/libpfm-${PV}"
Signature · 1 line
2.17.1
PATCH 2/20 wireshark: upgrade 3.4.5 -> 3.4.6
In reply to Armin KusterFrom: zangrc <[email protected]>
---
.../wireshark/{wireshark_3.4.5.bb => wireshark_3.4.6.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-support/wireshark/{wireshark_3.4.5.bb => wireshark_3.4.6.bb} (97%)meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb renamed from meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb +1 -1
@@ -19,7 +19,7 @@ SRC_URI += " \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333" +SRC_URI[sha256sum] = "12a678208f8cb009e6b9d96026e41a6ef03c7ad086b9e1029f42053b249b4628" PE = "1"
Signature · 1 line
2.17.1
PATCH 3/20 libeigen: update LICENSE information
In reply to Armin KusterFrom: Ovidiu Panait <[email protected]>
From COPYING.README:
"""
Eigen is primarily MPL2 licensed. See COPYING.MPL2 and these links:
http://www.mozilla.org/MPL/2.0/
http://www.mozilla.org/MPL/2.0/FAQ.html
Some files contain third-party code under BSD or LGPL licenses, whence the other COPYING.* files here.
All the LGPL code is either LGPL 2.1-only, or LGPL 2.1-or-later. For this reason, the COPYING.LGPL file contains the LGPL 2.1 text. """
The upstream repository contains multiple COPYING files (various 3rd party code is under different licenses), so update the LICENSE information accordingly. Also, add MINPACK to meta-oe/licenses.
--- meta-oe/licenses/MINPACK | 51 +++++++++++++++++++ .../libeigen/libeigen_3.3.7.bb | 9 +++- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-oe/licenses/MINPACK
meta-oe/licenses/MINPACK new file +51 -0
@@ -0,0 +1,51 @@ +Minpack Copyright Notice (1999) University of Chicago. All rights reserved + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. + +2. Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution. + +3. The end-user documentation included with the +redistribution, if any, must include the following +acknowledgment: + + "This product includes software developed by the + University of Chicago, as Operator of Argonne National + Laboratory. + +Alternately, this acknowledgment may appear in the software +itself, if and wherever such third-party acknowledgments +normally appear. + +4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" +WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE +UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND +THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE +OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY +OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR +USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF +THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) +DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION +UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL +BE CORRECTED. + +5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT +HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF +ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, +INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF +ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF +PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER +SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT +(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, +EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE +POSSIBILITY OF SUCH LOSS OR DAMAGES.
meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +7 -2
@@ -1,8 +1,13 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ +" SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1"
Signature · 1 line
2.17.1
PATCH 4/20 net-snmp: upgrade 5.9 -> 5.9.1
In reply to Armin KusterFrom: zhengruoqin <[email protected]>
Refresh the following patch:
net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
---
....7.2-fix-engineBoots-value-on-SIGHUP.patch | 19 +++++++++++--------
.../{net-snmp_5.9.bb => net-snmp_5.9.1.bb} | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
rename meta-networking/recipes-protocols/net-snmp/{net-snmp_5.9.bb => net-snmp_5.9.1.bb} (99%)meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch +11 -8
@@ -1,6 +1,6 @@ -From b6a3d6c8af35f1ef27b80b0516742fce89f4eb29 Mon Sep 17 00:00:00 2001 -From: Marian Florea <[email protected]> -Date: Thu, 20 Jul 2017 16:55:24 +0800 +From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <[email protected]> +Date: Wed, 9 Jun 2021 15:47:30 +0900 Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP Upstream-Status: Pending
@@ -14,17 +14,17 @@ Signed-off-by: Li Zhou <[email protected]> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agent/snmpd.c b/agent/snmpd.c -index ae73eda..66b4560 100644 +index 1af439f..355b510 100644 --- a/agent/snmpd.c +++ b/agent/snmpd.c -@@ -1207,6 +1207,7 @@ receive(void) +@@ -1208,6 +1208,7 @@ receive(void) snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", netsnmp_get_version()); update_config(); -+ snmp_store(app_name); ++ snmp_store(app_name); send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); - #if HAVE_SIGHOLD - sigrelse(SIGHUP); + #if HAVE_SIGPROCMASK + ret = sigprocmask(SIG_UNBLOCK, &set, NULL); diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c index 29c2a0f..ada961c 100644 --- a/snmplib/snmpv3.c
@@ -41,3 +41,6 @@ index 29c2a0f..ada961c 100644 engineBoots = 1; } +-- +2.25.1 +
meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb renamed from meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +1 -1
@@ -27,7 +27,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ " -SRC_URI[sha256sum] = "04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071" +SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
Signature · 1 line
2.17.1
PATCH 5/20 minifi-cpp: set correct python processor directory in configure file
In reply to Armin KusterFrom: Yi Zhao <[email protected]>
Set an appropriate python processor directory in configure file to fix
the minifi startup warning:
[org::apache::nifi::minifi::python::PythonCreator] [error] Could not access /etc/minifi/minifi-python/
--- meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +3 -0
@@ -88,6 +88,7 @@ do_install() { install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf install -m 755 -d ${D}${localstatedir}/lib/minifi + install -m 755 -d ${D}${libexecdir}/minifi-python cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/
@@ -101,6 +102,8 @@ do_install() { ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|nifi.flow.configuration.file=.*|nifi.flow.configuration.file='${MINIFI_HOME}'/conf/config.yml|g' \ ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.python.processor.dir=.*|nifi.python.processor.dir=${libexecdir}/minifi-python|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh
Signature · 1 line
2.17.1
PATCH 6/20 add CVE-2011-2411 to allowlist
In reply to Armin KusterFrom: Sekine Shigeki <[email protected]>
This affects only on HP NonStop Server, so add it to allowlist.
--- meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +4 -0
@@ -44,6 +44,10 @@ SRC_URI[sha256sum] = "7dcfc2aaaac565b959068788e6a43fc79ce2a03e7d523f5843f7a9fddf UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" inherit systemd waf-samba cpan-base perlnative update-rc.d + +# CVE-2011-2411 is valnerble only on HP NonStop Servers. +CVE_CHECK_WHITELIST += "CVE-2011-2411" + # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl"
Signature · 1 line
2.17.1
PATCH 7/20 cyrus-sasl: add CVE-2020-8032 to allowlist
In reply to Armin KusterFrom: "[email protected]" <[email protected]>
This affects only openSUSE, so add it to allowlist.
--- .../recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +3 -0
@@ -96,3 +96,6 @@ FILES_${PN}-dbg += "${libdir}/sasl2/.debug" FILES_${PN}-staticdev += "${libdir}/sasl2/*.a" INSANE_SKIP_${PN} += "dev-so" + +# CVE-2020-8032 affects only openSUSE +CVE_CHECK_WHITELIST += "CVE-2020-8032"
Signature · 1 line
2.17.1
PATCH 8/20 initramfs-kexecboot-image: support cases where machines override IMAGE_FSTYPES
In reply to Armin KusterFrom: Andrea Adami <[email protected]>
test case: zaurus.inc
IMAGE_FSTYPES ?= "tar.gz jffs2 jffs2.sum ubi ubifs" IMAGE_FSTYPES_collie ?= "tar.gz jffs2 jffs2.sum" INITRAMFS_FSTYPES ?= "cpio.gz cpio.xz"
The last assignment IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" did in fact reset the value to IMAGE_FSTYPES_collie, thus not producing cpio.gz / cpio.xz.
--- .../recipes-core/images/initramfs-kexecboot-image.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb +6 -2
@@ -1,9 +1,13 @@ SUMMARY = "Initramfs image for kexecboot kernel" DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." -inherit image +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit image # avoid circular dependencies EXTRA_IMAGEDEPENDS = ""
Signature · 1 line
2.17.1
PATCH 9/20 initramfs-debug-image: support cases where machines override IMAGE_FSTYPES
In reply to Armin KusterFrom: Andrea Adami <[email protected]>
As done for initramfs-kexecboot-image we need to use python to get the desired value for IMAGE_FSTYPES.
--- .../recipes-core/images/initramfs-debug-image.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta-initramfs/recipes-core/images/initramfs-debug-image.bb +6 -1
@@ -11,7 +11,12 @@ IMAGE_FEATURES = "" export IMAGE_BASENAME = "initramfs-debug-image" IMAGE_LINGUAS = "" -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} + inherit core-image IMAGE_ROOTFS_SIZE = "8192"
Signature · 1 line
2.17.1
PATCH 10/20 rapidjson: remove stale LIB_INSTALL_DIR
In reply to Armin KusterFrom: Andrea Adami <[email protected]>
This was introduced with commit:
2e0fd78
rapidjson: fix cmake artifacts installation for non-default BASELIB case
and should have been removed with commit:
5aa127a
rapidjson: Remove unwanted patches
NOTE: such multilib fixes are not needed after this commit in oe-core:
24f630c cmake.bbclass: Define LIB_SUFFIX
--- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +1 -1
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" # RapidJSON is a header-only C++ library, so the main package will be empty.
Signature · 1 line
2.17.1
PATCH 11/20 net-snmp: A little clean up
In reply to Armin KusterFrom: Peter Kjellerstedt <[email protected]>
* Remove the explicit dependency on libnl as the libnl PACKAGECONFIG depends on it as necessary.
* Add a PACKAGECONFIG for systemd to replace modifying EXTRA_OECONF directly.
* Sort the PACKAGECONFIGs.
* Some whitespace clean up.
--- .../net-snmp/net-snmp_5.9.1.bb | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-)
meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +16 -19
@@ -5,7 +5,7 @@ LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9d100a395a38584f2ec18a8275261687" -DEPENDS = "openssl libnl pciutils" +DEPENDS = "openssl pciutils" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://init \
@@ -41,24 +41,23 @@ CCACHE = "" TARGET_CC_ARCH += "${LDFLAGS}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des smux" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} des smux" +PACKAGECONFIG[des] = "--enable-des, --disable-des" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," - -PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ - perl," -PACKAGECONFIG[des] = "--enable-des,--disable-des" +PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no, perl" PACKAGECONFIG[smux] = "" - -EXTRA_OECONF = "--enable-shared \ - --disable-manuals \ - --with-defaults \ - --with-install-prefix=${D} \ - --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ - --with-mib-modules='${MIB_MODULES}' \ +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd" + +EXTRA_OECONF = " \ + --enable-shared \ + --disable-manuals \ + --with-defaults \ + --with-install-prefix=${D} \ + --with-persistent-directory=${localstatedir}/lib/net-snmp \ + --with-endianness=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-mib-modules='${MIB_MODULES}' \ " MIB_MODULES = ""
@@ -117,7 +116,7 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system - sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ + sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
@@ -232,8 +231,6 @@ INITSCRIPT_PACKAGES = "${PN}-server-snmpd" INITSCRIPT_NAME_${PN}-server-snmpd = "snmpd" INITSCRIPT_PARAMS_${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" - SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd"
Signature · 1 line
2.17.1
PATCH 12/20 net-snmp: Support building for native
In reply to Armin KusterFrom: Peter Kjellerstedt <[email protected]>
Due to the sed commands in do_install_append() that removed ${STAGING_DIR_HOST} and it being empty when building for native, it was impossible to add support for building this as native using a bbappend.
--- .../net-snmp/net-snmp_5.9.1.bb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +13 -5
@@ -5,7 +5,8 @@ LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9d100a395a38584f2ec18a8275261687" -DEPENDS = "openssl pciutils" +DEPENDS = "openssl" +DEPENDS_append_class-target = " pciutils" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://init \
@@ -72,8 +73,10 @@ CACHED_CONFIGUREVARS = " \ ac_cv_file__etc_printcap=no \ NETSNMP_CONFIGURE_OPTIONS= \ " -export PERLPROG="${bindir}/env perl" +PERLPROG = "${bindir}/env perl" +PERLPROG_class-native = "${bindir_native}/env perl" PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" +export PERLPROG HAS_PERL = "${@bb.utils.contains('PACKAGECONFIG', 'perl', '1', '0', d)}"
@@ -126,11 +129,14 @@ do_install_append() { -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ - -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config - sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${libdir}/pkgconfig/netsnmp*.pc + # ${STAGING_DIR_HOST} is empty for native builds, and the sed command below + # will result in errors if run for native. + if [ "${STAGING_DIR_HOST}" ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/net-snmp-config ${D}${libdir}/pkgconfig/netsnmp*.pc + fi sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \
@@ -270,3 +276,5 @@ RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" + +BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
PATCH 13/20 dovecot: add CVE-2016-4983 to allowlist
In reply to Armin KusterFrom: "[email protected]" <[email protected]>
CVE-2016-4983 affects only postinstall script on specific distribution, so add it to allowlist.
--- meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +3 -0
@@ -71,3 +71,6 @@ FILES_${PN} += "${libdir}/dovecot/*plugin.so \ FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" + +# CVE-2016-4983 affects only postinstall script on specific distribution +CVE_CHECK_WHITELIST += "CVE-2016-4983"
Signature · 1 line
2.17.1
PATCH 14/20 minifi-cpp: set CLEANBROKEN to 1
In reply to Armin KusterFrom: Chen Qi <[email protected]>
Rebuilding minifi-cpp in old build dir sometimes result in do_compile failure. So set CLEANBROKEN to "1" to workaround this problem. If further investigation is done and the underlying problem is addressed, this setting could be removed.
--- meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +2 -0
@@ -138,3 +138,5 @@ pkg_postinst_${PN}() { fi fi } + +CLEANBROKEN = "1"
Signature · 1 line
2.17.1
PATCH 15/20 cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has usrmerge
In reply to Armin KusterFrom: Geoff Parker <[email protected]>
Fixes cif-utils recipe build when DISTRO_FEATURES includes 'usrmerge'
Add do_configure_prepend() to override ROOTSSBINDIR environment variable so that the utilities are installed in /usr/sbin rather than /sbin. Setting --exec-prefix or --prefix in EXTRA_OECONF does not work.
Update do_install_append() to NOT remove /usr/bin /usr/sbin if usrmerge is set in DISTRO_FEATURES
--- .../recipes-support/cifs/cifs-utils_6.13.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +14 -3
@@ -22,10 +22,21 @@ PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disab inherit autotools pkgconfig +do_configure_prepend() { + # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant + # must override ROOTSBINDIR (default '/sbin'), + # setting --exec-prefix or --prefix in EXTRA_OECONF does not work + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','fakse',d)}; then + export ROOTSBINDIR=${sbindir} + fi +} + do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + fi } FILES_${PN} += "${base_libdir}/security"
Signature · 1 line
2.17.1
PATCH 16/20 ntp: add CVE-2016-9312 to allowlist
In reply to Armin KusterFrom: Sekine Shigeki <[email protected]>
--- meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +3 -0
@@ -26,6 +26,9 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" +# CVE-2016-9312 is only for windows. +CVE_CHECK_WHITELIST += "CVE-2016-9312" + inherit autotools update-rc.d useradd systemd pkgconfig # The ac_cv_header_readline_history is to stop ntpdc depending on either
Signature · 1 line
2.17.1
PATCH 17/20 python3-django: upgrade 2.2.22 -> 2.2.23
In reply to Armin KusterFrom: Trevor Gamblin <[email protected]>
2.2.23 is a bugfix release:
- Fixed a regression in Django 2.2.21 where saving FileField would raise a SuspiciousFileOperation even when a custom upload_to returns a valid file path (#32718).
---
.../{python3-django_2.2.22.bb => python3-django_2.2.23.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-django_2.2.22.bb => python3-django_2.2.23.bb} (41%)meta-python/recipes-devtools/python/python3-django_2.2.23.bb renamed from meta-python/recipes-devtools/python/python3-django_2.2.22.bb +2 -2
@@ -1,8 +1,8 @@ require python-django.inc inherit setuptools3 -SRC_URI[md5sum] = "dca447b605dcabd924ac7ba17680cf73" -SRC_URI[sha256sum] = "db2214db1c99017cbd971e58824e6f424375154fe358afc30e976f5b99fc6060" +SRC_URI[md5sum] = "d72405637143e201b745714e300bb546" +SRC_URI[sha256sum] = "12cfc045a4ccb2348719aaaa77b17e66a26bff9fc238b4c765a3e825ef92e414" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \
Signature · 1 line
2.17.1
PATCH 18/20 python3-django: upgrade 3.2.2 -> 3.2.3
In reply to Armin KusterFrom: Trevor Gamblin <[email protected]>
3.2.3 is a bugfix release:
- Prepared for mysqlclient > 2.0.3 support (#32732).
- Fixed a regression in Django 3.2 that caused the incorrect filtering of querysets combined with the | operator (#32717).
- Fixed a regression in Django 3.2.1 where saving FileField would raise a SuspiciousFileOperation even when a custom upload_to returns a valid file path (#32718).
---
.../python/{python3-django_3.2.2.bb => python3-django_3.2.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-django_3.2.2.bb => python3-django_3.2.3.bb} (77%)meta-python/recipes-devtools/python/python3-django_3.2.3.bb renamed from meta-python/recipes-devtools/python/python3-django_3.2.2.bb +1 -1
@@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "0a1d195ad65c52bf275b8277b3d49680bd1137a5f55039a806f25f6b9752ce3d" +SRC_URI[sha256sum] = "13ac78dbfd189532cad8f383a27e58e18b3d33f80009ceb476d7fcbfc5dcebd8" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \
Signature · 1 line
2.17.1
PATCH 19/20 python3-django: Upgrade 3.2.3 -> 3.2.4
In reply to Armin KusterFrom: Leon Anavi <[email protected]>
Upgrade to release 3.2.4:
- CVE-2021-33203: Potential directory traversal via admindocs
- CVE-2021-33571: Possible indeterminate SSRF, RFI, and LFI attacks since validators accepted leading zeros in IPv4 addresses
- Fixed a bug in Django 3.2 where a final catch-all view in the admin didn't respect the server-provided value of SCRIPT_NAME when redirecting unauthenticated users to the login page.
- Fixed a bug in Django 3.2 where a system check would crash on an abstract model
- Prevented unnecessary initialization of unused caches following a regression in Django 3.2
- Fixed a crash in Django 3.2 that could occur when running mod_wsgi with the recommended settings while the Windows colorama library was installed
- Fixed a bug in Django 3.2 that would trigger the auto-reloader for template changes when directory paths were specified with strings
- Fixed a regression in Django 3.2 that caused a crash of auto-reloader with AttributeError, e.g. inside a Conda environment
- Fixed a regression in Django 3.2 that caused a loss of precision for operations with DecimalField on MySQL
---
.../python/{python3-django_3.2.3.bb => python3-django_3.2.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-django_3.2.3.bb => python3-django_3.2.4.bb} (77%)meta-python/recipes-devtools/python/python3-django_3.2.4.bb renamed from meta-python/recipes-devtools/python/python3-django_3.2.3.bb +1 -1
@@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "13ac78dbfd189532cad8f383a27e58e18b3d33f80009ceb476d7fcbfc5dcebd8" +SRC_URI[sha256sum] = "66c9d8db8cc6fe938a28b7887c1596e42d522e27618562517cc8929eb7e7f296" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \
Signature · 1 line
2.17.1
PATCH 20/20 python3-django: upgrade 2.2.23 -> 2.2.24
In reply to Armin KusterFrom: Trevor Gamblin <[email protected]>
Version 2.2.24 contains a fix for CVE-2021-33571 and is the latest LTS release.
---
.../{python3-django_2.2.23.bb => python3-django_2.2.24.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-django_2.2.23.bb => python3-django_2.2.24.bb} (41%)meta-python/recipes-devtools/python/python3-django_2.2.24.bb renamed from meta-python/recipes-devtools/python/python3-django_2.2.23.bb +2 -2
@@ -1,8 +1,8 @@ require python-django.inc inherit setuptools3 -SRC_URI[md5sum] = "d72405637143e201b745714e300bb546" -SRC_URI[sha256sum] = "12cfc045a4ccb2348719aaaa77b17e66a26bff9fc238b4c765a3e825ef92e414" +SRC_URI[md5sum] = "ebf3bbb7716a7b11029e860475b9a122" +SRC_URI[sha256sum] = "3339ff0e03dee13045aef6ae7b523edff75b6d726adf7a7a48f53d5a501f7db7" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \
Signature · 1 line
2.17.1