diff options
Diffstat (limited to 'poky/meta/recipes-extended')
44 files changed, 485 insertions, 271 deletions
diff --git a/poky/meta/recipes-extended/acpica/acpica_20210730.bb b/poky/meta/recipes-extended/acpica/acpica_20210930.bb index b66e605f8b..47f1b629ed 100644 --- a/poky/meta/recipes-extended/acpica/acpica_20210730.bb +++ b/poky/meta/recipes-extended/acpica/acpica_20210930.bb @@ -17,7 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[sha256sum] = "4a0c14d5148666612aa0555c5179eaa86230602394fd1bc3d16b506fcf49b5de" +SRC_URI[sha256sum] = "3cd82a281a16bc70c2708665668f138c4fc606c31161d46ce77230454ec04821" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" diff --git a/poky/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb b/poky/meta/recipes-extended/asciidoc/asciidoc_10.0.0.bb index dd9f8e32c4..f7fa66851d 100644 --- a/poky/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb +++ b/poky/meta/recipes-extended/asciidoc/asciidoc_10.0.0.bb @@ -8,8 +8,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x" -SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main" +SRCREV = "4667219e473a24e8e645eb9b9fb0a7ddba322f44" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" @@ -19,14 +19,9 @@ S = "${WORKDIR}/git" # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" -# Not using automake -inherit autotools-brokensep +inherit setuptools3 CLEANBROKEN = "1" -# target and nativesdk needs python3, but for native we can use the host. -RDEPENDS:${PN} += "python3" -RDEPENDS:remove:class-native = "python3" - BBCLASSEXTEND = "native nativesdk" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index f6f8637a43..2994973b8c 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -18,7 +18,7 @@ SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${ " UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" -UPSTREAM_CHECK_REGEX = "cups-(?P<pver>.+)-source.tar" +UPSTREAM_CHECK_REGEX = "cups-(?P<pver>(?!.+\d(b|rc)\d.+).+)-source.tar" # Issue only applies to MacOS CVE_CHECK_WHITELIST += "CVE-2008-1033" @@ -116,4 +116,4 @@ cups_sysroot_preprocess () { # -25317 concerns /var/log/cups having lp ownership. Our /var/log/cups is # root:root, so this doesn't apply. -CVE_CHECK_WHITELIST += "CVE-2021-25317"
\ No newline at end of file +CVE_CHECK_WHITELIST += "CVE-2021-25317" diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 3b639ebb67..e4abadb05d 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From e652ccd8965895087887c270fc0d380b61f96b11 Mon Sep 17 00:00:00 2001 +From cd444e576d446b7ccb51a26a02c0e75d6ee2abf2 Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6b620bf..ff62b2a 100644 +index 6c9453c..7c0f829 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.13, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.14, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.13.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.14.bb index 3c99debc99..28a49f4f8a 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.13.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.14.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "e66ab0d74d2a888fd64a0053290dbea66ddc9b75b3d21d117b7edd9576b9db60" +SRC_URI[sha256sum] = "9868604c913e5483000c00d5dcb2bb3169a05252de47f62174702ff19cf6de7a" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/poky/meta/recipes-extended/findutils/findutils.inc b/poky/meta/recipes-extended/findutils/findutils.inc index ea8a1b7afe..ddcc05750b 100644 --- a/poky/meta/recipes-extended/findutils/findutils.inc +++ b/poky/meta/recipes-extended/findutils/findutils.inc @@ -6,9 +6,11 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ + file://run-ptest \ + " -inherit autotools gettext texinfo update-alternatives +inherit autotools gettext texinfo update-alternatives ptest ALTERNATIVE:${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-extended/findutils/findutils/run-ptest b/poky/meta/recipes-extended/findutils/findutils/run-ptest new file mode 100644 index 0000000000..ec71583c51 --- /dev/null +++ b/poky/meta/recipes-extended/findutils/findutils/run-ptest @@ -0,0 +1,57 @@ +#!/bin/bash + +# create temporary symlink to workaround missing oldfind +ln -s /usr/bin/find /tmp/oldfind +# make oldfind visible +export PATH="/tmp:${PATH}" + +export built_programs="find xargs locate updatedb" + +# this gets substituted by sed during build +export VERSION="__run_ptest_version__" + +# define missing functions for tests/init.sh +fu_path_prepend_ () { + path_prepend_ $@ +} + +print_ver_ () { + : +} + +skip_if_root_ () { + [ $(id -u) = 0 ] && exit 77; +} + +require_root_ () { + [ $(id -u) = 0 ] || exit 77; +} + +expensive_ () { + : +} + +export -f fu_path_prepend_ +export -f print_ver_ +export -f skip_if_root_ +export -f require_root_ +export -f expensive_ + + +for f in tests/*/*.sh; do + bash $f ; + case $? in + 0 ) + echo -n "PASS";; + 77 ) + echo -n "SKIP";; + * ) + echo -n "FAIL";; + esac + echo ": $f" +done + +#remove symlink +rm -f /tmp/oldfind + +echo diff --git a/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb b/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb index d8ccf4b8e1..b0e56da159 100644 --- a/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb +++ b/poky/meta/recipes-extended/findutils/findutils_4.8.0.bb @@ -13,3 +13,14 @@ PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" + +RDEPENDS:${PN}-ptest += "bash sed grep" + +do_install_ptest:class-target() { + mkdir -p ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ + + # substitute value in run-ptest with actual version + sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest + +} diff --git a/poky/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch b/poky/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch index ca0d668ce9..be6dbe1e57 100644 --- a/poky/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch +++ b/poky/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch @@ -1,35 +1,30 @@ -From 207b94e37c84007b294e57878c913271aad544ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 11 Nov 2020 23:13:23 -0800 -Subject: [PATCH] Use cross AR during compile +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> -If AR is specifcied then it should be used instead of defaulting to 'ar' -from host +From 47dce6a7002a8d7b818c19d574d81327b769871b Mon Sep 17 00:00:00 2001 +From: "Arnold D. Robbins" <arnold@skeeve.com> +Date: Fri, 5 Jun 2020 13:14:54 +0300 +Subject: Allow for cross-compile version of ar. -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +(limited to 'configure.ac') diff --git a/configure.ac b/configure.ac -index 31364ab..4804f7b 100644 +index 31364ab8..8c256f21 100644 --- a/configure.ac +++ b/configure.ac -@@ -92,6 +92,13 @@ GAWK_CANONICAL_HOST - AC_USE_SYSTEM_EXTENSIONS +@@ -105,6 +105,9 @@ AC_EXEEXT + AC_PROG_INSTALL + AC_PROG_MAKE_SET - dnl checks for programs -+m4_ifndef([AC_PROG_AR],[dnl -+ AN_MAKEVAR([AR], [AC_PROG_AR]) -+ AN_PROGRAM([ar], [AC_PROG_AR]) -+ AC_DEFUN([AC_PROG_AR], -+ [AC_CHECK_TOOL(AR, ar, :)]) -+]) -+AC_PROG_AR - AC_PROG_EGREP - AC_PROG_YACC - AC_PROG_LN_S ++# support/ builds libsupport.a, allow for cross version of ar ++AM_PROG_AR ++ + # This is mainly for my use during testing and development. + # Yes, it's a bit of a hack. + AC_MSG_CHECKING([for special development options]) -- -2.29.2 - +cgit v1.2.1 diff --git a/poky/meta/recipes-extended/gawk/gawk/test-time.patch b/poky/meta/recipes-extended/gawk/gawk/test-time.patch new file mode 100644 index 0000000000..05a68c5faf --- /dev/null +++ b/poky/meta/recipes-extended/gawk/gawk/test-time.patch @@ -0,0 +1,22 @@ +The test time.awk does a sleep() and checks that the real sleep duration is +close to the expected duration. + +As currently our tests can run on a heavily loaded system, increase the range of +a passing duration. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/test/time.awk b/test/time.awk +index 517377e2..ca81d92d 100644 +--- a/test/time.awk ++++ b/test/time.awk +@@ -16,7 +16,7 @@ BEGIN { + printf "sleep(%s) = %s\n",delta,sleep(delta) + t1 = timecheck() + slept = t1-t0 +- if ((slept < 0.9*delta) || (slept > 1.3*delta)) ++ if ((slept < 0.5*delta) || (slept > 2*delta)) + printf "Warning: tried to sleep %.2f secs, but slept for %.2f secs\n", + delta,slept + } diff --git a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb index 3c801e8bcc..0961efa897 100644 --- a/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb +++ b/poky/meta/recipes-extended/gawk/gawk_5.1.0.bb @@ -18,6 +18,7 @@ PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ file://0001-Use-cross-AR-during-compile.patch \ + file://test-time.patch \ " SRC_URI[md5sum] = "f719bc9966df28e67fc6ebc405e7ea03" diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_9.54.0.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb index 59cc560cf8..3993603dc6 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript_9.54.0.bb +++ b/poky/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb @@ -11,7 +11,7 @@ HOMEPAGE = "http://www.ghostscript.com" SECTION = "console/utils" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=70dc2bac4d0ce4448da873cd86b123fc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f98ffa763e50cded76f49bce73aade16" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" DEPENDS:class-native = "libpng-native" @@ -45,7 +45,7 @@ SRC_URI:class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[sha256sum] = "0646bb97f6f4d10a763f4919c54fa28b4fbdd3dff8e7de3410431c81762cade0" +SRC_URI[sha256sum] = "31e2064be67e15b478a8da007d96d6cd4d2bee253e5be220703a225f7f79a70b" # Put something like # @@ -61,7 +61,7 @@ PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${ST --without-x, virtual/libx11 libxext libxt gtk+3\ " -EXTRA_OECONF = "--without-libpaper --with-system-libtiff --without-jbig2dec \ +EXTRA_OECONF = "--without-libpaper --with-system-libtiff --with-jbig2dec \ --with-fontpath=${datadir}/fonts \ --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ --with-cups-datadir=${datadir}/cups \ diff --git a/poky/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch b/poky/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch index 7c37bc8d2d..7c37bc8d2d 100644 --- a/poky/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch +++ b/poky/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch diff --git a/poky/meta/recipes-extended/gzip/gzip_1.10.bb b/poky/meta/recipes-extended/gzip/gzip_1.11.bb index 120e1d4580..eb3054cc48 100644 --- a/poky/meta/recipes-extended/gzip/gzip_1.10.bb +++ b/poky/meta/recipes-extended/gzip/gzip_1.11.bb @@ -36,5 +36,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[md5sum] = "cf9ee51aff167ff69844d5d7d71c8b20" -SRC_URI[sha256sum] = "c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68" +SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9" diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.5.1.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.5.2.bb index 7d98e573b8..385bcef6e9 100644 --- a/poky/meta/recipes-extended/libarchive/libarchive_3.5.1.bb +++ b/poky/meta/recipes-extended/libarchive/libarchive_3.5.2.bb @@ -34,7 +34,7 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[sha256sum] = "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a" +SRC_URI[sha256sum] = "5f245bd5176bc5f67428eb0aa497e09979264a153a074d35416521a5b8e86189" inherit autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.19.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.20.bb index bb925073ed..d4d6538965 100644 --- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.19.bb +++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.20.bb @@ -11,7 +11,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "c773294be6b0a2425f344a8999f173fb00cfd16f" +SRCREV = "f618e6aae1d44be633b2ab91d4fd4f4f974f4d40" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit cmake PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" -PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_RPMDB_BDB=ON,,db rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch b/poky/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch deleted file mode 100644 index ceedccbd11..0000000000 --- a/poky/meta/recipes-extended/lighttpd/lighttpd/0001-meson-add-with_zstd-to-meson_options.txt.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f24bd105388c305beeead5d3fa0a028b82354f18 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss <gstrauss@gluelogic.com> -Date: Wed, 3 Feb 2021 00:35:34 -0500 -Subject: [PATCH] [meson] add with_zstd to meson_options.txt - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - meson_options.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index 51bea44d..f6687159 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -148,6 +148,11 @@ option('with_zlib', - value: true, - description: 'with deflate-support for mod_deflate [default: on]', - ) -+option('with_zstd', -+ type: 'boolean', -+ value: false, -+ description: 'with zstd-support for mod_deflate [default: off]', -+) - - option('build_extra_warnings', - type: 'boolean', diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch b/poky/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch new file mode 100644 index 0000000000..2a9bb352b5 --- /dev/null +++ b/poky/meta/recipes-extended/lighttpd/lighttpd/0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch @@ -0,0 +1,38 @@ +From c1466f3620f608e4def4b8853c4e2bc6d9a19646 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Mon, 4 Oct 2021 09:51:22 -0400 +Subject: [PATCH] define __BEGIN_DECLS, __END_DECLS if needed + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/first.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/first.h b/src/first.h +index df747ba..9d0428a 100644 +--- a/src/first.h ++++ b/src/first.h +@@ -39,6 +39,22 @@ + #include <sys/types.h> + #include <stddef.h> + ++#ifndef __BEGIN_DECLS ++#ifdef __cplusplus ++#define __BEGIN_DECLS extern "C" { ++#else ++#define __BEGIN_DECLS ++#endif ++#endif ++ ++#ifndef __END_DECLS ++#ifdef __cplusplus ++#define __END_DECLS } ++#else ++#define __END_DECLS ++#endif ++#endif ++ + #if defined HAVE_STDINT_H + # include <stdint.h> + #elif defined HAVE_INTTYPES_H diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb index 8cb3a9a18c..dca8934ad2 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.60.bb @@ -18,10 +18,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://lighttpd.conf \ file://lighttpd \ file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - file://0001-meson-add-with_zstd-to-meson_options.txt.patch \ + file://0002-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch \ " -SRC_URI[sha256sum] = "fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5" +SRC_URI[sha256sum] = "4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0" DEPENDS = "virtual/crypt" diff --git a/poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch index b7d2323dc9..70155f9a1d 100644 --- a/poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ b/poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch @@ -1,25 +1,29 @@ -Remove host information from version.h +From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 +From: Li Wang <li.wang@windriver.com> +Date: Wed, 30 Aug 2017 15:05:16 +0800 +Subject: [PATCH] Remove host information from version.h make lsof not include host information Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Li Wang <li.wang@windriver.com> + --- - dialects/linux/Makefile | 50 +++++++++-------------------------------------- + dialects/linux/Makefile | 50 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 2bea108..792142b 100644 +index 61e8643..5458a0a 100644 --- a/dialects/linux/Makefile +++ b/dialects/linux/Makefile -@@ -76,48 +76,16 @@ version.h: FRC +@@ -95,48 +95,16 @@ version.h: FRC @echo Constructing version.h @rm -f version.h @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; - @echo '#define LSOF_CC "${CC}"' >> version.h - @echo '#define LSOF_CCV "${CCV}"' >> version.h -- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h +- @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h - @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h + @echo '#define LSOF_CC ""' >> version.h + @echo '#define LSOF_CCV ""' >> version.h @@ -71,6 +75,3 @@ index 2bea108..792142b 100644 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h FRC: --- -1.7.9.5 - diff --git a/poky/meta/recipes-extended/lsof/lsof_4.91.bb b/poky/meta/recipes-extended/lsof/lsof_4.94.0.bb index d7428ea2c4..9659fa8246 100644 --- a/poky/meta/recipes-extended/lsof/lsof_4.91.bb +++ b/poky/meta/recipes-extended/lsof/lsof_4.94.0.bb @@ -11,33 +11,13 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429 # https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be # the most commonly used alternative. -SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \ +SRC_URI = "git://github.com/lsof-org/lsof \ file://lsof-remove-host-information.patch \ " -SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f" -SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3" +SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" -UPSTREAM_CHECK_URI = "https://github.com/lsof-org/lsof/releases/" -UPSTREAM_CHECK_REGEX = "lsof_(?P<pver>.*)\.linux\.tar" - -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" - -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - if not bb.data.inherits_class('externalsrc', d) or not d.getVar('EXTERNALSRC'): - # temporarily change S for unpack of lsof_${PV} - s = d.getVar('S', False) - d.setVar('S', '${WORKDIR}/lsof_${PV}') - bb.build.exec_func('base_do_unpack', d) - # temporarily change SRC_URI for unpack of lsof_${PV}_src - src_uri = d.getVar('SRC_URI', False) - d.setVar('SRC_URI', '${LOCALSRC}') - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('SRC_URI', src_uri) -} +S = "${WORKDIR}/git" export LSOF_INCLUDE = "${STAGING_INCDIR}" @@ -62,5 +42,5 @@ do_compile () { do_install () { install -d ${D}${sbindir} ${D}${mandir}/man8 install -m 0755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 + install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8 } diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch index e51950f153..6d945700be 100644 --- a/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch +++ b/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch @@ -1,4 +1,4 @@ -From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001 +From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> Date: Wed, 29 Jul 2020 08:47:09 -0400 Subject: [PATCH] Remove OOM tests from runtest/mm @@ -7,16 +7,17 @@ Disable OOM tests, as they might cause oeqa ssh connection lost Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> - +[ pvorel: rebased for 20210927 ] +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> --- runtest/mm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/runtest/mm b/runtest/mm -index 481d39691..cf207d10e 100644 +index 6537666a9..e5a091a5a 100644 --- a/runtest/mm +++ b/runtest/mm -@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 10000 +@@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000 cpuset01 cpuset01 @@ -29,3 +30,6 @@ index 481d39691..cf207d10e 100644 swapping01 swapping01 -i 5 thp01 thp01 -I 120 +-- +2.33.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch deleted file mode 100644 index 08b88a38f3..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch +++ /dev/null @@ -1,59 +0,0 @@ -From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001 -From: Marius Hillenbrand <mhillen@linux.ibm.com> -Date: Mon, 19 Jul 2021 13:58:35 +0800 -Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for - path - -commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream. - -Resize the buffer used for paths into /proc/ to grant enough space -for long PIDs. While at it, replace sprintf with snprintf to avoid -buffer overflows if we ever ran out of space again. - -Fixes: #847 -Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com> -Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com> -Upstream-Status: Backport -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c -index a67ddbe2c66f..52613810c7ce 100644 ---- a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c -+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c -@@ -59,10 +59,10 @@ static void run(void) - if (pid == -1) - tst_brk(TBROK | TERRNO, "ltp_clone failed"); - -- char child_namespace[20]; -+ char child_namespace[30]; - int my_fd, child_fd, parent_fd; - -- sprintf(child_namespace, "/proc/%i/ns/pid", pid); -+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid", pid); - my_fd = SAFE_OPEN("/proc/self/ns/pid", O_RDONLY); - child_fd = SAFE_OPEN(child_namespace, O_RDONLY); - parent_fd = ioctl(child_fd, NS_GET_PARENT); -diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c -index b6ac80208d02..c30f7de91e09 100644 ---- a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c -+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c -@@ -51,14 +51,14 @@ static int child(void *arg LTP_ATTRIBUTE_UNUSED) - - static void run(void) - { -- char child_namespace[20]; -+ char child_namespace[30]; - - pid_t pid = ltp_clone(CLONE_NEWUSER | SIGCHLD, &child, 0, - STACK_SIZE, child_stack); - if (pid == -1) - tst_brk(TBROK | TERRNO, "ltp_clone failed"); - -- sprintf(child_namespace, "/proc/%i/ns/user", pid); -+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/user", pid); - int my_fd, child_fd, parent_fd; - - my_fd = SAFE_OPEN("/proc/self/ns/user", O_RDONLY); --- -2.32.0 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch b/poky/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch new file mode 100644 index 0000000000..1860b95ce9 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch @@ -0,0 +1,36 @@ +From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 +From: Ralph Siemsen <ralph.siemsen@linaro.org> +Date: Mon, 27 Sep 2021 22:18:50 -0400 +Subject: [PATCH] lib: fix MemAvailable parsing + +The amount of available memory was not being returned correctly, which +resulted in tests being executed when they should have been skipped. + +Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") +Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> +Signed-off-by: Li Wang <liwang@redhat.com> +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> +Upstream-Status: Backport [e42149e28 ("lib: fix MemAvailable parsing")] +--- + lib/tst_memutils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c +index ae1cad29b..a46de78f5 100644 +--- a/lib/tst_memutils.c ++++ b/lib/tst_memutils.c +@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) + + long long tst_available_mem(void) + { +- long long mem_available; ++ unsigned long long mem_available = 0; + +- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", ++ if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", + &mem_available)) { + mem_available = SAFE_READ_MEMINFO("MemFree:") + + SAFE_READ_MEMINFO("Cached:"); +-- +2.33.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/poky/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch new file mode 100644 index 0000000000..6fcafaff1c --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch @@ -0,0 +1,37 @@ +From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <petr.vorel@gmail.com> +Date: Wed, 29 Sep 2021 19:38:42 +0200 +Subject: [PATCH] lapi/rtnetlink.h: Fix include guards + +Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") + +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> +Upstream-Status: Backport [a2a212cf8 ("lapi/rtnetlink.h: Fix include guards")] +--- + include/lapi/rtnetlink.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h +index 8a1b5385b..04e9ad51a 100644 +--- a/include/lapi/rtnetlink.h ++++ b/include/lapi/rtnetlink.h +@@ -1,8 +1,8 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + /* Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> */ + +-#ifndef LAPI_IF_ADDR_H__ +-# define LAPI_IF_ADDR_H__ ++#ifndef LAPI_RTNETLINK_H__ ++# define LAPI_RTNETLINK_H__ + + #include <linux/rtnetlink.h> + +@@ -10,4 +10,4 @@ + # define IFA_FLAGS 8 + #endif + +-#endif /* LAPI_IF_ADDR_H__ */ ++#endif /* LAPI_RTNETLINK_H__ */ +-- +2.33.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/poky/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch new file mode 100644 index 0000000000..19ac3ba046 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch @@ -0,0 +1,58 @@ +From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 +From: Petr Vorel <petr.vorel@gmail.com> +Date: Wed, 29 Sep 2021 19:37:19 +0200 +Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h + +There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which +requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, +as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just +like <linux/rtnetlink.h> includes <linux/if_addr.h>. + +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> +Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel@gmail.com/T/#u] +--- + include/lapi/if_addr.h | 16 ++++++++++++++++ + include/lapi/rtnetlink.h | 5 +---- + 2 files changed, 17 insertions(+), 4 deletions(-) + create mode 100644 include/lapi/if_addr.h + +diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h +new file mode 100644 +index 000000000..4e50a0a4e +--- /dev/null ++++ b/include/lapi/if_addr.h +@@ -0,0 +1,16 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++/* ++ * Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> ++ */ ++ ++#ifndef LAPI_IF_ADDR_H__ ++#define LAPI_IF_ADDR_H__ ++ ++#include <linux/if_addr.h> ++ ++#ifndef IFA_FLAGS ++# define IFA_FLAGS 8 ++#endif ++ ++ ++#endif /* LAPI_IF_ADDR_H__ */ +diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h +index 04e9ad51a..089bf1a0d 100644 +--- a/include/lapi/rtnetlink.h ++++ b/include/lapi/rtnetlink.h +@@ -5,9 +5,6 @@ + # define LAPI_RTNETLINK_H__ + + #include <linux/rtnetlink.h> +- +-#ifndef IFA_FLAGS +-# define IFA_FLAGS 8 +-#endif ++#include "lapi/if_addr.h" + + #endif /* LAPI_RTNETLINK_H__ */ +-- +2.33.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/poky/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch new file mode 100644 index 0000000000..f510fda8c9 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch @@ -0,0 +1,60 @@ +From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <petr.vorel@gmail.com> +Date: Wed, 29 Sep 2021 19:56:29 +0200 +Subject: [PATCH] lapi/if_addr.h: Define IFA_F_NOPREFIXROUTE + +and use it in icmp_rate_limit01.c. + +This fixes error on toolchains with very old kernel headers, e.g. +Buildroot sourcery-arm: + +icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) + IFA_F_NOPREFIXROUTE); + +Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest +system we still support is Cent0S 7 with 3.10 kernel. + +NOTE: Cent0S 7 is obviously heavily patched thus it contains +IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. + +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> +Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel@gmail.com/T/#u] +--- + include/lapi/if_addr.h | 3 +++ + testcases/cve/icmp_rate_limit01.c | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h +index 4e50a0a4e..0f7e44784 100644 +--- a/include/lapi/if_addr.h ++++ b/include/lapi/if_addr.h +@@ -12,5 +12,8 @@ + # define IFA_FLAGS 8 + #endif + ++#ifndef IFA_F_NOPREFIXROUTE ++# define IFA_F_NOPREFIXROUTE 0x200 ++#endif + + #endif /* LAPI_IF_ADDR_H__ */ +diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c +index b3a237b30..3ada32675 100644 +--- a/testcases/cve/icmp_rate_limit01.c ++++ b/testcases/cve/icmp_rate_limit01.c +@@ -27,11 +27,12 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-#include <linux/if_addr.h> + #include <linux/errqueue.h> + + #include <sched.h> + #include <limits.h> ++ ++#include "lapi/if_addr.h" + #include "tst_test.h" + #include "tst_netdevice.h" + +-- +2.33.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp_20210524.bb b/poky/meta/recipes-extended/ltp/ltp_20210927.bb index 20e2deffa5..359a00132e 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20210524.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20210927.bb @@ -5,13 +5,8 @@ SECTION = "console/utils" LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" LIC_FILES_CHKSUM = "\ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ - file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ - file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://testcases/network/can/filter-tests/COPYING;md5=5b155ea7d7f86eae8e8832955d8b70bc \ " DEPENDS = "attr libaio libcap acl openssl zip-native" @@ -27,11 +22,14 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd" +SRCREV = "12beeda351b5d758a729aaf695b836ccc9eb5304" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ - file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \ + file://0002-lib-fix-MemAvailable-parsing.patch \ + file://0003-lapi-rtnetlink.h-Fix-include-guards.patch \ + file://0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch \ + file://0005-lapi-if_addr.h-Define-IFA_FLAGS.patch \ " S = "${WORKDIR}/git" @@ -119,9 +117,8 @@ remove_broken_musl_sources() { echo "WARNING: remove unsupported tests (until they're fixed)" # sync with upstream - # https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh#L33 + # https://github.com/linux-test-project/ltp/blob/master/ci/alpine.sh#L33 rm -rfv \ - testcases/kernel/sched/process_stress/process.c \ testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.12.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.13.bb index ed30103ccd..2447d9fb14 100644 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.12.bb +++ b/poky/meta/recipes-extended/man-pages/man-pages_5.13.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=92cd5ee2e0b35d782817e7e277b6ce4b" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "2684d42ab53184d7607105834e277577daa7e854cdce0d4aacf9f7ad8437c7ce" +SRC_URI[sha256sum] = "ed615e9a31978833f59e7316667b9aeffbbdb0a92d1391f9c66fadc6e77d0da8" inherit manpages diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.15.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.18.bb index bb56a2e347..1a6cf72392 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.15.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.18.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "2265dc639ebf2edf3069fffe0a3bd76749f8b58f4001d5cdeae19873949099ce" +SRC_URI[sha256sum] = "14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb b/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb index 84d327ca88..86301b95eb 100644 --- a/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb +++ b/poky/meta/recipes-extended/newt/libnewt_0.52.21.bb @@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac S = "${WORKDIR}/newt-${PV}" -inherit autotools-brokensep python3native python3-dir +inherit autotools-brokensep python3native python3-dir python3targetconfig EXTRA_OECONF = "--without-tcl --with-python" diff --git a/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch b/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch deleted file mode 100644 index 5c6bc92705..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 6 Jan 2021 12:08:20 +0800 -Subject: [PATCH] Makefile.am: support usrmage - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index ddd5fc0..a1f1bec 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = /lib/systemd/system -+servicedir = $(systemd_system_unitdir) - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.17.1 - diff --git a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch b/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch deleted file mode 100644 index b41d1e5962..0000000000 --- a/poky/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 27 Dec 2020 00:30:45 +0100 -Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd - unit file - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index 21e1b33..ddd5fc0 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = $(prefix)/lib/systemd/system -+servicedir = /lib/systemd/system - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.24.0 - diff --git a/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.31.bb b/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb index 1848ef67e1..4f5a78df14 100644 --- a/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.31.bb +++ b/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8 SRC_URI = "https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-${PV}.tar.gz" -SRC_URI[md5sum] = "1e12b263a5042804bb1c59ddce899876" -SRC_URI[sha256sum] = "6fe4c1ba744c3a8212bf2c9b2703d93530acc153435cf2f93633540b439fbbeb" +SRC_URI[sha256sum] = "1fdf004520c79e3a244cf9688616293516c11793d746c761f367496eb3d06076" S = "${WORKDIR}/Convert-ASN1-${PV}" diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-do-not-write-the-timestamp-into-compressed-.patch b/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-do-not-write-the-timestamp-into-compressed-.patch new file mode 100644 index 0000000000..21a410f605 --- /dev/null +++ b/poky/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-do-not-write-the-timestamp-into-compressed-.patch @@ -0,0 +1,26 @@ +From 2386cd8f907b379ae5cc1ce2888abef7d30e709a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Sat, 23 Oct 2021 20:20:59 +0200 +Subject: [PATCH] Makefile: do not write the timestamp into compressed manpage. + +This helps reproducibility. + +Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/156] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 886018f9..f4290f9c 100644 +--- a/Makefile ++++ b/Makefile +@@ -468,7 +468,7 @@ git-commit-id.h: + $(OBJS): stress-ng.h Makefile + + stress-ng.1.gz: stress-ng.1 +- $(V)gzip -c $< > $@ ++ $(V)gzip -n -c $< > $@ + + .PHONY: dist + dist: diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.13.00.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.13.00.bb index 198f7e87c7..5889569e50 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.13.00.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.13.00.bb @@ -1,14 +1,16 @@ SUMMARY = "System load testing utility" DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." -HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" +HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ + file://0001-Makefile-do-not-write-the-timestamp-into-compressed-.patch \ " -SRC_URI[sha256sum] = "1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd" +SRCREV = "61b454b4a3a9d052e63c78a9574ccf8a650575dc" +S = "${WORKDIR}/git" DEPENDS = "coreutils-native" diff --git a/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch b/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch new file mode 100644 index 0000000000..e7875c96f7 --- /dev/null +++ b/poky/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch @@ -0,0 +1,25 @@ +From f993c5c88faacc43971899aae2168ffb3e34dc80 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 24 Sep 2021 13:36:24 +0200 +Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of + tree builds + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + lib/util/mksigname.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c +index de8b1ad..0a69e7e 100644 +--- a/lib/util/mksigname.c ++++ b/lib/util/mksigname.c +@@ -36,7 +36,7 @@ main(int argc, char *argv[]) + { + unsigned int i; + +-#include "mksigname.h" ++#include "lib/util/mksigname.h" + + printf("const char *const sudo_sys_signame[] = {\n"); + for (i = 0; i < nitems(sudo_sys_signame); i++) { diff --git a/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index f7ccfdd623..f4fc376bb8 100644 --- a/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/poky/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -13,11 +13,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> Upstream-Status: Inappropriate [OE configuration specific] --- - examples/sudo.conf.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + examples/sudo.conf.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in -index 19e33ff..af78235 100644 +index 6535d3a..50afc8f 100644 --- a/examples/sudo.conf.in +++ b/examples/sudo.conf.in @@ -4,7 +4,7 @@ @@ -29,7 +29,16 @@ index 19e33ff..af78235 100644 # fully qualified. # The plugin_name corresponds to a global symbol in the plugin # that contains the plugin interface structure. -@@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so +@@ -51,7 +51,7 @@ + # The compiled-in value is usually sufficient and should only be changed + # if you rename or move the sudo_intercept.so file. + # +-#Path intercept @plugindir@/sudo_intercept.so ++#Path intercept $plugindir/sudo_intercept.so + + # + # Sudo noexec: +@@ -65,7 +65,7 @@ # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # @@ -38,7 +47,7 @@ index 19e33ff..af78235 100644 # # Sudo plugin directory: -@@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so +@@ -74,7 +74,7 @@ # The default directory to use when searching for plugins that are # specified without a fully qualified path name. # diff --git a/poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc index 6a18609adc..82040de8aa 100644 --- a/poky/meta/recipes-extended/sudo/sudo.inc +++ b/poky/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fdff64d4fd19126330aa81b94d167173 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=b969d389e79703121cbffc9f3ea18a8b \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ @@ -30,15 +30,13 @@ EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF:append:libc-musl = " --disable-hardening " -# mksigname/mksiglist are used on build host to generate source files do_compile:prepend () { - # Remove build host references from sudo_usage.h - sed -i \ - -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,--build=${BUILD_SYS},,g' \ - -e 's,--host=${HOST_SYS},,g' \ - ${B}/src/sudo_usage.h - oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist + # Remove build host references from sudo_usage.h + sed -i \ + -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,--build=${BUILD_SYS},,g' \ + -e 's,--host=${HOST_SYS},,g' \ + ${B}/src/sudo_usage.h } # Explicitly create ${localstatedir}/lib before do_install to ensure diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.7p2.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.8p2.bb index 9b5b2f3c69..b2afd1f98c 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.7p2.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.8p2.bb @@ -3,11 +3,12 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ + file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \ " PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "28b5ee725dbf89a7852f42f309ca877d2810a9531b4eecfe59f3a84b6b4afca8" +SRC_URI[sha256sum] = "9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" diff --git a/poky/meta/recipes-extended/tar/tar_1.34.bb b/poky/meta/recipes-extended/tar/tar_1.34.bb index 3488a6c955..5a415c775a 100644 --- a/poky/meta/recipes-extended/tar/tar_1.34.bb +++ b/poky/meta/recipes-extended/tar/tar_1.34.bb @@ -63,6 +63,6 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native nativesdk" -# These are both specific to the NPM package node-tar -CVE_CHECK_WHITELIST += "CVE-2021-32803 CVE-2021-32804" -CVE_CHECK_WHITELIST += "CVE-2021-37701 CVE-2021-37712 CVE-2021-37713" +# Avoid false positives from CVEs in node-tar package +# For example CVE-2021-{32803,32804,37701,37712,37713} +CVE_PRODUCT = "gnu:tar" diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index c7d4965cb8..43d14d7f12 100644 --- a/poky/meta/recipes-extended/timezone/timezone.inc +++ b/poky/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2021a" +PV = "2021e" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -14,5 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0" -SRC_URI[tzdata.sha256sum] = "39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08" +SRC_URI[tzcode.sha256sum] = "584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775" +SRC_URI[tzdata.sha256sum] = "07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1" + diff --git a/poky/meta/recipes-extended/wget/wget.inc b/poky/meta/recipes-extended/wget/wget.inc index cd7290be57..2491199f18 100644 --- a/poky/meta/recipes-extended/wget/wget.inc +++ b/poky/meta/recipes-extended/wget/wget.inc @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" inherit autotools gettext texinfo update-alternatives pkgconfig +DEPENDS += "autoconf-archive" + EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ --disable-rpath" diff --git a/poky/meta/recipes-extended/wget/wget_1.21.1.bb b/poky/meta/recipes-extended/wget/wget_1.21.2.bb index 21385bbfb2..90f3eb104d 100644 --- a/poky/meta/recipes-extended/wget/wget_1.21.1.bb +++ b/poky/meta/recipes-extended/wget/wget_1.21.2.bb @@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://0002-improve-reproducibility.patch \ " -SRC_URI[sha256sum] = "59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e" +SRC_URI[sha256sum] = "e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497" require wget.inc |