From 49e9566eb60669f7b1535f0653aa52a1c9ea8af0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 15 Sep 2021 16:19:36 -0700 Subject: meta-openembedded: subtree update:9fdc7960ba..e4a3c66505 Alexander Kanavin (4): msgpack-c: update 3.2.1 -> 4.0.0, add msgpack-cpp can-utils: rrecommend iproute2 to make it possible to configure can interfaces fmt: update 7.1.3 -> 8.0.1 spdlog: update 1.8.2 -> 1.9.2 Changqing Li (3): ndpi: upgrade 3.4 -> 4.0 ntopng: upgrade 4.2 -> 5.0 postgresql: upgrade 13.3 -> 13.4 Jan-Simon Moeller (1): Remove patch that produces a segfault in the ptest of lua Joe Slater (1): redis: advance to version 6.2.5 Khem Raj (10): gjs: Remove valgrind dependency on rv32/rv64 toybox-inittab: Use 0BSD for LIC_FILES_CHKSUM python3-kivy: Remove hardcoded include paths python3-kivy: Check for x11 and opengl before enabling the recipe packagegroup-meta-python: Add python3-kivy packagegroup-meta-python: Add python3-portalocker gst-shark: Define SRCREV_FORMAT android-tools: Define SRCREV_FORMAT packagegroup-meta-oe: Add pahole pahole: Add missing rdep for python Kristian Klausen (1): cryptsetup: Add runtime dependency on lvm2-udevrules for udev Martin Jansa (1): python3-regex: upgrade to 2021.8.28 Matteo Croce (2): recipes-devtools: add pahole libbpf: bump to 0.5.0 Mingli Yu (1): polkit: add the CVE tag Patrick Williams (2): gjs: fix typo in RDEPENDS variable name ndisc6: fix typo in DESCRIPTION variable name Peter Morrow (1): libbpf: remove kernel configuration dependency Samuel Dolt (4): python3-alembic: add native and nativesdk to BBCLASSEXTEND python3-editor: add native and nativesdk to BBCLASSEXTEND python3-sqlalchemy: add native and nativesdk to BBCLASSEXTEND python3-portalocker: add recipe Trevor Gamblin (2): python3-pytest-subtests: add recipe python3-pillow: upgrade 8.3.1 -> 8.3.2 Wang Mingyu (3): python3-cryptography-vectors: upgrade 3.4.7 -> 3.4.8 python3-google-api-python-client: upgrade 2.18.0 -> 2.19.1 dnf-plugin-tui: upgrade 1.2 -> 1.3 William A. Kennington III (1): ndisc6: Upgrade 1.0.4 -> 1.0.5 William Huang (1): recipes-devtools: python: add support for Kivy Yi Zhao (4): krb5: fix CVE-2021-36222 krb5: fix CVE-2021-37750 net-snmp: drop unused patch net-snmp: make sure snmpd always exit after displaying usage wangmy (10): cjson: upgrade 1.7.14 -> 1.7.15 libwebsockets: upgrade 4.2.1 -> 4.2.2 monit: upgrade 5.28.1 -> 5.29.0 nlohmann-json: upgrade 3.9.1 -> 3.10.2 cppzmq: upgrade 4.7.1 -> 4.8.0 dfu-util: upgrade 0.10 -> 0.11 libqmi: upgrade 1.30.0 -> 1.30.2 lockfile-progs: upgrade 0.1.18 -> 0.1.19 poppler-data: upgrade 0.4.10 -> 0.4.11 dnsmasq: upgrade 2.85 -> 2.86 zangrc (11): python3-ipython: upgrade 7.26.0 -> 7.27.0 python3-kiwisolver: upgrade 1.3.1 -> 1.3.2 python3-ruamel-yaml: upgrade 0.17.13 -> 0.17.16 python3-traitlets: upgrade 5.0.5 -> 5.1.0 gsl: upgrade 2.6 -> 2.7 crash: upgrade 7.2.9 -> 7.3.0 dash: upgrade 0.5.11.3 -> 0.5.11.5 python3-bitarray: upgrade 2.3.2 -> 2.3.3 python3-lrparsing: upgrade 1.0.16 -> 1.0.17 python3-transitions: upgrade 0.8.8 -> 0.8.9 libxmlb: upgrade 0.3.1 -> 0.3.2 zhengruoqin (15): wireshark: upgrade 3.4.7 -> 3.4.8 uhubctl: upgrade 2.3.0 -> 2.4.0 unclutter-xfixes: upgrade 1.5 -> 1.6 avro-c: upgrade 1.9.2 -> 1.10.2 ctags: upgrade 5.9.20210815 -> 5.9.20210905 xf86-video-nouveau: upgrade 1.0.16 -> 1.0.17 fuse3: upgrade 3.10.4 -> 3.10.5 mosquitto: upgrade 2.0.11 -> 2.0.12 poppler: upgrade 21.08.0 -> 21.09.0 libbytesize: upgrade 2.4 -> 2.6 libeigen: upgrade 3.3.9 -> 3.4.0 libjcat: upgrade 0.1.7 -> 0.1.8 unbound: upgrade 1.12.0 -> 1.13.2 xterm: upgrade 367 -> 368 zchunk: upgrade 1.1.9 -> 1.1.16 Change-Id: I5a866e7773b8c906bc2bd8a4ddf99f006534bf53 Signed-off-by: William A. Kennington III --- .../lockfile-progs/lockfile-progs_0.1.18.bb | 24 -------- .../lockfile-progs/lockfile-progs_0.1.19.bb | 23 ++++++++ .../polkit/polkit/CVE-2021-3560.patch | 2 + .../meta-oe/recipes-extended/redis/redis_6.2.4.bb | 66 ---------------------- .../meta-oe/recipes-extended/redis/redis_6.2.5.bb | 66 ++++++++++++++++++++++ .../recipes-extended/socketcan/can-utils_git.bb | 5 ++ 6 files changed, 96 insertions(+), 90 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb (limited to 'meta-openembedded/meta-oe/recipes-extended') diff --git a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb deleted file mode 100644 index a82f10b91..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Command-line programs to safely lock and unlock files and mailboxes" -DESCRIPTION = "\ -lockfile-progs provide a method to lock and unlock mailboxes and files \ -safely (via liblockfile)." -HOMEPAGE = "http://packages.qa.debian.org/l/lockfile-progs.html" -SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS = "liblockfile" - -SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" -SRC_URI[md5sum] = "4eb83bdf88016db836b7cc09591fb0f3" -SRC_URI[sha256sum] = "a42995a4b97e6188efc90fcc1a761163c4b2cff5c81b936f85c84301ddb05ce6" - -do_compile() { - oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables' -} - -do_install() { - install -m 755 -d ${D}${bindir} - install bin/* ${D}${bindir} - install -m 755 -d ${D}${mandir}/man1 - install man/* ${D}${mandir}/man1 -} diff --git a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb new file mode 100644 index 000000000..df88afa31 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb @@ -0,0 +1,23 @@ +SUMMARY = "Command-line programs to safely lock and unlock files and mailboxes" +DESCRIPTION = "\ +lockfile-progs provide a method to lock and unlock mailboxes and files \ +safely (via liblockfile)." +HOMEPAGE = "http://packages.qa.debian.org/l/lockfile-progs.html" +SECTION = "Applications/System" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +DEPENDS = "liblockfile" + +SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" +SRC_URI[sha256sum] = "2c5704b01c8f474f82921780e4592a927b2bf6a6d7616354a6c5d7cd5664857e" + +do_compile() { + oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables' +} + +do_install() { + install -m 755 -d ${D}${bindir} + install bin/* ${D}${bindir} + install -m 755 -d ${D}${mandir}/man1 + install man/* ${D}${mandir}/man1 +} diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch index daf0b1edb..76308ffdb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch @@ -5,6 +5,8 @@ Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit initial values returned if error caught +CVE: CVE-2021-3560 + Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81] Signed-off-by: Mingli Yu diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb deleted file mode 100644 index 0db71240e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - file://0006-Define-correct-gregs-for-RISCV32.patch \ - " -SRC_URI[sha256sum] = "ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b6ae16e" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32:toolchain-clang = "-latomic" -FINAL_LIBS:mips = "-latomic" -FINAL_LIBS:arm = "-latomic" -FINAL_LIBS:powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM:${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb new file mode 100644 index 000000000..58d759b59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + file://0006-Define-correct-gregs-for-RISCV32.patch \ + " +SRC_URI[sha256sum] = "4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM:${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile:prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 8d63a10e5..1a2d33090 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -45,3 +45,8 @@ ALTERNATIVE:${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" + +# busybox ip fails to configure can interfaces, so we need iproute2 to do so. +# See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. +RRECOMMENDS:${PN} += "iproute2" + -- cgit v1.2.3