diff options
Diffstat (limited to 'meta/recipes-extended')
136 files changed, 883 insertions, 1347 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20240322.bb b/meta/recipes-extended/acpica/acpica_20240827.bb index 90e3599d32..7e8c68db90 100644 --- a/meta/recipes-extended/acpica/acpica_20240322.bb +++ b/meta/recipes-extended/acpica/acpica_20240827.bb @@ -17,7 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master" -SRCREV = "170fc3076a86777077637f10b05c32ac21ac13aa" +SRCREV = "e80cbd7b52de20aa8c75bfba9845e9cb61f2e681" S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb b/meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb index e112eb513d..1065acdb8e 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=aaee33adce0fc7cc40fee23f82f7f101 \ " SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main" -SRCREV = "545b79b8d7dae70d12bf0657359bdd36de0c5c26" +SRCREV = "21e33efe96ba9a51d99d1150691dae750afd6ed1" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index c0c876a644..112d1c4adc 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -55,22 +55,22 @@ SYSTEMD_SERVICE:${PN} = "atd.service" do_patch[postfuncs] += "copy_posix_files" copy_posix_files() { - cp -f ${WORKDIR}/posixtm.[ch] ${S} + cp -f ${UNPACKDIR}/posixtm.[ch] ${S} } do_install () { oe_runmake -e "IROOT=${D}" install install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd + install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd # install systemd unit files install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir} sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd + install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd fi rm -f ${D}${datadir}/at/batch-job } diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index e541161c75..66058feff3 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -108,7 +108,7 @@ do_install_ptest () { cp ${B}/config.h ${D}${PTEST_PATH} cp ${B}/version.h ${D}${PTEST_PATH} cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} - install -D ${WORKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests + install -D ${UNPACKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ -e 's|${DEBUG_PREFIX_MAP}||g' \ -e 's|${BUILD_LDFLAGS}||g' \ diff --git a/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch b/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch index 77d770b364..4e73edb9b3 100644 --- a/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch +++ b/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch @@ -1,4 +1,4 @@ -From 721d5be99eb37d31e48bd66d61808a66a4c5ab84 Mon Sep 17 00:00:00 2001 +From e4b9493ae4923595ec3ca67f85322129fb3056cf Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Mon, 30 Oct 2023 12:16:07 -0400 Subject: [PATCH] changes to SIGINT handler while waiting for a child; skip @@ -20,10 +20,10 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> 6 files changed, 43 insertions(+), 32 deletions(-) diff --git a/general.c b/general.c -index 85c5a8b6..65e2ee06 100644 +index bda39f4..94a5339 100644 --- a/general.c +++ b/general.c -@@ -262,8 +262,9 @@ legal_number (string, result) +@@ -264,8 +264,9 @@ legal_number (string, result) if (errno || ep == string) return 0; /* errno is set on overflow or underflow */ @@ -36,7 +36,7 @@ index 85c5a8b6..65e2ee06 100644 /* If *string is not '\0' but *ep is '\0' on return, the entire string diff --git a/jobs.c b/jobs.c -index 6b986ed7..262d78de 100644 +index d3e4ab0..903cf9c 100644 --- a/jobs.c +++ b/jobs.c @@ -2718,6 +2718,10 @@ wait_for_background_pids (ps) @@ -96,7 +96,7 @@ index 6b986ed7..262d78de 100644 waiting_for_child = 0; if (old_sigint_handler == SIG_IGN) set_signal_handler (SIGINT, old_sigint_handler); -@@ -4136,7 +4144,7 @@ set_job_status_and_cleanup (job) +@@ -4141,7 +4149,7 @@ set_job_status_and_cleanup (job) SIGINT (if we reset the sighandler to the default). In this case, we have to fix things up. What a crock. */ if (temp_handler == trap_handler && signal_is_trapped (SIGINT) == 0) @@ -106,7 +106,7 @@ index 6b986ed7..262d78de 100644 if (temp_handler == SIG_DFL) termsig_handler (SIGINT); /* XXX */ diff --git a/tests/redir.right b/tests/redir.right -index 8db10414..9e1403c8 100644 +index 8db1041..9e1403c 100644 --- a/tests/redir.right +++ b/tests/redir.right @@ -154,10 +154,10 @@ foo @@ -123,7 +123,7 @@ index 8db10414..9e1403c8 100644 +./redir11.sub: line 77: 42: No such file or directory 42 diff --git a/tests/redir11.sub b/tests/redir11.sub -index d417cdb6..ca9854cd 100644 +index d417cdb..ca9854c 100644 --- a/tests/redir11.sub +++ b/tests/redir11.sub @@ -34,6 +34,8 @@ a=4 b=7 ss=4 declare -i ss @@ -136,7 +136,7 @@ index d417cdb6..ca9854cd 100644 a=4 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 3'; } a=1 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 4'; } diff --git a/tests/type.right b/tests/type.right -index bbc228e8..e0a66745 100644 +index bbc228e..c0c1c8b 100644 --- a/tests/type.right +++ b/tests/type.right @@ -24,15 +24,15 @@ func () @@ -164,7 +164,7 @@ index bbc228e8..e0a66745 100644 builtin is a shell builtin /bin/sh diff --git a/tests/type.tests b/tests/type.tests -index fd39c18a..ddc15407 100644 +index fd39c18..ddc1540 100644 --- a/tests/type.tests +++ b/tests/type.tests @@ -25,8 +25,6 @@ type -r ${THIS_SH} @@ -221,6 +221,3 @@ index fd39c18a..ddc15407 100644 type m hash -r --- -2.35.5 - diff --git a/meta/recipes-extended/bash/bash/0001-fix-c99.patch b/meta/recipes-extended/bash/bash/0001-fix-c99.patch new file mode 100644 index 0000000000..abd83d09af --- /dev/null +++ b/meta/recipes-extended/bash/bash/0001-fix-c99.patch @@ -0,0 +1,41 @@ +From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Wed, 19 Jun 2024 12:57:39 +0000 +Subject: [PATCH] Fix C99 problems + +Backport some fixes from upstream to fix configure checks that fail with GCC 14.1. + +Upstream-Status: Backport [devel branch] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + aclocal.m4 | 3 +++ + configure.ac | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index cc97bd4..7423b99 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken, + #include <sys/types.h> + #include <fcntl.h> + #include <stdlib.h> ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif /* HAVE_UNISTD_H */ + int + main() + { +diff --git a/configure.ac b/configure.ac +index a3b5bd7..2a38c6b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -842,7 +842,7 @@ AC_CHECK_DECLS([strtold], [ + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stdlib.h>]], +- [[long double r; char *foo, bar; r = strtold(foo, &bar);]] ++ [[long double r; char *foo, *bar; r = strtold(foo, &bar);]] + )], + [bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes]) + ] diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index c1b9b8261f..4cce1ba993 100644 --- a/meta/recipes-extended/bash/bash/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch @@ -1,4 +1,4 @@ -From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001 +From c3f58f8b4f7a359b9d9dd97a45bcaab50a89d224 Mon Sep 17 00:00:00 2001 From: Anders Roxell <anders.roxell@enea.com> Date: Wed, 19 Dec 2012 17:18:31 +0100 Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking @@ -9,16 +9,15 @@ Signed-off-by: Anders Roxell <anders.roxell@enea.com> Rebase to 5.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- Makefile.in | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index bc97049..937ce39 100644 +index 0b4df73..7e2a34e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -943,20 +943,34 @@ maybe-clean: +@@ -958,20 +958,34 @@ maybe-clean: fi recho$(EXEEXT): $(SUPPORT_SRC)recho.c diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch index 60f1852316..c5082ee355 100644 --- a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch +++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch @@ -1,4 +1,4 @@ -From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001 +From 16951b74971c7fd38fd036dac1410a9e53cbe736 Mon Sep 17 00:00:00 2001 From: Chet Ramey <chet.ramey@case.edu> Date: Fri, 7 Apr 2023 00:28:46 -0700 Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit @@ -17,7 +17,7 @@ Signed-off-by: Zev Weiss <zev@bewilderbeest.net> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtins/evalstring.c b/builtins/evalstring.c -index df3dd68e2a7e..6612081cd646 100644 +index 53a7c0b..c5075cc 100644 --- a/builtins/evalstring.c +++ b/builtins/evalstring.c @@ -753,7 +753,7 @@ open_redir_file (r, fnp) @@ -29,6 +29,3 @@ index df3dd68e2a7e..6612081cd646 100644 free (fn); if (fnp) *fnp = 0; --- -2.40.0 - diff --git a/meta/recipes-extended/bash/bash/fix-run-builtins.patch b/meta/recipes-extended/bash/bash/fix-run-builtins.patch index 2fa388302e..05d0859821 100644 --- a/meta/recipes-extended/bash/bash/fix-run-builtins.patch +++ b/meta/recipes-extended/bash/bash/fix-run-builtins.patch @@ -1,4 +1,4 @@ -From 0c4cab9594c96c2dc435a8d9724605824bcbf917 Mon Sep 17 00:00:00 2001 +From 15601c71b073a604ccda25c7f14f0bb12e9a3b28 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Tue, 19 Apr 2016 02:57:45 -0400 Subject: [PATCH] fix run-builtins failed @@ -16,10 +16,10 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/builtins.tests b/tests/builtins.tests -index 9d77520..63f3af8 100644 +index 8eee43e..71c9eee 100644 --- a/tests/builtins.tests +++ b/tests/builtins.tests -@@ -109,7 +109,7 @@ esac +@@ -124,7 +124,7 @@ esac # test options to exec (exec -a specialname ${THIS_SH} -c 'echo $0' ) @@ -28,6 +28,3 @@ index 9d77520..63f3af8 100644 # test `clean' environment. if /bin/sh is bash, and the script version of # printenv is run, there will be variables in the environment that bash # sets on startup. Also test code that prefixes argv[0] with a dash. --- -2.8.1 - diff --git a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch index a9391d6cac..eb29e7d836 100644 --- a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch +++ b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch @@ -1,3 +1,8 @@ +From d11685286144c2e5630545e435d11387b2908fd0 Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Wed, 14 Nov 2012 07:55:09 -0700 +Subject: [PATCH] bash: fix mkbuiltins build failure + On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers use the STRING() macro from unistd.h. A header in the bash sources overrides @@ -13,14 +18,19 @@ stringize support, or to not define STRING() at all when FORTIFY_SOURCES is defined, letting the unistd.h one be used, instead. Upstream-Status: Pending +--- + builtins/mkbuiltins.c | 1 + + 1 file changed, 1 insertion(+) ---- bash-4.2.orig/builtins/mkbuiltins.c -+++ bash-4.2/builtins/mkbuiltins.c +diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c +index f505ebd..b5b2eed 100644 +--- a/builtins/mkbuiltins.c ++++ b/builtins/mkbuiltins.c @@ -28,6 +28,7 @@ # define HAVE_STDLIB_H - + # define HAVE_RENAME +# define HAVE_STRINGIZE #endif /* CROSS_COMPILING */ - + #if defined (HAVE_UNISTD_H) diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch index 0ffcc24587..3225907b66 100644 --- a/meta/recipes-extended/bash/bash/test-output.patch +++ b/meta/recipes-extended/bash/bash/test-output.patch @@ -1,7 +1,7 @@ -From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001 +From f5cbd5a4954b89857c9e397cacceda552484f5d5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Aug 2017 10:01:56 +0800 -Subject: [PATCH 1/2] Add FAIL/PASS output to test output. +Subject: [PATCH] Add FAIL/PASS output to test output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/run-all b/tests/run-all -index 2882fe0..e21d026 100644 +index 1f74923..ba36a1f 100644 --- a/tests/run-all +++ b/tests/run-all -@@ -33,7 +33,16 @@ do +@@ -57,7 +57,16 @@ do case $x in $0|run-minimal|run-gprof) ;; *.orig|*~) ;; @@ -37,6 +37,3 @@ index 2882fe0..e21d026 100644 esac done --- -1.8.3.1 - diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch index bd6870b386..e966b037a2 100644 --- a/meta/recipes-extended/bash/bash/use_aclocal.patch +++ b/meta/recipes-extended/bash/bash/use_aclocal.patch @@ -1,4 +1,4 @@ -From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001 +From b3a64702fa1978463c01bd5d9fe711e4628aba1e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 28 Dec 2020 21:04:27 +0100 Subject: [PATCH] bash: update 5.0 -> 5.1 @@ -9,7 +9,6 @@ as needed instead making it work like other autotools based projects. Upstream-Status: Inappropriate [OE configuration specific] RP 2021/1/20 - --- configure.ac | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.32.bb index 532adf4c1a..b159c0232f 100644 --- a/meta/recipes-extended/bash/bash_5.2.21.bb +++ b/meta/recipes-extended/bash/bash_5.2.32.bb @@ -14,9 +14,10 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://use_aclocal.patch \ file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ file://fix-filesubst-errexit.patch \ + file://0001-fix-c99.patch \ " -SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" +SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5" DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 819da6cda6..74387c50ab 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" do_compile:prepend() { - cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h + cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h } do_install_ptest() { diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb index 4e3a06f240..324276df70 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb @@ -14,11 +14,11 @@ LICENSE:libbz2 = "bzip2-1.0.6" LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ - file://${WORKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://${WORKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \ - file://${WORKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \ - file://${WORKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \ - file://${WORKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${UNPACKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://${UNPACKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \ + file://${UNPACKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \ + file://${UNPACKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \ + file://${UNPACKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ " SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ @@ -36,7 +36,7 @@ UPSTREAM_CHECK_URI = "https://www.sourceware.org/pub/bzip2/" PACKAGES =+ "libbz2" -CFLAGS:append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" +CFLAGS += "-fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" inherit autotools update-alternatives ptest relative_symlinks @@ -52,13 +52,13 @@ do_configure:prepend () { do_install_ptest () { install -d ${D}${PTEST_PATH}/bzip2-tests - cp -r ${WORKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress - cp -r ${WORKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip - cp -r ${WORKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go - cp -r ${WORKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2 - cp -r ${WORKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate - cp ${WORKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/ - cp ${WORKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/ + cp -r ${UNPACKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress + cp -r ${UNPACKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip + cp -r ${UNPACKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go + cp -r ${UNPACKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2 + cp -r ${UNPACKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate + cp ${UNPACKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/ + cp ${UNPACKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/ sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile } @@ -66,5 +66,7 @@ FILES:libbz2 = "${libdir}/lib*${SOLIBS}" RDEPENDS:${PN}-ptest += "make bash" +CVE_PRODUCT = "bzip:bzip2" + PROVIDES:append:class-native = " bzip2-replacement-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb index 52070f59a2..bfaf5c31c3 100644 --- a/meta/recipes-extended/cpio/cpio_2.15.bb +++ b/meta/recipes-extended/cpio/cpio_2.15.bb @@ -16,6 +16,7 @@ SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee41834 inherit autotools gettext texinfo ptest CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" +CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" @@ -50,7 +51,7 @@ do_install_ptest() { install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ - install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh + install --mode=755 ${UNPACKDIR}/test.sh ${D}${PTEST_PATH}/test.sh sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh } diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch deleted file mode 100644 index 20572b55c4..0000000000 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ /dev/null @@ -1,339 +0,0 @@ -From aae03b7e626d5f62ab929d51d11352a5a2ff6b2d Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Tue, 9 Jun 2015 11:11:48 +0900 -Subject: [PATCH 1/2] packlib.c: support dictionary byte order dependent - -The previous dict files are NOT byte-order independent, in fact they are -probably ARCHITECTURE SPECIFIC. -Create the dict files in big endian, and convert to host endian while -load them. This could fix the endian issue on multiple platform. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/41] - -We can't use the endian.h, htobe* and be*toh functions because they are -not available on older versions of glibc, such as that found in RHEL -5.9. - -Change to checking endian and directly calling bswap_* as defined in -byteswap.h. - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - lib/packlib.c | 214 +++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 210 insertions(+), 4 deletions(-) - -diff --git a/lib/packlib.c b/lib/packlib.c -index 9396e1d..d0bb181 100644 ---- a/lib/packlib.c -+++ b/lib/packlib.c -@@ -16,6 +16,12 @@ - #ifdef HAVE_STDINT_H - #include <stdint.h> - #endif -+ -+#ifndef _BSD_SOURCE -+#define _BSD_SOURCE /* See feature_test_macros(7) */ -+#endif -+#include <endian.h> -+#include <byteswap.h> - #include "packer.h" - - #define DEBUG 0 -@@ -43,6 +49,185 @@ typedef struct - char data_get[NUMWORDS][MAXWORDLEN]; - } PWDICT64; - -+enum{ -+ en_is32, -+ en_is64 -+}; -+ -+static int -+IheaderHostToBigEndian(char *pHeader, int nBitType) -+{ -+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader; -+ -+ pHeader64->pih_magic = bswap_64(pHeader64->pih_magic); -+ pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords); -+ pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen); -+ pHeader64->pih_pad = bswap_16(pHeader64->pih_pad); -+ -+#if DEBUG -+ printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n", -+ pHeader64->pih_magic, pHeader64->pih_numwords, -+ pHeader64->pih_blocklen, pHeader64->pih_pad); -+#endif -+ } -+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ struct pi_header *pHeader32 = (struct pi_header*)pHeader; -+ -+ pHeader32->pih_magic = bswap_32(pHeader32->pih_magic); -+ pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords); -+ pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen); -+ pHeader32->pih_pad = bswap_16(pHeader32->pih_pad); -+ -+#if DEBUG -+ printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n", -+ pHeader32->pih_magic, pHeader32->pih_numwords, -+ pHeader32->pih_blocklen, pHeader32->pih_pad); -+#endif -+ } -+ else if (__BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType); -+ return (-1); -+ } -+ -+ return 0; -+} -+ -+static int -+IheaderBigEndianToHost(char *pHeader, int nBitType) -+{ -+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader; -+ -+ pHeader64->pih_magic = bswap_64(pHeader64->pih_magic); -+ pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords); -+ pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen); -+ pHeader64->pih_pad = bswap_16(pHeader64->pih_pad); -+ -+#if DEBUG -+ printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n", -+ pHeader64->pih_magic, pHeader64->pih_numwords, -+ pHeader64->pih_blocklen, pHeader64->pih_pad); -+#endif -+ } -+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ struct pi_header *pHeader32 = (struct pi_header*)pHeader; -+ -+ pHeader32->pih_magic = bswap_32(pHeader32->pih_magic); -+ pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords); -+ pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen); -+ pHeader32->pih_pad = bswap_16(pHeader32->pih_pad); -+ -+#if DEBUG -+ printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n", -+ pHeader32->pih_magic, pHeader32->pih_numwords, -+ pHeader32->pih_blocklen, pHeader32->pih_pad); -+#endif -+ } -+ else if (__BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType); -+ return (-1); -+ } -+ -+ return 0; -+} -+ -+static int -+HwmsHostToBigEndian(char *pHwms, int nLen,int nBitType) -+{ -+ int i = 0; -+ -+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ uint64_t *pHwms64 = (uint64_t*)pHwms; -+ -+ for (i = 0; i < nLen / sizeof(uint64_t); i++) -+ { -+ *pHwms64 = bswap_64(*pHwms64); -+ *pHwms64++; -+ } -+ -+ } -+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ uint32_t *pHwms32 = (uint32_t*)pHwms; -+ -+ for (i = 0; i < nLen / sizeof(uint32_t); i++) -+ { -+ *pHwms32 = bswap_32(*pHwms32); -+ *pHwms32++; -+ } -+ -+ } -+ else if (__BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType); -+ return (-1); -+ } -+ -+#if DEBUG -+ for (i = 0; i < nLen; i+=8) -+ { -+ printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n", -+ nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF, -+ pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF, -+ pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF); -+ } -+#endif -+ -+ return 0; -+} -+ -+static int -+HwmsBigEndianToHost(char *pHwms, int nLen, int nBitType) -+{ -+ int i = 0; -+ -+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ uint64_t *pHwms64 = (uint64_t*)pHwms; -+ -+ for (i = 0; i < nLen / sizeof(uint64_t); i++) -+ { -+ *pHwms64++ = bswap_64(*pHwms64); -+ } -+ -+ } -+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ uint32_t *pHwms32 = (uint32_t*)pHwms; -+ -+ for (i = 0; i < nLen / sizeof(uint32_t); i++) -+ { -+ *pHwms32 = bswap_32(*pHwms32); -+ *pHwms32++; -+ } -+ -+ } -+ else if (__BYTE_ORDER == __LITTLE_ENDIAN) -+ { -+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType); -+ return (-1); -+ } -+ -+#if DEBUG -+ for (i = 0; i < nLen; i+=8) -+ { -+ printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n", -+ nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF, -+ pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF, -+ pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF); -+ } -+#endif -+ -+ return 0; -+} - - static int - _PWIsBroken64(FILE *ifp) -@@ -55,6 +240,7 @@ _PWIsBroken64(FILE *ifp) - return 0; - } - -+ IheaderBigEndianToHost((char *) &pdesc64.header, en_is64); - return (pdesc64.header.pih_magic == PIH_MAGIC); - } - -@@ -147,7 +333,11 @@ PWOpen(prefix, mode) - pdesc.header.pih_blocklen = NUMWORDS; - pdesc.header.pih_numwords = 0; - -- fwrite((char *) &pdesc.header, sizeof(pdesc.header), 1, ifp); -+ struct pi_header tmpheader32; -+ -+ memcpy(&tmpheader32, &pdesc.header, sizeof(pdesc.header)); -+ IheaderHostToBigEndian((char *) &tmpheader32, en_is32); -+ fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, ifp); - } else - { - pdesc.flags &= ~PFOR_WRITE; -@@ -171,6 +361,7 @@ PWOpen(prefix, mode) - return NULL; - } - -+ IheaderBigEndianToHost((char *) &pdesc.header, en_is32); - if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0)) - { - /* uh-oh. either a broken "64-bit" file or a garbage file. */ -@@ -193,6 +384,7 @@ PWOpen(prefix, mode) - } - return NULL; - } -+ IheaderBigEndianToHost((char *) &pdesc64.header, en_is64); - if (pdesc64.header.pih_magic != PIH_MAGIC) - { - /* nope, not "64-bit" after all */ -@@ -288,6 +480,7 @@ PWOpen(prefix, mode) - { - pdesc.flags &= ~PFOR_USEHWMS; - } -+ HwmsBigEndianToHost((char*)pdesc64.hwms, sizeof(pdesc64.hwms), en_is64); - for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++) - { - pdesc.hwms[i] = pdesc64.hwms[i]; -@@ -297,6 +490,7 @@ PWOpen(prefix, mode) - { - pdesc.flags &= ~PFOR_USEHWMS; - } -+ HwmsBigEndianToHost((char*)pdesc.hwms, sizeof(pdesc.hwms), en_is32); - #if DEBUG - for (i=1; i<=0xff; i++) - { -@@ -330,7 +524,11 @@ PWClose(pwp) - return (-1); - } - -- if (!fwrite((char *) &pwp->header, sizeof(pwp->header), 1, pwp->ifp)) -+ struct pi_header tmpheader32; -+ -+ memcpy(&tmpheader32, &pwp->header, sizeof(pwp->header)); -+ IheaderHostToBigEndian((char *) &tmpheader32, en_is32); -+ if (!fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, pwp->ifp)) - { - fprintf(stderr, "index magic fwrite failed\n"); - return (-1); -@@ -349,7 +547,12 @@ PWClose(pwp) - printf("hwm[%02x] = %d\n", i, pwp->hwms[i]); - #endif - } -- fwrite(pwp->hwms, 1, sizeof(pwp->hwms), pwp->wfp); -+ -+ PWDICT tmp_pwp; -+ -+ memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); -+ HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); -+ fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); - } - } - -@@ -403,7 +606,8 @@ PutPW(pwp, string) - - datum = (uint32_t) ftell(pwp->dfp); - -- fwrite((char *) &datum, sizeof(datum), 1, pwp->ifp); -+ uint32_t tmpdatum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum; -+ fwrite((char *) &tmpdatum, sizeof(tmpdatum), 1, pwp->ifp); - - fputs(pwp->data_put[0], pwp->dfp); - putc(0, (FILE*) pwp->dfp); -@@ -462,6 +666,7 @@ GetPW(pwp, number) - perror("(index fread failed)"); - return NULL; - } -+ datum64 = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_64(datum64) : datum64; - datum = datum64; - } else { - if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0)) -@@ -475,6 +680,7 @@ GetPW(pwp, number) - perror("(index fread failed)"); - return NULL; - } -+ datum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum; - } - - int r = 1; --- -2.20.1 - diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb b/meta/recipes-extended/cracklib/cracklib_2.10.2.bb index 34ef2b65a1..2c913da152 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.10.2.bb @@ -10,10 +10,9 @@ DEPENDS = "cracklib-native zlib" EXTRA_OECONF = "--without-python --libdir=${base_libdir}" SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \ - file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ " -SRCREV = "4cf5125250c6325ef0a2dc085eabff875227edc3" +SRCREV = "e5211fc1d2b435884a2bb77001e107489285296d" S = "${WORKDIR}/git/src" inherit autotools gettext diff --git a/meta/recipes-extended/cronie/cronie_1.7.2.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb index abdaff644d..496ca39fd7 100644 --- a/meta/recipes-extended/cronie/cronie_1.7.2.bb +++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb @@ -36,6 +36,7 @@ PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[inotify] = "--with-inotify,--without-inotify," INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." @@ -49,18 +50,18 @@ do_install:append () { install -d ${D}${sysconfdir}/sysconfig/ install -d ${D}${sysconfdir}/init.d/ install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond - install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond + install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond # install systemd unit files install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_system_unitdir}/crond.service # below are necessary for a complete cron environment install -d ${D}${localstatedir}/spool/cron - install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ + install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/ mkdir -p ${D}${sysconfdir}/cron.d mkdir -p ${D}${sysconfdir}/cron.hourly mkdir -p ${D}${sysconfdir}/cron.daily diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b70ba3ae58..9688efafae 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -84,11 +84,11 @@ do_install () { rm -rf ${D}${sysconfdir}/init.d/ rm -rf ${D}${sysconfdir}/rc* install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/cups-volatiles.conf \ + install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \ ${D}${sysconfdir}/tmpfiles.d/cups.conf else install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.99_cups \ + install -m 0644 ${UNPACKDIR}/volatiles.99_cups \ ${D}${sysconfdir}/default/volatiles/99_cups fi } diff --git a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch index 80bbad0a44..e6bd400779 100644 --- a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch +++ b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch @@ -1,7 +1,7 @@ -From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001 +From ddfe6ed6a89226985e8c9f0751c026aabc0927a0 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Thu, 13 Dec 2012 19:03:52 -0800 -Subject: [PATCH 1/4] use echo only in init +Subject: [PATCH] use echo only in init Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in -index 89ac36d..6618a0f 100644 +index 74cce18..c57f0db 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in -@@ -50,7 +50,7 @@ case "`uname`" in +@@ -51,7 +51,7 @@ case "`uname`" in ECHO_ERROR=: ;; @@ -22,6 +22,3 @@ index 89ac36d..6618a0f 100644 IS_ON=/bin/true if test -f /etc/init.d/functions; then . /etc/init.d/functions --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index 2bc26edbfc..75270cb0cb 100644 --- a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -1,21 +1,20 @@ -From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001 +From ff6c7168c3f26094b3a18298208a28831d1c1fd5 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH 2/4] don't try to run generated binaries +Subject: [PATCH] don't try to run generated binaries Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - --- - ppdc/Makefile | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) + ppdc/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 32e2e0b..f1478d4 100644 +index e36ed11..3fe97e1 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -186,8 +186,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ +@@ -187,8 +187,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -26,6 +25,3 @@ index 32e2e0b..f1478d4 100644 # --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch index bc9260307c..d49fb8f2c2 100644 --- a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch +++ b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch @@ -1,7 +1,7 @@ -From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 +From 6e286b582571ffca3f7874076d70eec6fd5713f6 Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Wed, 3 Oct 2018 00:27:11 +0800 -Subject: [PATCH 4/4] cups: fix multilib install file conflicts +Subject: [PATCH] cups: fix multilib install file conflicts @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to @@ -10,16 +10,15 @@ avoid the conflict. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> - --- conf/cups-files.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in -index 4a78ba6..03c6582 100644 +index 93584a1..65b7052 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in -@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log +@@ -67,7 +67,7 @@ PageLog @CUPS_LOGDIR@/page_log #RequestRoot @CUPS_REQUESTS@ # Location of helper programs... @@ -28,6 +27,3 @@ index 4a78ba6..03c6582 100644 # SSL/TLS keychain for the scheduler... #ServerKeychain @CUPS_SERVERKEYCHAIN@ --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups_2.4.7.bb b/meta/recipes-extended/cups/cups_2.4.10.bb index f4b0282e4c..e16ad47cf5 100644 --- a/meta/recipes-extended/cups/cups_2.4.7.bb +++ b/meta/recipes-extended/cups/cups_2.4.10.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" +SRC_URI[sha256sum] = "d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7" diff --git a/meta/recipes-extended/ed/ed_1.20.1.bb b/meta/recipes-extended/ed/ed_1.20.2.bb index 9ae53002c3..2b78b080ba 100644 --- a/meta/recipes-extended/ed/ed_1.20.1.bb +++ b/meta/recipes-extended/ed/ed_1.20.2.bb @@ -19,7 +19,7 @@ bindir = "${base_bindir}" SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" -SRC_URI[sha256sum] = "b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca" +SRC_URI[sha256sum] = "65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523" EXTRA_OEMAKE = "-e MAKEFLAGS=" diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 69df8632f2..0fe482545a 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 758fde7186730ee331a0ee6149276cd412766ee0 Mon Sep 17 00:00:00 2001 +From 74902bef8123b596437587bb48ad9b720cb06f64 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. @@ -9,16 +9,15 @@ serial-tests is required to generate those targets. Signed-off-by: Tudor Florea <tudor.florea@enea.com> Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index c871558..8ea1eaa 100644 +index f6fe260..65a0566 100644 --- a/configure.ac +++ b/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.7, netdev@vger.kernel.org) +@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.10, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ethtool.c]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.7.bb b/meta/recipes-extended/ethtool/ethtool_6.10.bb index 33df0e0e80..8a7b2607f3 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.7.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.10.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "ace0e95a03b38208af4ebacb415244568ace44c5d5a279ea434844f900179c75" +SRC_URI[sha256sum] = "2b266c45c0fe00e5f5b462ee4e795879fa4247003bf73c5a07a2279d801be058" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 03cf2a8d72..ddcc05750b 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ - file://autoconf-2.73.patch \ file://run-ptest \ " diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted file mode 100644 index 63728b5f91..0000000000 --- a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch +++ /dev/null @@ -1,24 +0,0 @@ -The gnulib largefile macro needs updating to work with autoconf 2.73. Rather -than the full code: - -https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb - -Just tweak the exiting code to work with 2.73. The next findutils upgrade should -update to new gnulib - -Upstream-Status: Inappropriate -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: findutils-4.9.0/gl/m4/largefile.m4 -=================================================================== ---- findutils-4.9.0.orig/gl/m4/largefile.m4 -+++ findutils-4.9.0/gl/m4/largefile.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. --m4_version_prereq([2.70], [], [ -+m4_version_prereq([2.73], [], [ - - # _AC_SYS_LARGEFILE_TEST_INCLUDES - # ------------------------------- diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest index ec71583c51..3dec117067 100644 --- a/meta/recipes-extended/findutils/findutils/run-ptest +++ b/meta/recipes-extended/findutils/findutils/run-ptest @@ -10,34 +10,6 @@ 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 diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb index 074817df27..57f77de16f 100644 --- a/meta/recipes-extended/findutils/findutils_4.9.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = "bison-native" -SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" +SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" # http://savannah.gnu.org/bugs/?27299 @@ -15,13 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" # need od from coreutils for -t option -RDEPENDS:${PN}-ptest += "bash sed grep coreutils" +RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits" do_install_ptest:class-target() { mkdir -p ${D}${PTEST_PATH}/tests/ + cp ${S}/init.cfg ${D}${PTEST_PATH} 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/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch new file mode 100644 index 0000000000..6fffd1f373 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch @@ -0,0 +1,38 @@ +From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 21 May 2024 15:10:11 +0000 +Subject: [PATCH] m4/readline: add missing includes + +The cross-specific code fragment only includes stdio.h, where the native +fragment also includes fcntl.h and unistd.h. This is important because +GCC 14.1 has made the implicit definitions an error: + +conftest.c: In function 'main': +conftest.c:144:9: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration] +conftest.c:146:14: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] + +Add the missing includes so that the check doesn't always fail due to +these errors. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + m4/readline.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/m4/readline.m4 b/m4/readline.m4 +index 38f96326..efd52d4e 100644 +--- a/m4/readline.m4 ++++ b/m4/readline.m4 +@@ -66,6 +66,8 @@ dnl action if false: + dnl action if cross compiling: + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include <stdio.h> ++#include <fcntl.h> ++#include <unistd.h> + #include <readline/readline.h> + #include <readline/history.h>]], dnl includes + dnl function body +-- +2.34.1 + diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.0.bb index d7a0fc616d..ac9d8500d6 100644 --- a/meta/recipes-extended/gawk/gawk_5.3.0.bb +++ b/meta/recipes-extended/gawk/gawk_5.3.0.bb @@ -16,6 +16,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://0001-m4-readline-add-missing-includes.patch \ file://run-ptest \ " @@ -51,6 +52,8 @@ do_install_ptest() { cp ${S}/test/$i* ${D}${PTEST_PATH}/test done sed -i \ + -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ + -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|g' \ -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb index ff7d38676e..0504f5244f 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb @@ -27,7 +27,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://avoid-host-contamination.patch \ " -SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" +SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 74f3520eae..8d4dd49ab6 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -5,8 +5,8 @@ HOMEPAGE = "https://golang.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" -SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" +SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" +SRCREV = "39e772fc26705bb170db248e5372a81ed5ffd67f" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "golang.org/x/example" diff --git a/meta/recipes-extended/hdparm/hdparm_9.65.bb b/meta/recipes-extended/hdparm/hdparm_9.65.bb index d5e6ab6065..1b6af566a2 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.65.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.65.bb @@ -8,7 +8,6 @@ LICENSE = "BSD-2-Clause & GPL-2.0-only & hdparm" LICENSE:${PN} = "BSD-2-Clause & hdparm" LICENSE:${PN}-dbg = "BSD-2-Clause & hdparm" LICENSE:wiper = "GPL-2.0-only" -NO_GENERIC_LICENSE[hdparm] = "LICENSE.TXT" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 8824bf2af7..0fe2261511 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch @@ -1,22 +1,24 @@ -From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 +From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 21 Feb 2017 11:16:31 +0200 +Date: Thu, 25 Apr 2024 10:51:02 +0200 Subject: [PATCH] configure: Add option to enable/disable libnfnetlink -This changes the configure behaviour from autodetecting -for libnfnetlink to having an option to disable it explicitly - -Upstream-Status: Pending +Default behavior (autodetecting) does not change, but specifying +either option would explicitly disable or enable libnfnetlink support, +and if the library is not found in the latter case, ./configure will error +out. +Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Maxin B. John <maxin.john@intel.com> - +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Phil Sutter <phil@nwl.cc> --- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + configure.ac | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index d99fa3b..d607772 100644 +index d99fa3b9..2293702b 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], @@ -25,21 +27,27 @@ index d99fa3b..d607772 100644 [enable_nftables="$enableval"], [enable_nftables="yes"]) +AC_ARG_ENABLE([libnfnetlink], + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), -+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) ++ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"]) AC_ARG_ENABLE([connlabel], AS_HELP_STRING([--disable-connlabel], [Do not build libnetfilter_conntrack]), -@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) +@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], - [nfnetlink=1], [nfnetlink=0]) --AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) -+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ -+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) -+ ]) -+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) ++# If specified explicitly on the command line, error out when library was not found ++# Otherwise, disable and continue ++AS_IF([test "x$enable_libnfnetlink" = "xyes"], ++ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], ++ [nfnetlink=1])], ++ [test "x$enable_libnfnetlink" = "xauto"], ++ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], ++ [nfnetlink=1], [nfnetlink=0])]) + AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then - PKG_CHECK_MODULES([libpcap], [libpcap], [], [ +-- +2.39.2 + diff --git a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch deleted file mode 100644 index a190c7e8ae..0000000000 --- a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 17 May 2022 10:56:59 +0200 -Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include - -This resolves the build error under musl: - -| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? -| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -| | ^~~~~~~~~ -| | uint16_t - -Upstream-Status: Submitted [via email to phil@nwl.cc] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> - ---- - iptables/xshared.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/iptables/xshared.h b/iptables/xshared.h -index a200e0d..f543dbf 100644 ---- a/iptables/xshared.h -+++ b/iptables/xshared.h -@@ -6,6 +6,7 @@ - #include <stdint.h> - #include <netinet/in.h> - #include <net/if.h> -+#include <sys/types.h> - #include <linux/netfilter_arp/arp_tables.h> - #include <linux/netfilter_ipv4/ip_tables.h> - #include <linux/netfilter_ipv6/ip6_tables.h> diff --git a/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch b/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch new file mode 100644 index 0000000000..4cbc8bdaf4 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch @@ -0,0 +1,37 @@ +From 2026b08bce7fe87b5964f7912e1eef30f04922c1 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Fri, 26 Jan 2024 18:43:10 +0100 +Subject: [PATCH] nft: ruleparse: Add missing braces around ternary + +The expression evaluated the sum before the ternay, consequently not +adding target->size if tgsize was zero. + +Identified by ASAN for a simple rule using standard target: +| # ebtables -A INPUT -s de:ad:be:ef:0:00 -j RETURN +| # ebtables -D INPUT -s de:ad:be:ef:0:00 -j RETURN +| ================================================================= +| ==18925==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x603000000120 at pc 0x7f627a4c75c5 bp 0x7ffe882b5180 sp 0x7ffe882b4928 +| READ of size 8 at 0x603000000120 thread T0 +| [...] + +Upstream-Status: Backport [2026b08bce7fe87b5964f7912e1eef30f04922c1] + +Fixes: 2a6eee89083c8 ("nft-ruleparse: Introduce nft_create_target()") +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + iptables/nft-ruleparse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/nft-ruleparse.c b/iptables/nft-ruleparse.c +index 0bbdf44faf..3b1cbe4fa1 100644 +--- a/iptables/nft-ruleparse.c ++++ b/iptables/nft-ruleparse.c +@@ -94,7 +94,7 @@ __nft_create_target(struct nft_xt_ctx *ctx, const char *name, size_t tgsize) + if (!target) + return NULL; + +- size = XT_ALIGN(sizeof(*target->t)) + tgsize ?: target->size; ++ size = XT_ALIGN(sizeof(*target->t)) + (tgsize ?: target->size); + + target->t = xtables_calloc(1, size); + target->t->u.target_size = size; diff --git a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch deleted file mode 100644 index 5a022ebc8c..0000000000 --- a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 21 Feb 2017 11:49:07 +0200 -Subject: [PATCH] configure.ac: - only-check-conntrack-when-libnfnetlink-enabled.patch - -Package libnetfilter-conntrack depends on package libnfnetlink. iptables -checks package libnetfilter-conntrack whatever its package config -libnfnetlink is enabled or not. When libnfnetlink is disabled but -package libnetfilter-conntrack exists, it fails randomly with: - -In file included from -.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: - -.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: -fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory - -compilation terminated. -GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed -Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> - ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d607772..25a8e75 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -159,10 +159,12 @@ if test "$nftables" != 1; then - fi - - if test "x$enable_connlabel" = "xyes"; then -- PKG_CHECK_MODULES([libnetfilter_conntrack], -+ nfconntrack=0 -+ AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ -+ PKG_CHECK_MODULES([libnetfilter_conntrack], - [libnetfilter_conntrack >= 1.0.6], - [nfconntrack=1], [nfconntrack=0]) -- -+ ]) - if test "$nfconntrack" -ne 1; then - blacklist_modules="$blacklist_modules connlabel"; - echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index cd2f3bce0b..a94e4749ae 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb @@ -14,8 +14,7 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \ file://ip6tables.service \ file://ip6tables.rules \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ - file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ - file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ + file://0002-nft-ruleparse-Add-missing-braces-around-ternary.patch \ " SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" @@ -34,7 +33,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # libnfnetlink recipe is in meta-networking layer -PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" +PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink --enable-connlabel,--disable-libnfnetlink --disable-connlabel,libnfnetlink libnetfilter-conntrack" # libnftnl recipe is in meta-networking layer(previously known as libnftables) PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" @@ -52,10 +51,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" do_install:append() { install -d ${D}${IPTABLES_RULES_DIR} - install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} + install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir} sed -i \ -e 's,@SBINDIR@,${sbindir},g' \ @@ -63,8 +62,8 @@ do_install:append() { ${D}${systemd_system_unitdir}/iptables.service if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then - install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} - install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} + install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir} sed -i \ -e 's,@SBINDIR@,${sbindir},g' \ @@ -75,6 +74,10 @@ do_install:append() { # if libnftnl is included, make the iptables symlink point to the nft-based binary by default if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-save + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-restore + # ethertypes is provided by the netbase package + rm -f ${D}${sysconfdir}/ethertypes fi } diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240905.bb index 3880689742..ca8ddc530d 100644 --- a/meta/recipes-extended/iputils/iputils_20240117.bb +++ b/meta/recipes-extended/iputils/iputils_20240905.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819" DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https" -SRCREV = "8372f355bdf7a9b0c79338dd8ef8464c00a5c4e2" +SRCREV = "10b50784aae3fb75c96cdf9b1668916b49557dd5" S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/less/less_643.bb b/meta/recipes-extended/less/less_661.bb index 67834bdd58..061a494f0f 100644 --- a/meta/recipes-extended/less/less_643.bb +++ b/meta/recipes-extended/less/less_661.bb @@ -21,7 +21,7 @@ SECTION = "console/utils" LICENSE = "GPL-3.0-or-later | BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://LICENSE;md5=1b2446f5c8632bf63a97d7a49750e1c6 \ + file://LICENSE;md5=ea7ea443692720f3015859945c0fb65d \ " DEPENDS = "ncurses" @@ -29,7 +29,7 @@ SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8" +SRC_URI[sha256sum] = "2b5f0167216e3ef0ffcb0c31c374e287eb035e4e223d5dae315c2783b6e738ed" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" @@ -55,7 +55,7 @@ do_install_ptest () { cp -r ${S}/lesstest/lt ${D}${PTEST_PATH} } -RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd locale-base-en-us" +RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd perl-module-file-basename locale-base-en-us" ALTERNATIVE:${PN} = "less" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.3.bb b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb index bea91b6e97..da85764116 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.3.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb @@ -33,7 +33,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" SRC_URI += "file://configurehack.patch" UPSTREAM_CHECK_URI = "http://libarchive.org/" -SRC_URI[sha256sum] = "f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2" +SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8" CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" diff --git a/meta/recipes-extended/libmnl/libmnl_1.0.5.bb b/meta/recipes-extended/libmnl/libmnl_1.0.5.bb index 748326c0a0..66b30d7f60 100644 --- a/meta/recipes-extended/libmnl/libmnl_1.0.5.bb +++ b/meta/recipes-extended/libmnl/libmnl_1.0.5.bb @@ -11,4 +11,6 @@ SRC_URI[sha256sum] = "274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b4 inherit autotools pkgconfig +EXTRA_OECONF += "--with-doxygen=no" + BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch index 6f0dea2e9c..da93a12ed5 100644 --- a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch +++ b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch @@ -1,4 +1,4 @@ -From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 +From e1db3c41fa84391b7ab299f7351f58b413ed2994 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 28 Oct 2021 22:28:45 -0700 Subject: [PATCH] utils: Conside musl when wrapping qsort_r @@ -29,6 +29,3 @@ index 72426e09..8f29bc5a 100644 void solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) --- -2.33.1 - diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb b/meta/recipes-extended/libsolv/libsolv_0.7.30.bb index 201059323a..20d1baaaaf 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.30.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ " -SRCREV = "c8dbb3a77c86600ce09d4f80a504cf4e78a3c359" +SRCREV = "27aa6a72c7db73d78aa711ae412231768e77c9e0" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch b/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch deleted file mode 100644 index f746f986f4..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001 -Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de> -From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> -Date: Thu, 12 Oct 2023 16:22:59 +0200 -Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the configuration for IPv6 is disabled, the netconfig should not contain -settings for tcp6 and udp6. - -The test for the configure option didn't work, because it check the wrong -variable. - -Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> -Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net] -Upstream-Status: Submitted [linux-nfs@vger.kernel.org] ---- - configure.ac | 2 +- - doc/Makefile.am | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fe6c517..b687f8d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ fi - AC_ARG_ENABLE(ipv6, - [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])], - [],[enable_ipv6=yes]) --AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno) -+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno) - if test "x$enable_ipv6" != xno; then - AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]) - fi -diff --git a/doc/Makefile.am b/doc/Makefile.am -index d42ab90..b9678f6 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -2,3 +2,8 @@ dist_sysconf_DATA = netconfig bindresvport.blacklist - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in -+ -+if ! INET6 -+install-exec-hook: -+ $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig -+endif --- -2.34.1 - diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.5.bb index aa526e9e1c..d4cd24ec0c 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.5.bb @@ -9,12 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://ipv6.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" -SRC_URI[sha256sum] = "1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860" +SRC_URI[sha256sum] = "9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f" CVE_STATUS[CVE-2021-46828] = "fixed-version: fixed in 1.3.3rc1 so not present in 1.3.3" diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb index f0fdda4190..153f451ea7 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb @@ -47,9 +47,9 @@ SYSTEMD_SERVICE:${PN} = "lighttpd.service" do_install:append() { install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd - install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + install -m 0755 ${UNPACKDIR}/lighttpd ${D}${sysconfdir}/init.d + install -m 0644 ${UNPACKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd + install -m 0644 ${UNPACKDIR}/index.html.lighttpd ${D}/www/pages/index.html install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} diff --git a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb index 10a6149abc..ac14f30051 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb @@ -14,7 +14,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516" +SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618" CVE_STATUS_GROUPS = "CVE_STATUS_RECIPE" CVE_STATUS_RECIPE = "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch new file mode 100644 index 0000000000..ade6a52b63 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch @@ -0,0 +1,32 @@ +From 2d384f268791ecd5ff0f26c8137dd4de0a1c4566 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 10 Jun 2024 22:52:56 -0700 +Subject: [PATCH] Add __clear_cache declaration for clang + +__clear_cache was enabled on RISCV recently with 7352ba02390116f1cd6a9b583860ba28aa0a1b7a +however it fails to compile with clang19 on RISCV +With this error + + hugemmap15.c:51:2: error: call to undeclared function '__clear_cache'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + 51 | __clear_cache(p, p + COPY_SIZE); + | ^ + +Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2024-June/038762.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Hui Min Mina Chou <minachou@andestech.com> +--- + testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c +index a84ba6476..856e22ff3 100644 +--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c ++++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c +@@ -21,6 +21,7 @@ + + #if defined(__clang__) + #pragma clang optimize off ++ void __clear_cache(void *start, void *end); + #endif + + #define _GNU_SOURCE diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch index cc98079651..5b6c780bec 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch @@ -1,4 +1,4 @@ -From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 +From 768159aa53257d247645a12518778f50b8fdf578 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 @@ -14,10 +14,10 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com> 1 file changed, 6 deletions(-) diff --git a/runtest/mm b/runtest/mm -index d859b331c..3c2962f44 100644 +index 6a8cd0b9d..8ce3f4416 100644 --- a/runtest/mm +++ b/runtest/mm -@@ -74,12 +74,6 @@ ksm07 ksm07 +@@ -76,12 +76,6 @@ ksm07 ksm07 cpuset01 cpuset01 @@ -30,6 +30,3 @@ index d859b331c..3c2962f44 100644 swapping01 swapping01 -i 5 thp01 thp01 -I 120 --- -2.43.0 - diff --git a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch b/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch deleted file mode 100644 index 4a50d1ae38..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001 -From: Xiangyu Chen <xiangyu.chen@windriver.com> -Date: Thu, 14 Mar 2024 09:47:10 +0800 -Subject: [PATCH] scenario_groups/default: remove connectors - -runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default. - -Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc") -Closes: https://github.com/linux-test-project/ltp/pull/1144 - -Upstream-Status: Backport from -[https://github.com/linux-test-project/ltp/commit/14c710ca] - -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> ---- - scenario_groups/default | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scenario_groups/default b/scenario_groups/default -index f17b2061a..ec77d8fb8 100644 ---- a/scenario_groups/default -+++ b/scenario_groups/default -@@ -16,7 +16,6 @@ controllers - filecaps - cap_bounds - fcntl-locktests --connectors - power_management_tests - hugetlb - commands --- -2.34.1 - diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240524.bb index e88e931a68..6b46723478 100644 --- a/meta/recipes-extended/ltp/ltp_20240129.bb +++ b/meta/recipes-extended/ltp/ltp_20240524.bb @@ -24,11 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "68737d20556d37364c95776044b1119c0912a36a" +SRCREV = "8f21ebba42216dbb7e8d44c23b4a977d6823f7a1" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ - file://0001-scenario_groups-default-remove-connectors.patch \ + file://0001-Add-__clear_cache-declaration-for-clang.patch \ " S = "${WORKDIR}/git" @@ -39,8 +39,8 @@ inherit autotools-brokensep pkgconfig # SORT_NONE in linker script which isn't supported by gold: # https://sourceware.org/bugzilla/show_bug.cgi?id=18097 # https://github.com/linux-test-project/ltp/commit/3fce2064b54843218d085aae326c8f7ecf3a8c41#diff-39268f0855c634ca48c8993fcd2c95b12a65b79e8d9fa5ccd6b0f5a8785c0dd6R36 -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '-fuse-ld=bfd', '', d)}" # After 0002-kvm-use-LD-instead-of-hardcoding-ld.patch # https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb index 27b47a7f47..5c6797c8f1 100644 --- a/meta/recipes-extended/man-db/man-db_2.12.1.bb +++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb @@ -37,7 +37,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles + install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles fi } diff --git a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch b/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch deleted file mode 100644 index a644d24328..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Wed, 13 Mar 2024 17:30:02 +0100 -Subject: [PATCH] GNUmakefile: use env from PATH - -This allows using env from coreutils-native (rather than host env), -which resolves the problem of missing -S option on distributions -with much older coreutils such as Ubuntu 18.04. - -Once all autobuilder distros are newer than that, this patch -can be dropped, together with corutils-native dependency. - -Upstream-Status: Inappropriate [made for obsolete host distros] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - GNUmakefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 1234194..65ba327 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -21,7 +21,7 @@ - ######################################################################## - - --SHELL := /usr/bin/env -+SHELL := env - .SHELLFLAGS := -S bash -Eeuo pipefail -c - - diff --git a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch b/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch deleted file mode 100644 index ec2d0600c7..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 4 Mar 2024 14:35:16 +0100 -Subject: [PATCH] man.ml: do not use /dev/stdin - -This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e -(presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence), -but it doesn't work under pseudo where /dev/stdin is absent. - -Upstream-Status: Inappropriate [yocto specific] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - share/mk/install/man.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk -index b9865b9..06880f0 100644 ---- a/share/mk/install/man.mk -+++ b/share/mk/install/man.mk -@@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \ - - $(_manpages): - $(info INSTALL $@) -- <$< \ -- $(SED) $(foreach s, $(MANSECTIONS), \ -+ $(INSTALL_DATA) -T $< $@ -+ $(SED) -i $(foreach s, $(MANSECTIONS), \ - -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ -- | $(INSTALL_DATA) -T /dev/stdin $@ -+ $@ - ifeq ($(LINK_PAGES),symlink) - if $(GREP) '^\.so ' <$@ >/dev/null; then \ - $(GREP) '^\.so ' <$@ \ diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.9.1.bb index 0f091bbd7d..ba1a6c16c4 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.9.1.bb @@ -18,17 +18,12 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ " SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ - file://0001-man.ml-do-not-use-dev-stdin.patch \ - file://0001-GNUmakefile-use-env-from-PATH.patch \ " -SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" +SRC_URI[sha256sum] = "3ae3f8ad97487d2c1b14258231d97d03b4e569b915377f6dd4f6be7141c57ee0" inherit manpages -# can be dropped when ubuntu 18.04 is not in use anymore -DEPENDS += "coreutils-native" - MAN_PKG = "${PN}" PACKAGECONFIG ??= "" diff --git a/meta/recipes-extended/mc/mc_4.8.31.bb b/meta/recipes-extended/mc/mc_4.8.32.bb index 69c32887a2..97d4cc0b01 100644 --- a/meta/recipes-extended/mc/mc_4.8.31.bb +++ b/meta/recipes-extended/mc/mc_4.8.32.bb @@ -8,10 +8,10 @@ DEPENDS = "ncurses glib-2.0 util-linux file-replacement-native" RDEPENDS:${PN} = "ncurses-terminfo-base" RRECOMMENDS:${PN} = "ncurses-terminfo" -SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ +SRC_URI = "http://ftp.midnight-commander.org/${BPN}-${PV}.tar.bz2 \ file://nomandate.patch \ " -SRC_URI[sha256sum] = "f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841" +SRC_URI[sha256sum] = "51a039ebd15d5e442312a7053a4ca28276b7f241050b7714d5bae5362ecd3319" inherit autotools gettext pkgconfig @@ -31,6 +31,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PERL_FOR_BUILD='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "ac_cv_path_ZIP='/usr/bin/zip'" CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install:append () { diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 228fc6f84e..63c61b68c9 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb @@ -61,7 +61,7 @@ do_install:append() { install -d ${D}/${sysconfdir}/ install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor + install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor } do_install:append() { diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb b/meta/recipes-extended/msmtp/msmtp_1.8.26.bb index b575fad5e1..13820fe930 100644 --- a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb +++ b/meta/recipes-extended/msmtp/msmtp_1.8.26.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] = "2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738" +SRC_URI[sha256sum] = "6cfc488344cef189267e60aea481f00d4c7e2a59b53c6c659c520a4d121f66d8" inherit gettext autotools update-alternatives pkgconfig diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb index 33304297ec..7facc0cc8d 100644 --- a/meta/recipes-extended/net-tools/net-tools_2.10.bb +++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb @@ -31,8 +31,8 @@ PACKAGECONFIG[plipconfig] = "" do_configure() { # net-tools has its own config mechanism requiring "make config" # we pre-generate desired options and copy to source directory instead - cp ${WORKDIR}/net-tools-config.h ${S}/config.h - cp ${WORKDIR}/net-tools-config.make ${S}/config.make + cp ${UNPACKDIR}/net-tools-config.h ${S}/config.h + cp ${UNPACKDIR}/net-tools-config.make ${S}/config.make if [ "${USE_NLS}" = "no" ]; then sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make diff --git a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch deleted file mode 100644 index 090ed5c1c9..0000000000 --- a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Wed, 21 Sep 2016 21:14:40 +0200 -Subject: [PATCH] detect gold as GNU linker too -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 468c718..cd93f30 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) - AC_MSG_CHECKING([for GNU ld]) - LD=$($CC -print-prog-name=ld 2>&5) - --if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then -+if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then - # Not - GNU_LD="" - AC_MSG_RESULT([no]) diff --git a/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch b/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch deleted file mode 100644 index bc55582fd9..0000000000 --- a/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fad40cfc18a42946a9a9e440c3434cd6b847ff9d Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 18 Jan 2016 17:05:19 +0000 -Subject: [PATCH] Makefile.in: Add tinfo library to the linking libraries -Organization: O.S. Systems Software LTDA. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index a85d00f..98b85f9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,4 +1,4 @@ --LIBS = -lslang @LIBS@ -+LIBS = -lslang -ltinfo @LIBS@ - LIBTCL = @TCL_LIB_FLAG@ - - CC = @CC@ --- -2.1.4 - diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch deleted file mode 100644 index 86cc0be1d3..0000000000 --- a/meta/recipes-extended/newt/files/cross_ar.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix cross link using autoconf detected AR - -If building on 32bit host and creating 64bit libraries, the target -package builds should not invoke the 32bit hosts's ar. Specifically -you will get an error message like: - -x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -g -o test test.o libnewt.a -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lslang -libnewt.a: could not read symbols: Archive has no index; run ranlib to add one -collect2: error: ld returned 1 exit status - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 3 ++- - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -Index: newt-0.52.20/Makefile.in -=================================================================== ---- newt-0.52.20.orig/Makefile.in -+++ newt-0.52.20/Makefile.in -@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ - GNU_LD = @GNU_LD@ -+AR = @AR@ - - VERSION = @VERSION@ - TAG = r$(subst .,-,$(VERSION)) -@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE - $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) - - $(LIBNEWT): $(LIBOBJS) -- ar rv $@ $^ -+ $(AR) rv $@ $^ - - newt.o $(SHAREDDIR)/newt.o: newt.c Makefile - -Index: newt-0.52.20/configure.ac -=================================================================== ---- newt-0.52.20.orig/configure.ac -+++ newt-0.52.20/configure.ac -@@ -15,6 +15,10 @@ AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_GREP - AC_SYS_LARGEFILE -+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_CHECK_SIZEOF([long]) - AC_CHECK_SIZEOF([long long]) diff --git a/meta/recipes-extended/newt/libnewt_0.52.24.bb b/meta/recipes-extended/newt/libnewt_0.52.24.bb deleted file mode 100644 index 1e39a1c5ca..0000000000 --- a/meta/recipes-extended/newt/libnewt_0.52.24.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "A library for text mode user interfaces" - -DESCRIPTION = "Newt is a programming library for color text mode, widget based user \ -interfaces. Newt can be used to add stacked windows, entry widgets, \ -checkboxes, radio buttons, labels, plain text fields, scrollbars, \ -etc., to text mode user interfaces. This package also contains the \ -shared library needed by programs built with newt, as well as a \ -/usr/bin/dialog replacement called whiptail. Newt is based on the \ -slang library." - -HOMEPAGE = "https://releases.pagure.org/newt/" -SECTION = "libs" - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -# slang needs to be >= 2.2 -DEPENDS = "slang popt python3" - -SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ - file://cross_ar.patch \ - file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ - file://0001-detect-gold-as-GNU-linker-too.patch \ - " - -SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb" - -S = "${WORKDIR}/newt-${PV}" - -inherit autotools-brokensep python3native python3-dir python3targetconfig - -EXTRA_OECONF = "--without-tcl --with-python" - -EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" - -CLEANBROKEN = "1" - -export CPPFLAGS - -PACKAGES:prepend = "whiptail ${PN}-python " - -RDEPENDS:${PN}-python += "python3-core" -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" - -do_configure:prepend() { - sh autogen.sh -} - -do_compile:prepend() { - # Make sure the recompile is OK - rm -f ${B}/.depend -} - -FILES:whiptail = "${bindir}/whiptail" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/pam/libpam_1.6.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index 849f485f75..c9ef40bf23 100644 --- a/meta/recipes-extended/pam/libpam_1.6.1.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb @@ -37,7 +37,7 @@ EXTRA_OECONF = "--includedir=${includedir}/security \ --disable-doc \ --disable-prelude" -CFLAGS:append = " -fPIC " +CFLAGS += "-fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" @@ -138,16 +138,16 @@ do_install() { rm -rf ${D}${sysconfdir}/init.d/ rm -rf ${D}${sysconfdir}/rc* install -d ${D}${nonarch_libdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/pam-volatiles.conf \ + install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \ ${D}${nonarch_libdir}/tmpfiles.d/pam.conf else install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam \ + install -m 0644 ${UNPACKDIR}/99_pam \ ${D}${sysconfdir}/default/volatiles/ fi install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ # The lsb requires unix_chkpwd has setuid permission chmod 4755 ${D}${sbindir}/unix_chkpwd @@ -155,7 +155,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + if [ "${base_libdir}" != "${libdir}" ]; then install -d ${D}/${libdir}/ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ fi diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch new file mode 100644 index 0000000000..23d1a3cd3e --- /dev/null +++ b/meta/recipes-extended/procps/procps/pidfd.patch @@ -0,0 +1,42 @@ +From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Thu, 25 Apr 2024 13:33:15 +0000 +Subject: [PATCH] Fix pidfd_open detection + +This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but +src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS. + +Also pidfd_open is defined in sys/pidfd.h so that needs including. + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + +diff --git a/configure.ac b/configure.ac +index fec27e3f..024731c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + +-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [ ++AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [ + AC_MSG_CHECKING([for __NR_pidfd_open]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <sys/syscall.h> +diff --git a/src/pgrep.c b/src/pgrep.c +index d8e57dff..c5211aec 100644 +--- a/src/pgrep.c ++++ b/src/pgrep.c +@@ -44,7 +44,9 @@ + + #ifdef ENABLE_PIDWAIT + #include <sys/epoll.h> +-#ifndef HAVE_PIDFD_OPEN ++#ifdef HAVE_PIDFD_OPEN ++#include <sys/pidfd.h> ++#else + #include <sys/syscall.h> + #endif /* !HAVE_PIDFD_OPEN */ + #endif diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb index 800384f22f..b02f74bd6b 100644 --- a/meta/recipes-extended/procps/procps_4.0.4.bb +++ b/meta/recipes-extended/procps/procps_4.0.4.bb @@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ + file://pidfd.patch \ " SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" @@ -41,7 +42,7 @@ do_install:append () { fi install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf + install -m 0644 ${UNPACKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/sysctl.d ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc deleted file mode 100644 index 23e98d21be..0000000000 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Utilities for managing processes on your system" -HOMEPAGE = "http://psmisc.sf.net/" -DESCRIPTION = "The psmisc package contains utilities for managing processes on your \ -system: pstree, killall and fuser. The pstree command displays a tree \ -structure of all of the running processes on your system. The killall \ -command sends a specified signal (SIGTERM if nothing is specified) to \ -processes identified by name. The fuser command identifies the PIDs \ -of processes that are using specified files or filesystems." -SECTION = "base" -DEPENDS = "ncurses virtual/libintl" -LICENSE = "GPL-2.0-only" - -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" - -S = "${WORKDIR}/psmisc-${PV}" - -inherit autotools gettext - -# Upstream has a custom autogen.sh which invokes po/update-potfiles as they -# don't ship a po/POTFILES.in (which is silly). Without that file gettext -# doesn't believe po/ is a gettext directory and won't generate po/Makefile. -do_configure:prepend() { - ( cd ${S} && po/update-potfiles ) -} - - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" - -ALLOW_EMPTY:${PN} = "1" - -PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" -PACKAGES += "psmisc-extras" - -FILES:${PN} = "" -RDEPENDS:${PN} = "fuser killall pstree" - -FILES:fuser = "${bindir}/fuser.${BPN}" -FILES:fuser-doc = "${mandir}/man1/fuser*" - -FILES:killall = "${bindir}/killall.${BPN}" -FILES:killall-doc = "${mandir}/man1/killall*" - -FILES:pstree = "${bindir}/pstree" -FILES:pstree-doc = "${mandir}/man1/pstree*" - -FILES:psmisc-extras = "${bindir}" -FILES:psmisc-extras-doc = "${mandir}" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "90" - -ALTERNATIVE:killall = "killall" - -ALTERNATIVE:fuser = "fuser" - -ALTERNATIVE:pstree = "pstree" diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch deleted file mode 100644 index 01335bdf40..0000000000 --- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 24 Mar 2016 15:46:14 +0000 -Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE - -Do not include sys/user.h since it conflicts with -pt_regs struct from kernel APIs in asm/ptrace.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending ---- - src/peekfd.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/peekfd.c b/src/peekfd.c -index 36dff04..2b4b1dc 100644 ---- a/src/peekfd.c -+++ b/src/peekfd.c -@@ -30,8 +30,11 @@ - #include <asm/ptrace.h> - #include <byteswap.h> - #include <endian.h> -+#ifdef __GLIBC__ - #include <sys/user.h> -+#endif - #include <stdlib.h> -+#include <stdint.h> - #include <getopt.h> - #include <ctype.h> - #include <dirent.h> -@@ -341,11 +344,11 @@ int main(int argc, char **argv) - if (WIFSTOPPED(status)) { - #ifdef PPC - struct pt_regs regs; -- regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R0, 0); -- regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R3, 0); -- regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R4, 0); -- regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R5, 0); -- regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_ORIG_R3, 0); -+ regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R0, 0); -+ regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R3, 0); -+ regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R4, 0); -+ regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R5, 0); -+ regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_ORIG_R3, 0); - #elif defined(ARM) - struct pt_regs regs; - ptrace(PTRACE_GETREGS, pid, 0, ®s); diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index ea272cd92d..4128ca0533 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.7.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb @@ -1,9 +1,62 @@ -require psmisc.inc +SUMMARY = "Utilities for managing processes on your system" +HOMEPAGE = "http://psmisc.sf.net/" +DESCRIPTION = "The psmisc package contains utilities for managing processes on your \ +system: pstree, killall and fuser. The pstree command displays a tree \ +structure of all of the running processes on your system. The killall \ +command sends a specified signal (SIGTERM if nothing is specified) to \ +processes identified by name. The fuser command identifies the PIDs \ +of processes that are using specified files or filesystems." +SECTION = "base" +DEPENDS = "ncurses virtual/libintl" + LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ - file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ " SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" S = "${WORKDIR}/git" + +inherit autotools gettext + +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they +# don't ship a po/POTFILES.in (which is silly). Without that file gettext +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. +do_configure:prepend() { + ( cd ${S} && po/update-potfiles ) +} + + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" + +ALLOW_EMPTY:${PN} = "1" + +PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" +PACKAGES += "psmisc-extras" + +FILES:${PN} = "" +RDEPENDS:${PN} = "fuser killall pstree" + +FILES:fuser = "${bindir}/fuser.${BPN}" +FILES:fuser-doc = "${mandir}/man1/fuser*" + +FILES:killall = "${bindir}/killall.${BPN}" +FILES:killall-doc = "${mandir}/man1/killall*" + +FILES:pstree = "${bindir}/pstree" +FILES:pstree-doc = "${mandir}/man1/pstree*" + +FILES:psmisc-extras = "${bindir}" +FILES:psmisc-extras-doc = "${mandir}" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "90" + +ALTERNATIVE:killall = "killall" + +ALTERNATIVE:fuser = "fuser" + +ALTERNATIVE:pstree = "pstree" diff --git a/meta/recipes-extended/quota/quota/0001-Fix-building-on-musl.patch b/meta/recipes-extended/quota/quota/0001-Fix-building-on-musl.patch new file mode 100644 index 0000000000..ce20f672cc --- /dev/null +++ b/meta/recipes-extended/quota/quota/0001-Fix-building-on-musl.patch @@ -0,0 +1,228 @@ +From e73c5b48e12c3f02e532864a1107cdc8a4feafc3 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 14 Jul 2024 07:58:50 +0000 +Subject: [PATCH] Fix building on musl + +basename(3) is defined in libgen.h in MUSL. Include libgen.h where +basename(3) is used. + +Upstream-Status: Backport [https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/] +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +Signed-off-by: Jan Kara <jack@suse.cz> +--- + convertquota.c | 1 + + edquota.c | 11 ++++++----- + quota.c | 1 + + quota_nld.c | 1 + + quotacheck.c | 1 + + quotaon.c | 1 + + quotastats.c | 1 + + quotasync.c | 1 + + repquota.c | 1 + + rquota_svc.c | 1 + + setquota.c | 1 + + warnquota.c | 1 + + xqmstats.c | 1 + + 13 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/convertquota.c b/convertquota.c +index 6c8a553..4eb05ed 100644 +--- a/convertquota.c ++++ b/convertquota.c +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include <endian.h> + +diff --git a/edquota.c b/edquota.c +index 20ca306..c5b27cf 100644 +--- a/edquota.c ++++ b/edquota.c +@@ -20,6 +20,7 @@ + #include <stdlib.h> + #include <fcntl.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "quotaops.h" +@@ -38,7 +39,7 @@ char *progname; + static int flags, quotatype; + static int fmt = -1; + static char *protoname; +-static char *dirname; ++static char *dir_name; + + static void usage(void) + { +@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv) + exit(1); + break; + case 'f': +- dirname = optarg; ++ dir_name = optarg; + break; + case 256: + flags |= FL_NUMNAMES; +@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct quota_handle **handles) + protoprivs = getprivs(protoid, handles, 0); + while (argc-- > 0) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s\n"), *argv); + argv++; +@@ -223,7 +224,7 @@ int main(int argc, char **argv) + argv += ret; + + init_kernel_interface(); +- handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : NULL, quotatype, fmt, ++ handles = create_handle_list(dir_name ? 1 : 0, dir_name ? &dir_name : NULL, quotatype, fmt, + (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS, + (flags & FL_REMOTE) ? 0 : MS_LOCALONLY); + if (!handles[0]) { +@@ -296,7 +297,7 @@ int main(int argc, char **argv) + else { + for (; argc > 0; argc--, argv++) { + id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL); +- curprivs = getprivs(id, handles, !dirname); ++ curprivs = getprivs(id, handles, !dir_name); + if (!curprivs) + die(1, _("Cannot get quota information for user %s.\n"), *argv); + if (flags & FL_EDIT_TIMES) { +diff --git a/quota.c b/quota.c +index a60de12..66b0fa3 100644 +--- a/quota.c ++++ b/quota.c +@@ -20,6 +20,7 @@ + #include <unistd.h> + #include <limits.h> + #include <ctype.h> ++#include <libgen.h> + #ifdef RPC + #include <rpc/rpc.h> + #include "rquota.h" +diff --git a/quota_nld.c b/quota_nld.c +index 58a62af..710b556 100644 +--- a/quota_nld.c ++++ b/quota_nld.c +@@ -26,6 +26,7 @@ + #include <fcntl.h> + #include <limits.h> + #include <signal.h> ++#include <libgen.h> + #include <sys/stat.h> + #include <asm/types.h> + +diff --git a/quotacheck.c b/quotacheck.c +index e2c3bbd..fa1d297 100644 +--- a/quotacheck.c ++++ b/quotacheck.c +@@ -19,6 +19,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <errno.h> ++#include <libgen.h> + + #include <sys/stat.h> + #include <sys/types.h> +diff --git a/quotaon.c b/quotaon.c +index 351c851..17b6bcc 100644 +--- a/quotaon.c ++++ b/quotaon.c +@@ -13,6 +13,7 @@ + #include <string.h> + #include <stdlib.h> + #include <stdarg.h> ++#include <libgen.h> + + #include "quotaon.h" + #include "quota.h" +diff --git a/quotastats.c b/quotastats.c +index a059812..4076a7d 100644 +--- a/quotastats.c ++++ b/quotastats.c +@@ -24,6 +24,7 @@ + #include <errno.h> + #include <string.h> + #include <signal.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +diff --git a/quotasync.c b/quotasync.c +index cad2a20..e90b24a 100644 +--- a/quotasync.c ++++ b/quotasync.c +@@ -7,6 +7,7 @@ + #include <string.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +diff --git a/repquota.c b/repquota.c +index e79fc4d..8e509bd 100644 +--- a/repquota.c ++++ b/repquota.c +@@ -18,6 +18,7 @@ + #include <pwd.h> + #include <grp.h> + #include <getopt.h> ++#include <libgen.h> + + #include "pot.h" + #include "common.h" +diff --git a/rquota_svc.c b/rquota_svc.c +index 6e856bb..c17df13 100644 +--- a/rquota_svc.c ++++ b/rquota_svc.c +@@ -34,6 +34,7 @@ + #include <signal.h> + #include <errno.h> + #include <netconfig.h> ++#include <libgen.h> + #ifdef HOSTS_ACCESS + #include <tcpd.h> + #include <netdb.h> +diff --git a/setquota.c b/setquota.c +index c517ab1..9e4b2fa 100644 +--- a/setquota.c ++++ b/setquota.c +@@ -18,6 +18,7 @@ + #include <time.h> + #include <ctype.h> + #include <stdlib.h> ++#include <libgen.h> + + #if defined(RPC) + #include "rquota.h" +diff --git a/warnquota.c b/warnquota.c +index 2882fee..6f63ce7 100644 +--- a/warnquota.c ++++ b/warnquota.c +@@ -31,6 +31,7 @@ + #include <time.h> + #include <getopt.h> + #include <locale.h> ++#include <libgen.h> + #ifdef HAVE_NL_LANGINFO + #include <langinfo.h> + #endif +diff --git a/xqmstats.c b/xqmstats.c +index 59b1d66..345b060 100644 +--- a/xqmstats.c ++++ b/xqmstats.c +@@ -8,6 +8,7 @@ + #include <stdio.h> + #include <unistd.h> + #include <string.h> ++#include <libgen.h> + #include "common.h" + #include "pot.h" + diff --git a/meta/recipes-extended/quota/quota/fcntl.patch b/meta/recipes-extended/quota/quota/fcntl.patch deleted file mode 100644 index 09a0c687b6..0000000000 --- a/meta/recipes-extended/quota/quota/fcntl.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 00a456145531d194d3993c9f4cd404d5ca16c9df Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Apr 2015 17:36:44 +0000 -Subject: [PATCH] quota: Fix build with musl - -Include fcntl.h to pacify compiler errors on musl -like - -error: unknown type name 'loff_t' -Cover rpc headers under proper conditional -Dont use __P its undefined - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - quotacheck.c | 1 + - quotaio.c | 1 + - rquota_client.c | 4 ++++ - 3 files changed, 6 insertions(+) - -diff --git a/quotacheck.c b/quotacheck.c -index bd62d9a..772a27d 100644 ---- a/quotacheck.c -+++ b/quotacheck.c -@@ -19,6 +19,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <errno.h> -+#include <fcntl.h> - - #include <sys/stat.h> - #include <sys/types.h> -diff --git a/quotaio.c b/quotaio.c -index 94ae458..d57fc1a 100644 ---- a/quotaio.c -+++ b/quotaio.c -@@ -12,6 +12,7 @@ - #include <string.h> - #include <unistd.h> - #include <stdlib.h> -+#include <fcntl.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> -diff --git a/rquota_client.c b/rquota_client.c -index 7f8e821..d48505a 100644 ---- a/rquota_client.c -+++ b/rquota_client.c -@@ -19,7 +19,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <sys/param.h> - #include <sys/stat.h> -@@ -35,7 +37,9 @@ - #include <stdint.h> - - #include "mntopt.h" -+#if defined(RPC) - #include "rquota.h" -+#endif - #include "common.h" - #include "quotaio.h" - #include "quotasys.h" diff --git a/meta/recipes-extended/quota/quota_4.09.bb b/meta/recipes-extended/quota/quota_4.09.bb index b779657dfc..8e4d4aed8b 100644 --- a/meta/recipes-extended/quota/quota_4.09.bb +++ b/meta/recipes-extended/quota/quota_4.09.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ - file://fcntl.patch \ + file://0001-Fix-building-on-musl.patch \ " SRC_URI[sha256sum] = "9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9" diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch index 79dc96050e..1d7ba7d508 100644 --- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch +++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch @@ -9,34 +9,33 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Stefan Agner <stefan.agner@toradex.com> --- configure.ac | 2 ++ - systemd/rpcbind.service.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) + systemd/rpcbind.service.in | 1 + + 2 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index 2dd9471..47a46c0 100644 +index 8f4cef3..4705413 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h]) +@@ -86,5 +86,7 @@ AC_CHECK_HEADERS([nss.h]) # 2 "evals" needed to expand variable names AC_SUBST([_sbindir]) AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir]) +AC_SUBST([_sysconfdir]) +AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) - AC_OUTPUT([Makefile systemd/rpcbind.service]) + AC_OUTPUT([Makefile systemd/rpcbind.service systemd/rpcbind.socket]) diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in -index 7b1c74b..f45ee1e 100644 +index c892ca8..e0511bd 100644 --- a/systemd/rpcbind.service.in +++ b/systemd/rpcbind.service.in -@@ -11,7 +11,7 @@ Wants=rpcbind.target - +@@ -12,6 +12,7 @@ Wants=rpcbind.target [Service] Type=notify --# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. + # distro can provide a drop-in adding EnvironmentFile=-/??? if needed. +EnvironmentFile=-@_sysconfdir@/rpcbind.conf - ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f + ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f [Install] -- -2.23.0 +2.34.1 diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.systemd b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.systemd new file mode 100644 index 0000000000..5765751326 --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.systemd @@ -0,0 +1,3 @@ +[Unit] +# Make sure the runtime directory exists +After=systemd-tmpfiles-setup.service diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.tmpfiles b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.tmpfiles new file mode 100644 index 0000000000..fecee72c09 --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.tmpfiles @@ -0,0 +1 @@ +d /run/rpcbind 0755 root root - diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb index dbd4d32e0a..d308071d29 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb @@ -13,10 +13,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://init.d \ file://rpcbind.conf \ + file://rpcbind.tmpfiles \ + file://rpcbind.systemd \ file://rpcbind_add_option_to_fix_port_number.patch \ file://0001-systemd-use-EnvironmentFile.patch \ " -SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de" +SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e" inherit autotools update-rc.d systemd pkgconfig update-alternatives @@ -46,10 +48,18 @@ do_install:append () { install -d ${D}${sysconfdir}/init.d sed -e 's,/etc/,${sysconfdir}/,g' \ -e 's,/sbin/,${sbindir}/,g' \ - ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind + ${UNPACKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind chmod 0755 ${D}${sysconfdir}/init.d/rpcbind - install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf + install -m 0644 ${UNPACKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${UNPACKDIR}/rpcbind.tmpfiles ${D}${sysconfdir}/tmpfiles.d/rpcbind.conf + + install -d ${D}${systemd_system_unitdir}/rpcbind.service.d + install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf } +FILES:${PN} += "${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf" + ALTERNATIVE:${PN} = "rpcinfo" ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo" diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_4.9.1.bb index 7b040e6b57..57d1481049 100644 --- a/meta/recipes-extended/screen/screen_4.9.1.bb +++ b/meta/recipes-extended/screen/screen_4.9.1.bb @@ -36,7 +36,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sy do_install:append () { install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen + install -D -m 644 ${UNPACKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen fi } diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch deleted file mode 100644 index 2e5503bfd4..0000000000 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ /dev/null @@ -1,37 +0,0 @@ -From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001 -From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> -Date: Mon, 18 Mar 2024 12:14:21 +0100 -Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer - -There are no guarantees that fstatat() does not clobber the stat -buffer on errors. - -Use a temporary buffer so that the following code sees correct -attributes of the source entry. - -Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974] - -Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> ---- - lib/copydir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/lib/copydir.c -+++ b/lib/copydir.c -@@ -400,6 +400,7 @@ static int copy_entry (const struct path - { - int err = 0; - struct stat sb; -+ struct stat tmp_sb; - struct link_name *lp; - struct timespec mt[2]; - -@@ -423,7 +424,7 @@ static int copy_entry (const struct path - * If the destination already exists do nothing. - * This is after the copy_dir above to still iterate into subdirectories. - */ -- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { -+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { - return err; - } - diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb index fe51ea1874..913c159c81 100644 --- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb @@ -8,7 +8,8 @@ INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "file://securetty" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" # Since SERIAL_CONSOLES is likely to be set from the machine configuration PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -17,7 +18,7 @@ do_install () { # Ensure we add a suitable securetty file to the package that has # most common embedded TTYs defined. install -d ${D}${sysconfdir} - install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty + install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty if [ ! -z "${SERIAL_CONSOLES}" ]; then # Our SERIAL_CONSOLES contains a baud rate and sometimes extra # options as well. The following pearl :) takes that and converts diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index 00ab58b38c..13cfab6aab 100644 --- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -13,7 +13,8 @@ DEPENDS = "base-passwd" # can add custom users/groups for recipes that use inherit useradd. SRC_URI = "file://login.defs_shadow-sysroot" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${sysconfdir} diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index c15715fc77..b5e77b9874 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -12,7 +12,6 @@ DEPENDS = "virtual/crypt" GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ - file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ " @@ -25,7 +24,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:class-native = " \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" +SRC_URI[sha256sum] = "1744f339e07a2b41056347ddd612839762ff565d7e9494fb049428002fa2e7e0" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ @@ -111,7 +110,7 @@ do_install() { sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default + install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default } do_install:append() { @@ -121,11 +120,11 @@ do_install:append() { install -m 0775 -d ${D}${localstatedir}/spool/mail chown root:mail ${D}${localstatedir}/spool/mail - if [ -e ${WORKDIR}/pam.d ]; then + if [ -e ${UNPACKDIR}/pam.d ]; then install -d ${D}${sysconfdir}/pam.d/ - install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ + install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ # Remove defaults that are not used when supporting PAM. - sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs + sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs fi install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} diff --git a/meta/recipes-extended/shadow/shadow_4.15.0.bb b/meta/recipes-extended/shadow/shadow_4.16.0.bb index e57676c1da..e57676c1da 100644 --- a/meta/recipes-extended/shadow/shadow_4.15.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.16.0.bb diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb b/meta/recipes-extended/stress-ng/stress-ng_0.18.02.bb index fb88e06a7f..e63a68aa6d 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.18.02.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ " -SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2" +SRCREV = "be42d072c0df72dc8136f52d3962e4ba264a100a" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd" diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb index 8e542015ad..2fd2ae6d05 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb @@ -30,7 +30,7 @@ EXTRA_OECONF += " \ do_install:append () { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo + install -D -m 644 ${UNPACKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.6.1.bb index c9c9055142..99454b8230 100644 --- a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb +++ b/meta/recipes-extended/sysklogd/sysklogd_2.6.1.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https file://sysklogd \ " -SRCREV = "3332c550f1a68393daec5d64cd81f3b7674c0af5" +SRCREV = "c2bc519697aaa94f7b5e658a31ff55b9d54e7c8d" S = "${WORKDIR}/git" @@ -24,7 +24,7 @@ do_install:append () { install -d ${D}${sysconfdir} install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog + install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog } SYSTEMD_PACKAGES = "${PN}" diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.6.bb index 150f4932d8..ea94ebf0aa 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.7.6.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" -SRCREV = "2d7682f26f42cef9127b123e319349b330c4ab8f" +SRCREV = "3e3ec9b2c69940503723e3c2ffc1965a8a3484e3" S = "${WORKDIR}/git" DEPENDS += "base-passwd" @@ -45,7 +45,7 @@ do_install() { rm -rf ${D}/var if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${nonarch_libdir}/tmpfiles.d @@ -56,7 +56,7 @@ do_install() { # systemd unit file. Otherwise the package will install one. if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir} sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service fi fi diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch index 9d1e05d7f4..9ca227d68d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix build with clang Fix "error: non-void function 'fix_options' should return a value". Add function prototype to tcpd.c and miscd.c. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> --- diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch index 474703885d..8503177926 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix implicit-function-declaration warnings These are seen with clang-15+ -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- hosts_access.c | 3 +++ diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch index 88c8d9cae7..f485fe3fb6 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove fgets() extern declaration These sources already include <stdio.h> which should bring the correct declaration -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- hosts_access.c | 1 - diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff index 16d6719cbc..c5ba3af306 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch index 9a735bff6d..fea8ab9d7a 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch index 9e188027fc..525cd3531b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch index 725f4b5957..1f3f9e24ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 5 2001 Preston Brown <pbrown@redhat.com> - fix gethostbyname to work better with dot "." notation (#16949) diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch index 96d47c39f4..ea45777734 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c --- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch index 226106f4ff..77d5b42342 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Path: news.porcupine.org!news.porcupine.org!not-for-mail From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl> diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch index 260e8d3138..09a1e0527e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c --- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch index d473fb6342..895a72e6b4 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6/Makefile =================================================================== diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch index bd1396bc79..9503fb3c88 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch index eb5685c576..b6681df8ce 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch index 3ca6874119..0c8594cac3 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch index 3087377976..0c54ba6d35 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c --- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch index 965544cc0b..0fd2ca7b2b 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch @@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk <bunk@stusta.de> -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/options.c +++ b/options.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch index 27157a2e6d..d9a6909db7 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch @@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk <bunk@stusta.de> -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/clean_exit.c +++ b/clean_exit.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch index 4cc554fc38..9b1a3c0fa1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c --- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch index 3ba214d241..79b677f456 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6.orig/Makefile =================================================================== diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch index 797352579b..23762449ac 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch @@ -12,7 +12,7 @@ problem. Also fixed: Fatal error: can't create shared/hosts_access.o: No such file or directory -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch index 19bd7d3c0f..30e74a1de1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch index eee640e8a8..b998675aa0 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch @@ -1,7 +1,7 @@ __BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl glibc and uclibc had sys/cdefs.h doing it. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <raj.khem@gmail.com> Index: tcp_wrappers_7.6/tcpd.h diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch index 7650600ab5..f42b9d2799 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch @@ -1,6 +1,6 @@ STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch index 5875b81b2f..a864e38129 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff index 723f4f136a..2d0f548f89 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch index fc2afeef15..b6543fc92e 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c +++ tcp-wrappers-7.6-ipv6.1/safe_finger.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch index 9d7ea042b2..843063fd7c 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29 - added security patch tcp_wrappers-7.6-sig.patch diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch index 76dd6340b2..d4a1146594 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch index cf4f993c1a..fb64f93f1d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch @@ -7,7 +7,7 @@ Date: Tue Feb 12 09:53:50 2013 -0500 Added support for socklen_t type to len argument passed to socket related calls. This fixes a bug that causes tcp wrappers to fail when using sshd. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: farrah rashid <farrah.rashid@windriver.com> diff --git a/fix_options.c b/fix_options.c diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch index be29bdcfaa..2e3b1719fd 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch @@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c --- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index bcd1d6f792..8cf927153f 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -120,8 +120,8 @@ do_install () { install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 done - install -m 0644 ${WORKDIR}/try-from.8 ${D}${mandir}/man8/ - install -m 0644 ${WORKDIR}/safe_finger.8 ${D}${mandir}/man8/ + install -m 0644 ${UNPACKDIR}/try-from.8 ${D}${mandir}/man8/ + install -m 0644 ${UNPACKDIR}/safe_finger.8 ${D}${mandir}/man8/ install -d ${D}${includedir} install -m 0644 tcpd.h ${D}${includedir}/ diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index a942ac2991..51d9c92766 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -8,7 +8,8 @@ PV = "1.0" SRC_URI = "file://template.py file://COPYING" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit native diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index dd1960ffa7..2099b05db8 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb @@ -20,6 +20,7 @@ do_configure[cleandirs] = "${B}" B = "${WORKDIR}/build" do_compile() { + oe_runmake -C ${S} tzdata.zi for zone in ${TZONES}; do ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} @@ -37,6 +38,7 @@ do_install() { cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo + cp -pP "${S}/tzdata.zi" ${D}${datadir}/zoneinfo # Install default timezone if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then @@ -141,6 +143,7 @@ FILES:tzdata-core += " \ ${sysconfdir}/timezone \ ${datadir}/zoneinfo/leapseconds \ ${datadir}/zoneinfo/leap-seconds.list \ + ${datadir}/zoneinfo/tzdata.zi \ ${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/America/Anchorage \ ${datadir}/zoneinfo/America/Los_Angeles \ diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 27076d5d9b..c13e7a008e 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Utilities for extracting and viewing files in .zip archives" HOMEPAGE = "http://www.info-zip.org" DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" -LICENSE = "BSD-3-Clause" +LICENSE = "Info-ZIP" LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" PE = "1" diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index f138952128..17151ced5e 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb @@ -13,12 +13,15 @@ SRC_URI = " \ file://watchdog.conf \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + # The default value is 60 seconds when null. WATCHDOG_TIMEOUT ??= "" do_install() { - install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog - install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf + install -Dm 0644 ${UNPACKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog + install -Dm 0644 ${UNPACKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf if [ -n "${WATCHDOG_TIMEOUT}" ]; then echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf diff --git a/meta/recipes-extended/watchdog/watchdog-config/watchdog.default b/meta/recipes-extended/watchdog/watchdog-config/watchdog.default index 647d5abca5..cee5fdc2b6 100644 --- a/meta/recipes-extended/watchdog/watchdog-config/watchdog.default +++ b/meta/recipes-extended/watchdog/watchdog-config/watchdog.default @@ -1,2 +1,3 @@ # Start watchdog at boot time? 0 or 1 run_watchdog=1 +watchdog_module=none diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb index 5325ccafda..c88ea08ade 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb @@ -50,8 +50,8 @@ do_install:append() { install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} - install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog - install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive + install -Dm 0755 ${UNPACKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog + install -Dm 0755 ${UNPACKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive # watchdog.conf is provided by the watchdog-config recipe rm ${D}${sysconfdir}/watchdog.conf diff --git a/meta/recipes-extended/wget/wget/CVE-2024-38428.patch b/meta/recipes-extended/wget/wget/CVE-2024-38428.patch new file mode 100644 index 0000000000..ed99a05464 --- /dev/null +++ b/meta/recipes-extended/wget/wget/CVE-2024-38428.patch @@ -0,0 +1,79 @@ +From ed0c7c7e0e8f7298352646b2fd6e06a11e242ace Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Sun, 2 Jun 2024 12:40:16 +0200 +Subject: Properly re-implement userinfo parsing (rfc2396) + +* src/url.c (url_skip_credentials): Properly re-implement userinfo parsing (rfc2396) + +The reason why the implementation is based on RFC 2396, an outdated standard, +is that the whole file is based on that RFC, and mixing standard here might be +dangerous. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/wget.git/commit/?id=ed0c7c7e0e8f7298352646b2fd6e06a11e242ace] +CVE: CVE-2024-38428 +Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> +--- + src/url.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/src/url.c b/src/url.c +index 69e948b..07c3bc8 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -41,6 +41,7 @@ as that of the covered work. */ + #include "url.h" + #include "host.h" /* for is_valid_ipv6_address */ + #include "c-strcase.h" ++#include "c-ctype.h" + + #ifdef HAVE_ICONV + # include <iconv.h> +@@ -526,12 +527,39 @@ scheme_leading_string (enum url_scheme scheme) + static const char * + url_skip_credentials (const char *url) + { +- /* Look for '@' that comes before terminators, such as '/', '?', +- '#', or ';'. */ +- const char *p = (const char *)strpbrk (url, "@/?#;"); +- if (!p || *p != '@') +- return url; +- return p + 1; ++ /* ++ * This whole file implements https://www.rfc-editor.org/rfc/rfc2396 . ++ * RFC 2396 is outdated since 2005 and needs a rewrite or a thorough re-visit. ++ * ++ * The RFC says ++ * server = [ [ userinfo "@" ] hostport ] ++ * userinfo = *( unreserved | escaped | ";" | ":" | "&" | "=" | "+" | "$" | "," ) ++ * unreserved = alphanum | mark ++ * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" ++ */ ++ static const char *allowed = "-_.!~*'();:&=+$,"; ++ ++ for (const char *p = url; *p; p++) ++ { ++ if (c_isalnum(*p)) ++ continue; ++ ++ if (strchr(allowed, *p)) ++ continue; ++ ++ if (*p == '%' && c_isxdigit(p[1]) && c_isxdigit(p[2])) ++ { ++ p += 2; ++ continue; ++ } ++ ++ if (*p == '@') ++ return p + 1; ++ ++ break; ++ } ++ ++ return url; + } + + /* Parse credentials contained in [BEG, END). The region is expected +-- +cgit v1.1 + diff --git a/meta/recipes-extended/wget/wget_1.24.5.bb b/meta/recipes-extended/wget/wget_1.24.5.bb index 64e6ee80af..602fc9e627 100644 --- a/meta/recipes-extended/wget/wget_1.24.5.bb +++ b/meta/recipes-extended/wget/wget_1.24.5.bb @@ -1,5 +1,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://0002-improve-reproducibility.patch \ + file://CVE-2024-38428.patch \ " SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 72eb1ae067..897747379b 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb @@ -37,12 +37,12 @@ CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" do_install:append() { install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/default" - install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" - install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" + install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" + install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" # Install systemd unit files install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_system_unitdir}/xinetd.service diff --git a/meta/recipes-extended/xz/xz_5.4.6.bb b/meta/recipes-extended/xz/xz_5.6.2.bb index da3b75a10b..96fc691ef7 100644 --- a/meta/recipes-extended/xz/xz_5.4.6.bb +++ b/meta/recipes-extended/xz/xz_5.6.2.bb @@ -3,31 +3,32 @@ HOMEPAGE = "https://tukaani.org/xz/" DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." SECTION = "base" -# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the +# The source includes bits of 0BSD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the # only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our # packages, and the LGPL bits are under lib/, which appears to be used for # libgnu, which appears to be used for DOS builds. So we're left with -# GPL-2.0-or-later and PD. -LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" -LICENSE:${PN} = "GPL-2.0-or-later" -LICENSE:${PN}-dev = "GPL-2.0-or-later" +# GPL-2.0-or-later and 0BSD. +LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & 0BSD" +LICENSE:${PN} = "0BSD & GPL-2.0-or-later" +LICENSE:${PN}-dev = "0BSD & GPL-2.0-or-later" LICENSE:${PN}-staticdev = "GPL-2.0-or-later" -LICENSE:${PN}-doc = "GPL-2.0-or-later" +LICENSE:${PN}-doc = "0BSD & GPL-2.0-or-later" LICENSE:${PN}-dbg = "GPL-2.0-or-later" LICENSE:${PN}-locale = "GPL-2.0-or-later" -LICENSE:liblzma = "PD" +LICENSE:liblzma = "0BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4378ea9d5d1fc9ab0ae10d7948827d9 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c02de712b028a5cc7e22472e8f2b3db1 \ + file://COPYING.0BSD;md5=0672c210ce80c83444339b9aa31fee2f \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ - file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ + file://lib/getopt.c;endline=23;md5=3f33e207287bf72834f3ae8c247dfb6a \ " SRC_URI = "https://github.com/tukaani-project/xz/releases/download/v${PV}/xz-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c" +SRC_URI[sha256sum] = "8bfd20c0e1d86f0402f2497cfa71c6ab62d4cd35fd704276e3140bfb71414519" UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_URI = "https://github.com/tukaani-project/xz/releases/" @@ -35,6 +36,8 @@ CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh" inherit autotools gettext ptest +PACKAGECONFIG[landlock] = "--enable-sandbox=landlock,--enable-sandbox=no" + PACKAGES =+ "liblzma" FILES:liblzma = "${libdir}/liblzma*${SOLIBS}" diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch new file mode 100644 index 0000000000..0d3af37ded --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch @@ -0,0 +1,45 @@ +From 9db2f8cdbbc0dfb359d3b4e5dfe48c18652ce531 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 May 2024 19:02:46 -0700 +Subject: [PATCH] configure: Include dirent.h for closedir/opendir APIs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC-14 is strict about function prototypes and since the +testcase tries to compile/link opendir/closedir functions +without including signatures, it fails to build the test +due to missing signatures which come from dirent.h + +Therefore include the needed system header and make it more +robust. + +Fixes +a.c:2:21: error: implicit declaration of function ‘closedir’ [-Wimplicit-function-declaration] + 2 | int main() { return closedir(opendir(".")); } + | ^~~~~~~~ +a.c:2:30: error: implicit declaration of function ‘opendir’ [-Wimplicit-function-declaration] + 2 | int main() { return closedir(opendir(".")); } + | ^~~~~~~ + +Upstream-Status: Inactive-Upstream +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unix/configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/unix/configure b/unix/configure +index f917086..1dd98c6 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -591,6 +591,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null + + echo Check for directory libraries + cat > conftest.c << _EOF_ ++#include <dirent.h> + int main() { return closedir(opendir(".")); } + _EOF_ + +-- +2.45.0 + diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch deleted file mode 100644 index a86e03e620..0000000000 --- a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 10 Aug 2022 17:19:38 -0700 -Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE - -DIR is already provided on Linux via -/usr/include/dirent.h system header - -Upstream-Status: Inactive-Upstream -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - unix/unix.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/unix/unix.c b/unix/unix.c -index ba87614..6e6f4d2 100644 ---- a/unix/unix.c -+++ b/unix/unix.c -@@ -61,13 +61,11 @@ local time_t label_utim = 0; - /* Local functions */ - local char *readd OF((DIR *)); - -- - #ifdef NO_DIR /* for AT&T 3B1 */ - #include <sys/dir.h> - #ifndef dirent - # define dirent direct - #endif --typedef FILE DIR; - /* - ** Apparently originally by Rich Salz. - ** Cleaned up and modified by James W. Birdsall. --- -2.37.1 - diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 70df5ab872..58144baa14 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.info-zip.org" DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" -LICENSE = "BSD-3-Clause" +LICENSE = "Info-ZIP" LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" @@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://0002-configure-support-PIC-code-build.patch \ file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ file://0001-configure-Specify-correct-function-signatures-and-de.patch \ - file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \ file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ + file://0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" diff --git a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch b/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch deleted file mode 100644 index 847a641691..0000000000 --- a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 19 Jun 2023 17:10:09 +0200 -Subject: [PATCH] pzstd: use c++14 without conditions - -Doing this check with a direct c++ snippet is prone to portability problems: - -- \043 is not portable between shells: dash expands it to #, -bash does not; - -- using # directly works with make 4.3 but does not with make 4.2. - -Let's just use the c++ version that covers both the code and the gtest. - -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> - ---- - contrib/pzstd/Makefile | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile -index e62f8e87..58fb82a1 100644 ---- a/contrib/pzstd/Makefile -+++ b/contrib/pzstd/Makefile -@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations - PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I. - GTEST_INC = -isystem googletest/googletest/include - --# If default C++ version is older than C++11, explicitly set C++11, which is the --# minimum required by the code. --ifeq ($(shell echo "\043if __cplusplus < 201103L\n\043error\n\043endif" | $(CXX) -x c++ -Werror -c - -o /dev/null 2>/dev/null && echo 1 || echo 0),0) --PZSTD_CXX_STD := -std=c++11 --endif -+# Set the minimum required by gtest -+PZSTD_CXX_STD := -std=c++14 - - PZSTD_CPPFLAGS = $(PZSTD_INC) - PZSTD_CCXXFLAGS = diff --git a/meta/recipes-extended/zstd/zstd_1.5.5.bb b/meta/recipes-extended/zstd/zstd_1.5.6.bb index 2d72af50a4..0f3309d8af 100644 --- a/meta/recipes-extended/zstd/zstd_1.5.5.bb +++ b/meta/recipes-extended/zstd/zstd_1.5.6.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ " -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ - file://0001-pzstd-use-directly-for-the-test-c-snippet.patch" +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" -SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" +SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" CVE_PRODUCT = "zstandard" |