summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/acpica/acpica_20240827.bb (renamed from meta/recipes-extended/acpica/acpica_20240322.bb)4
-rw-r--r--meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb (renamed from meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb)6
-rw-r--r--meta/recipes-extended/at/at/posixtm.c4
-rw-r--r--meta/recipes-extended/at/at_3.2.5.bb8
-rw-r--r--meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb5
-rw-r--r--meta/recipes-extended/bash/bash.inc10
-rw-r--r--meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch21
-rw-r--r--meta/recipes-extended/bash/bash/build-tests.patch9
-rw-r--r--meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch31
-rw-r--r--meta/recipes-extended/bash/bash/fix-run-builtins.patch9
-rw-r--r--meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch18
-rw-r--r--meta/recipes-extended/bash/bash/test-output.patch11
-rw-r--r--meta/recipes-extended/bash/bash/use_aclocal.patch70
-rw-r--r--meta/recipes-extended/bash/bash_5.2.37.bb (renamed from meta/recipes-extended/bash/bash_5.2.21.bb)9
-rw-r--r--meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch44
-rw-r--r--meta/recipes-extended/bc/bc/libmath.h46
-rw-r--r--meta/recipes-extended/bc/bc/no-gen-libmath.patch24
-rw-r--r--meta/recipes-extended/bc/bc_1.08.2.bb (renamed from meta/recipes-extended/bc/bc_1.07.1.bb)14
-rw-r--r--meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch40
-rw-r--r--meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch31
-rw-r--r--meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch78
-rw-r--r--meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch19
-rw-r--r--meta/recipes-extended/blktool/blktool_4-7.1.bb29
-rw-r--r--meta/recipes-extended/bzip2/bzip2/0001-fix-bzip2-version-tmp-aaa-will-hang.patch62
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.8.bb32
-rw-r--r--meta/recipes-extended/cpio/cpio_2.15.bb19
-rw-r--r--meta/recipes-extended/cpio/files/test.sh9
-rw-r--r--meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch339
-rw-r--r--meta/recipes-extended/cracklib/cracklib_2.10.3.bb (renamed from meta/recipes-extended/cracklib/cracklib_2.9.11.bb)5
-rw-r--r--meta/recipes-extended/cronie/cronie/make_error_func_prototype_complete.patch41
-rw-r--r--meta/recipes-extended/cronie/cronie_1.7.2.bb (renamed from meta/recipes-extended/cronie/cronie_1.7.1.bb)10
-rw-r--r--meta/recipes-extended/cups/cups.inc6
-rw-r--r--meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch11
-rw-r--r--meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch16
-rw-r--r--meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch12
-rw-r--r--meta/recipes-extended/cups/cups/libexecdir.patch5
-rw-r--r--meta/recipes-extended/cups/cups_2.4.12.bb (renamed from meta/recipes-extended/cups/cups_2.4.7.bb)2
-rw-r--r--meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb6
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.12.bb (renamed from meta/recipes-extended/diffutils/diffutils_3.10.bb)6
-rw-r--r--meta/recipes-extended/ed/ed_1.21.1.bb (renamed from meta/recipes-extended/ed/ed_1.20.1.bb)8
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch7
-rw-r--r--meta/recipes-extended/ethtool/ethtool_6.14.bb (renamed from meta/recipes-extended/ethtool/ethtool_6.7.bb)4
-rw-r--r--meta/recipes-extended/findutils/findutils.inc1
-rw-r--r--meta/recipes-extended/findutils/findutils/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/findutils/findutils/run-ptest31
-rw-r--r--meta/recipes-extended/findutils/findutils_4.10.0.bb (renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb)5
-rw-r--r--meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch35
-rw-r--r--meta/recipes-extended/gawk/gawk_5.3.2.bb (renamed from meta/recipes-extended/gawk/gawk_5.3.0.bb)7
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch67
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch6
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch9
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb)6
-rw-r--r--meta/recipes-extended/go-examples/go-helloworld_0.1.bb9
-rw-r--r--meta/recipes-extended/gperf/gperf_3.1.bb3
-rw-r--r--meta/recipes-extended/grep/grep_3.12.bb (renamed from meta/recipes-extended/grep/grep_3.11.bb)5
-rw-r--r--meta/recipes-extended/groff/files/0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch31
-rw-r--r--meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch27
-rw-r--r--meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch38
-rw-r--r--meta/recipes-extended/groff/groff_1.23.0.bb3
-rw-r--r--meta/recipes-extended/gzip/files/run-ptest5
-rw-r--r--meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch)13
-rw-r--r--meta/recipes-extended/gzip/gzip.inc4
-rw-r--r--meta/recipes-extended/gzip/gzip_1.14.bb (renamed from meta/recipes-extended/gzip/gzip_1.13.bb)8
-rw-r--r--meta/recipes-extended/hdparm/hdparm_9.65.bb3
-rw-r--r--meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch45
-rw-r--r--meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch31
-rw-r--r--meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch49
-rw-r--r--meta/recipes-extended/iptables/iptables_1.8.11.bb (renamed from meta/recipes-extended/iptables/iptables_1.8.10.bb)19
-rw-r--r--meta/recipes-extended/iputils/iputils_20250605.bb (renamed from meta/recipes-extended/iputils/iputils_20240117.bb)22
-rw-r--r--meta/recipes-extended/less/less_678.bb (renamed from meta/recipes-extended/less/less_643.bb)6
-rw-r--r--meta/recipes-extended/libaio/libaio_0.3.113.bb1
-rw-r--r--meta/recipes-extended/libarchive/libarchive/configurehack.patch49
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.8.1.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.7.2.bb)11
-rw-r--r--meta/recipes-extended/libidn/libidn2_2.3.8.bb (renamed from meta/recipes-extended/libidn/libidn2_2.3.7.bb)12
-rw-r--r--meta/recipes-extended/libmnl/libmnl_1.0.5.bb2
-rw-r--r--meta/recipes-extended/libnsl/libnsl2_2.0.1.bb (renamed from meta/recipes-extended/libnsl/libnsl2_git.bb)8
-rw-r--r--meta/recipes-extended/libnss-nis/libnss-nis.bb2
-rw-r--r--meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb (renamed from meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb)5
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch5
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.7.33.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.7.28.bb)6
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch64
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch60
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/ipv6.patch52
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb (renamed from meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb)7
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.79.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.75.bb)8
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.22.0.bb (renamed from meta/recipes-extended/logrotate/logrotate_3.21.0.bb)4
-rw-r--r--meta/recipes-extended/lsb/lsb-release_1.4.bb2
-rw-r--r--meta/recipes-extended/lsof/lsof_4.99.4.bb (renamed from meta/recipes-extended/lsof/lsof_4.99.3.bb)4
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch32
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch9
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch42
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-kernel-kvm-don-t-hardcode-objcopy.patch69
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch34
-rw-r--r--meta/recipes-extended/ltp/ltp_20250130.bb (renamed from meta/recipes-extended/ltp/ltp_20240129.bb)25
-rw-r--r--meta/recipes-extended/lzip/lzip_1.25.bb (renamed from meta/recipes-extended/lzip/lzip_1.24.1.bb)4
-rw-r--r--meta/recipes-extended/lzip/lzlib_1.15.bb (renamed from meta/recipes-extended/lzip/lzlib_1.14.bb)2
-rw-r--r--meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch38
-rw-r--r--meta/recipes-extended/man-db/man-db_2.13.1.bb (renamed from meta/recipes-extended/man-db/man-db_2.12.1.bb)18
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch31
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch33
-rw-r--r--meta/recipes-extended/man-pages/man-pages_6.14.bb (renamed from meta/recipes-extended/man-pages/man-pages_6.06.bb)16
-rw-r--r--meta/recipes-extended/mc/files/nomandate.patch4
-rw-r--r--meta/recipes-extended/mc/mc_4.8.33.bb (renamed from meta/recipes-extended/mc/mc_4.8.31.bb)6
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch6
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch6
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch44
-rw-r--r--meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch36
-rw-r--r--meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch56
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch25
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch39
-rw-r--r--meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch18
-rw-r--r--meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch24
-rw-r--r--meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch10
-rw-r--r--meta/recipes-extended/mdadm/files/debian-no-Werror.patch29
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch36
-rw-r--r--meta/recipes-extended/mdadm/files/xmalloc.patch32
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.4.bb (renamed from meta/recipes-extended/mdadm/mdadm_4.3.bb)39
-rw-r--r--meta/recipes-extended/mingetty/mingetty_1.08.bb5
-rw-r--r--meta/recipes-extended/minicom/minicom_2.10.bb (renamed from meta/recipes-extended/minicom/minicom_2.9.bb)2
-rw-r--r--meta/recipes-extended/msmtp/msmtp_1.8.30.bb (renamed from meta/recipes-extended/msmtp/msmtp_1.8.25.bb)2
-rw-r--r--meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch91
-rw-r--r--meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch31
-rw-r--r--meta/recipes-extended/net-tools/net-tools_2.10.bb8
-rw-r--r--meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch29
-rw-r--r--meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch26
-rw-r--r--meta/recipes-extended/newt/files/cross_ar.patch56
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.24.bb56
-rw-r--r--meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch40
-rw-r--r--meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch42
-rw-r--r--meta/recipes-extended/pam/libpam/libpam-xtests.patch45
-rw-r--r--meta/recipes-extended/pam/libpam_1.7.0.bb (renamed from meta/recipes-extended/pam/libpam_1.6.0.bb)56
-rw-r--r--meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch40
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb17
-rw-r--r--meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb1
-rw-r--r--meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb2
-rw-r--r--meta/recipes-extended/perl/libtimedate-perl_2.30.bb3
-rw-r--r--meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb5
-rw-r--r--meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb3
-rw-r--r--meta/recipes-extended/perl/libxml-sax-perl_1.02.bb3
-rw-r--r--meta/recipes-extended/procps/procps_4.0.5.bb (renamed from meta/recipes-extended/procps/procps_4.0.4.bb)8
-rw-r--r--meta/recipes-extended/psmisc/psmisc.inc59
-rw-r--r--meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch47
-rw-r--r--meta/recipes-extended/psmisc/psmisc_23.7.bb59
-rw-r--r--meta/recipes-extended/quota/quota/0001-Fix-building-on-musl.patch228
-rw-r--r--meta/recipes-extended/quota/quota/fcntl.patch70
-rw-r--r--meta/recipes-extended/quota/quota_4.09.bb2
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch21
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/rpcbind.systemd3
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/rpcbind.tmpfiles1
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb (renamed from meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb)18
-rw-r--r--meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb2
-rw-r--r--meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch23
-rw-r--r--meta/recipes-extended/scdoc/scdoc_1.11.3.bb20
-rw-r--r--meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch31
-rw-r--r--meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch58
-rw-r--r--meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch30
-rw-r--r--meta/recipes-extended/screen/screen_5.0.0.bb (renamed from meta/recipes-extended/screen/screen_4.9.1.bb)13
-rw-r--r--meta/recipes-extended/sed/sed_4.9.bb1
-rw-r--r--meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch37
-rw-r--r--meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch6
-rw-r--r--meta/recipes-extended/shadow/files/disable_syslog.patch22
-rw-r--r--meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch18
-rw-r--r--meta/recipes-extended/shadow/shadow-securetty_4.6.bb5
-rw-r--r--meta/recipes-extended/shadow/shadow-sysroot_4.6.bb3
-rw-r--r--meta/recipes-extended/shadow/shadow_4.15.0.bb10
-rw-r--r--meta/recipes-extended/shadow/shadow_4.17.4.bb (renamed from meta/recipes-extended/shadow/shadow.inc)41
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.17.06.bb)5
-rw-r--r--meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch7
-rw-r--r--meta/recipes-extended/sudo/sudo.inc2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.17.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.15p5.bb)4
-rwxr-xr-xmeta/recipes-extended/sysklogd/sysklogd/sysklogd (renamed from meta/recipes-extended/sysklogd/files/sysklogd)0
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb (renamed from meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb)8
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.7.7.bb (renamed from meta/recipes-extended/sysstat/sysstat_12.7.5.bb)7
-rw-r--r--meta/recipes-extended/tar/tar/run-ptest12
-rw-r--r--meta/recipes-extended/tar/tar_1.35.bb6
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch2
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb9
-rw-r--r--meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb2
-rw-r--r--meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py6
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch29
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch12
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch68
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch11
-rw-r--r--meta/recipes-extended/texinfo/texinfo_7.2.bb (renamed from meta/recipes-extended/texinfo/texinfo_7.1.bb)6
-rw-r--r--meta/recipes-extended/time/time/0001-Fix-the-type-for-sighandler_t.patch27
-rw-r--r--meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch33
-rw-r--r--meta/recipes-extended/time/time_1.9.bb8
-rw-r--r--meta/recipes-extended/timezone/timezone.inc10
-rw-r--r--meta/recipes-extended/timezone/tzcode-native.bb2
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb3
-rw-r--r--meta/recipes-extended/unzip/unzip/gcc15.patch17
-rw-r--r--meta/recipes-extended/unzip/unzip_6.0.bb6
-rw-r--r--meta/recipes-extended/watchdog/watchdog-config.bb6
-rw-r--r--meta/recipes-extended/watchdog/watchdog-config/watchdog.default1
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.16.bb5
-rw-r--r--meta/recipes-extended/wget/wget.inc8
-rw-r--r--meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch6
-rw-r--r--meta/recipes-extended/wget/wget_1.25.0.bb (renamed from meta/recipes-extended/wget/wget_1.24.5.bb)4
-rw-r--r--meta/recipes-extended/which/which-2.21/0001-getopt-Fix-signature-of-getenv-function.patch39
-rw-r--r--meta/recipes-extended/which/which_2.21.bb3
-rw-r--r--meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb1
-rw-r--r--meta/recipes-extended/xinetd/xinetd/0001-Use-monotonic-time.patch325
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb11
-rw-r--r--meta/recipes-extended/xz/xz_5.8.1.bb (renamed from meta/recipes-extended/xz/xz_5.4.6.bb)23
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch45
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-fileio.c-fix-a-buffer-overflow-detected-issue.patch38
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch35
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb9
-rw-r--r--meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch39
-rw-r--r--meta/recipes-extended/zstd/zstd_1.5.7.bb (renamed from meta/recipes-extended/zstd/zstd_1.5.5.bb)7
240 files changed, 2288 insertions, 2817 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20240322.bb b/meta/recipes-extended/acpica/acpica_20240827.bb
index 90e3599d32..f9f9f9f687 100644
--- a/meta/recipes-extended/acpica/acpica_20240322.bb
+++ b/meta/recipes-extended/acpica/acpica_20240827.bb
@@ -17,9 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
17DEPENDS = "m4-native flex-native bison-native" 17DEPENDS = "m4-native flex-native bison-native"
18 18
19SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master" 19SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master"
20SRCREV = "170fc3076a86777077637f10b05c32ac21ac13aa" 20SRCREV = "e80cbd7b52de20aa8c75bfba9845e9cb61f2e681"
21
22S = "${WORKDIR}/git"
23 21
24inherit update-alternatives 22inherit update-alternatives
25 23
diff --git a/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb b/meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb
index e112eb513d..848c380363 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_10.2.0.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb
@@ -10,15 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=aaee33adce0fc7cc40fee23f82f7f101 \
10 " 10 "
11 11
12SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main" 12SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main"
13SRCREV = "545b79b8d7dae70d12bf0657359bdd36de0c5c26" 13SRCREV = "21e33efe96ba9a51d99d1150691dae750afd6ed1"
14 14
15DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 15DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
16 16
17S = "${WORKDIR}/git"
18
19# Tell xmllint where to find the DocBook XML catalogue, because right now it 17# Tell xmllint where to find the DocBook XML catalogue, because right now it
20# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch 18# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch
21export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" 19export SGML_CATALOG_FILES = "file://${STAGING_ETCDIR_NATIVE}/xml/catalog"
22 20
23inherit setuptools3 21inherit setuptools3
24CLEANBROKEN = "1" 22CLEANBROKEN = "1"
diff --git a/meta/recipes-extended/at/at/posixtm.c b/meta/recipes-extended/at/at/posixtm.c
index 5514ba4fe2..bba8312d9a 100644
--- a/meta/recipes-extended/at/at/posixtm.c
+++ b/meta/recipes-extended/at/at/posixtm.c
@@ -20,7 +20,7 @@
20/* Yacc-based version written by Jim Kingdon and David MacKenzie. 20/* Yacc-based version written by Jim Kingdon and David MacKenzie.
21 Rewritten by Jim Meyering. */ 21 Rewritten by Jim Meyering. */
22 22
23#include <config.h> 23#include "config.h"
24 24
25#include "posixtm.h" 25#include "posixtm.h"
26 26
@@ -42,8 +42,6 @@
42 of `digit' even when the host does not conform to POSIX. */ 42 of `digit' even when the host does not conform to POSIX. */
43#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) 43#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
44 44
45time_t mktime ();
46
47/* 45/*
48 POSIX requires: 46 POSIX requires:
49 47
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"
55do_patch[postfuncs] += "copy_posix_files" 55do_patch[postfuncs] += "copy_posix_files"
56 56
57copy_posix_files() { 57copy_posix_files() {
58 cp -f ${WORKDIR}/posixtm.[ch] ${S} 58 cp -f ${UNPACKDIR}/posixtm.[ch] ${S}
59} 59}
60 60
61do_install () { 61do_install () {
62 oe_runmake -e "IROOT=${D}" install 62 oe_runmake -e "IROOT=${D}" install
63 63
64 install -d ${D}${sysconfdir}/init.d 64 install -d ${D}${sysconfdir}/init.d
65 install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd 65 install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd
66 66
67 # install systemd unit files 67 # install systemd unit files
68 install -d ${D}${systemd_system_unitdir} 68 install -d ${D}${systemd_system_unitdir}
69 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} 69 install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir}
70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service 70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service
71 71
72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
73 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 73 install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd
74 fi 74 fi
75 rm -f ${D}${datadir}/at/batch-job 75 rm -f ${D}${datadir}/at/batch-job
76} 76}
diff --git a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
index 6832ccc541..80fdf26c05 100644
--- a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
+++ b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
@@ -8,9 +8,7 @@ SRCREV = "db2bf750eaef7fc0832e13ada8291343bbcc3afe"
8PV = "0.1+git" 8PV = "0.1+git"
9 9
10SRC_URI = "git://github.com/ahcbb6/baremetal-helloqemu.git;protocol=https;branch=master" 10SRC_URI = "git://github.com/ahcbb6/baremetal-helloqemu.git;protocol=https;branch=master"
11UPSTREAM_VERSION_UNKNOWN="1" 11UPSTREAM_VERSION_UNKNOWN = "1"
12
13S = "${WORKDIR}/git"
14 12
15# The following variables should be set to accomodate each application 13# The following variables should be set to accomodate each application
16BAREMETAL_BINNAME ?= "hello_baremetal_${MACHINE}" 14BAREMETAL_BINNAME ?= "hello_baremetal_${MACHINE}"
@@ -23,7 +21,6 @@ IMAGE_NAME_SUFFIX ?= ""
23# firmware from Linux 21# firmware from Linux
24inherit baremetal-image 22inherit baremetal-image
25 23
26
27# startup code for x86 uses NASM syntax 24# startup code for x86 uses NASM syntax
28DEPENDS:qemux86:append = " nasm-native" 25DEPENDS:qemux86:append = " nasm-native"
29 26
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index e541161c75..634209c911 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -7,7 +7,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv"
7 7
8inherit autotools gettext texinfo update-alternatives ptest 8inherit autotools gettext texinfo update-alternatives ptest
9 9
10EXTRA_AUTORECONF += "--exclude=autoheader" 10EXTRA_AUTORECONF += "--exclude=autoheader,aclocal"
11EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8" 11EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8"
12 12
13# If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the 13# If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the
@@ -46,12 +46,6 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " \
46 46
47CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" 47CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}"
48 48
49do_configure:prepend () {
50 if [ ! -e ${S}/acinclude.m4 ]; then
51 cat ${S}/aclocal.m4 > ${S}/acinclude.m4
52 fi
53}
54
55do_compile:prepend() { 49do_compile:prepend() {
56 # Remove any leftover .build files. This ensures that bash always has the 50 # Remove any leftover .build files. This ensures that bash always has the
57 # same version number and keeps builds reproducible 51 # same version number and keeps builds reproducible
@@ -108,7 +102,7 @@ do_install_ptest () {
108 cp ${B}/config.h ${D}${PTEST_PATH} 102 cp ${B}/config.h ${D}${PTEST_PATH}
109 cp ${B}/version.h ${D}${PTEST_PATH} 103 cp ${B}/version.h ${D}${PTEST_PATH}
110 cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} 104 cp ${S}/y.tab.[ch] ${D}${PTEST_PATH}
111 install -D ${WORKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests 105 install -D ${UNPACKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests
112 sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ 106 sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
113 -e 's|${DEBUG_PREFIX_MAP}||g' \ 107 -e 's|${DEBUG_PREFIX_MAP}||g' \
114 -e 's|${BUILD_LDFLAGS}||g' \ 108 -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 @@
1From 721d5be99eb37d31e48bd66d61808a66a4c5ab84 Mon Sep 17 00:00:00 2001 1From e4b9493ae4923595ec3ca67f85322129fb3056cf Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu> 2From: Chet Ramey <chet.ramey@case.edu>
3Date: Mon, 30 Oct 2023 12:16:07 -0400 3Date: Mon, 30 Oct 2023 12:16:07 -0400
4Subject: [PATCH] changes to SIGINT handler while waiting for a child; skip 4Subject: [PATCH] changes to SIGINT handler while waiting for a child; skip
@@ -20,10 +20,10 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
20 6 files changed, 43 insertions(+), 32 deletions(-) 20 6 files changed, 43 insertions(+), 32 deletions(-)
21 21
22diff --git a/general.c b/general.c 22diff --git a/general.c b/general.c
23index 85c5a8b6..65e2ee06 100644 23index bda39f4..94a5339 100644
24--- a/general.c 24--- a/general.c
25+++ b/general.c 25+++ b/general.c
26@@ -262,8 +262,9 @@ legal_number (string, result) 26@@ -264,8 +264,9 @@ legal_number (string, result)
27 if (errno || ep == string) 27 if (errno || ep == string)
28 return 0; /* errno is set on overflow or underflow */ 28 return 0; /* errno is set on overflow or underflow */
29 29
@@ -36,7 +36,7 @@ index 85c5a8b6..65e2ee06 100644
36 36
37 /* If *string is not '\0' but *ep is '\0' on return, the entire string 37 /* If *string is not '\0' but *ep is '\0' on return, the entire string
38diff --git a/jobs.c b/jobs.c 38diff --git a/jobs.c b/jobs.c
39index 6b986ed7..262d78de 100644 39index d3e4ab0..903cf9c 100644
40--- a/jobs.c 40--- a/jobs.c
41+++ b/jobs.c 41+++ b/jobs.c
42@@ -2718,6 +2718,10 @@ wait_for_background_pids (ps) 42@@ -2718,6 +2718,10 @@ wait_for_background_pids (ps)
@@ -96,7 +96,7 @@ index 6b986ed7..262d78de 100644
96 waiting_for_child = 0; 96 waiting_for_child = 0;
97 if (old_sigint_handler == SIG_IGN) 97 if (old_sigint_handler == SIG_IGN)
98 set_signal_handler (SIGINT, old_sigint_handler); 98 set_signal_handler (SIGINT, old_sigint_handler);
99@@ -4136,7 +4144,7 @@ set_job_status_and_cleanup (job) 99@@ -4141,7 +4149,7 @@ set_job_status_and_cleanup (job)
100 SIGINT (if we reset the sighandler to the default). 100 SIGINT (if we reset the sighandler to the default).
101 In this case, we have to fix things up. What a crock. */ 101 In this case, we have to fix things up. What a crock. */
102 if (temp_handler == trap_handler && signal_is_trapped (SIGINT) == 0) 102 if (temp_handler == trap_handler && signal_is_trapped (SIGINT) == 0)
@@ -106,7 +106,7 @@ index 6b986ed7..262d78de 100644
106 if (temp_handler == SIG_DFL) 106 if (temp_handler == SIG_DFL)
107 termsig_handler (SIGINT); /* XXX */ 107 termsig_handler (SIGINT); /* XXX */
108diff --git a/tests/redir.right b/tests/redir.right 108diff --git a/tests/redir.right b/tests/redir.right
109index 8db10414..9e1403c8 100644 109index 8db1041..9e1403c 100644
110--- a/tests/redir.right 110--- a/tests/redir.right
111+++ b/tests/redir.right 111+++ b/tests/redir.right
112@@ -154,10 +154,10 @@ foo 112@@ -154,10 +154,10 @@ foo
@@ -123,7 +123,7 @@ index 8db10414..9e1403c8 100644
123+./redir11.sub: line 77: 42: No such file or directory 123+./redir11.sub: line 77: 42: No such file or directory
124 42 124 42
125diff --git a/tests/redir11.sub b/tests/redir11.sub 125diff --git a/tests/redir11.sub b/tests/redir11.sub
126index d417cdb6..ca9854cd 100644 126index d417cdb..ca9854c 100644
127--- a/tests/redir11.sub 127--- a/tests/redir11.sub
128+++ b/tests/redir11.sub 128+++ b/tests/redir11.sub
129@@ -34,6 +34,8 @@ a=4 b=7 ss=4 declare -i ss 129@@ -34,6 +34,8 @@ a=4 b=7 ss=4 declare -i ss
@@ -136,7 +136,7 @@ index d417cdb6..ca9854cd 100644
136 a=4 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 3'; } 136 a=4 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 3'; }
137 a=1 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 4'; } 137 a=1 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 4'; }
138diff --git a/tests/type.right b/tests/type.right 138diff --git a/tests/type.right b/tests/type.right
139index bbc228e8..e0a66745 100644 139index bbc228e..c0c1c8b 100644
140--- a/tests/type.right 140--- a/tests/type.right
141+++ b/tests/type.right 141+++ b/tests/type.right
142@@ -24,15 +24,15 @@ func () 142@@ -24,15 +24,15 @@ func ()
@@ -164,7 +164,7 @@ index bbc228e8..e0a66745 100644
164 builtin is a shell builtin 164 builtin is a shell builtin
165 /bin/sh 165 /bin/sh
166diff --git a/tests/type.tests b/tests/type.tests 166diff --git a/tests/type.tests b/tests/type.tests
167index fd39c18a..ddc15407 100644 167index fd39c18..ddc1540 100644
168--- a/tests/type.tests 168--- a/tests/type.tests
169+++ b/tests/type.tests 169+++ b/tests/type.tests
170@@ -25,8 +25,6 @@ type -r ${THIS_SH} 170@@ -25,8 +25,6 @@ type -r ${THIS_SH}
@@ -221,6 +221,3 @@ index fd39c18a..ddc15407 100644
221 type m 221 type m
222 222
223 hash -r 223 hash -r
224--
2252.35.5
226
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch
index ea38bace9b..4cce1ba993 100644
--- a/meta/recipes-extended/bash/bash/build-tests.patch
+++ b/meta/recipes-extended/bash/bash/build-tests.patch
@@ -1,24 +1,23 @@
1From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001 1From c3f58f8b4f7a359b9d9dd97a45bcaab50a89d224 Mon Sep 17 00:00:00 2001
2From: Anders Roxell <anders.roxell@enea.com> 2From: Anders Roxell <anders.roxell@enea.com>
3Date: Wed, 19 Dec 2012 17:18:31 +0100 3Date: Wed, 19 Dec 2012 17:18:31 +0100
4Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking 4Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking
5 dependencies. 5 dependencies.
6 6
7Upstream-Status: Pending 7Upstream-Status: Inappropriate [ptest specific]
8Signed-off-by: Anders Roxell <anders.roxell@enea.com> 8Signed-off-by: Anders Roxell <anders.roxell@enea.com>
9 9
10Rebase to 5.0 10Rebase to 5.0
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13--- 12---
14 Makefile.in | 24 +++++++++++++++++++----- 13 Makefile.in | 24 +++++++++++++++++++-----
15 1 file changed, 19 insertions(+), 5 deletions(-) 14 1 file changed, 19 insertions(+), 5 deletions(-)
16 15
17diff --git a/Makefile.in b/Makefile.in 16diff --git a/Makefile.in b/Makefile.in
18index bc97049..937ce39 100644 17index 0b4df73..7e2a34e 100644
19--- a/Makefile.in 18--- a/Makefile.in
20+++ b/Makefile.in 19+++ b/Makefile.in
21@@ -943,20 +943,34 @@ maybe-clean: 20@@ -958,20 +958,34 @@ maybe-clean:
22 fi 21 fi
23 22
24 recho$(EXEEXT): $(SUPPORT_SRC)recho.c 23 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
new file mode 100644
index 0000000000..c5082ee355
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch
@@ -0,0 +1,31 @@
1From 16951b74971c7fd38fd036dac1410a9e53cbe736 Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu>
3Date: Fri, 7 Apr 2023 00:28:46 -0700
4Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit
5 enabled
6
7This is a trimmed-down version of a commit in the bash 'devel' branch
8[1] that contains this fix as well as other unrelated ones.
9
10[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=ec9447ce9392a0f93d96789c3741285fede8a150
11
12Upstream-Status: Backport
13
14Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
15---
16 builtins/evalstring.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/builtins/evalstring.c b/builtins/evalstring.c
20index 53a7c0b..c5075cc 100644
21--- a/builtins/evalstring.c
22+++ b/builtins/evalstring.c
23@@ -753,7 +753,7 @@ open_redir_file (r, fnp)
24 fd = open(fn, O_RDONLY);
25 if (fd < 0)
26 {
27- file_error (fn);
28+ internal_error ("%s: %s", fn, strerror (errno));
29 free (fn);
30 if (fnp)
31 *fnp = 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 @@
1From 0c4cab9594c96c2dc435a8d9724605824bcbf917 Mon Sep 17 00:00:00 2001 1From 15601c71b073a604ccda25c7f14f0bb12e9a3b28 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 19 Apr 2016 02:57:45 -0400 3Date: Tue, 19 Apr 2016 02:57:45 -0400
4Subject: [PATCH] fix run-builtins failed 4Subject: [PATCH] fix run-builtins failed
@@ -16,10 +16,10 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/tests/builtins.tests b/tests/builtins.tests 18diff --git a/tests/builtins.tests b/tests/builtins.tests
19index 9d77520..63f3af8 100644 19index 8eee43e..71c9eee 100644
20--- a/tests/builtins.tests 20--- a/tests/builtins.tests
21+++ b/tests/builtins.tests 21+++ b/tests/builtins.tests
22@@ -109,7 +109,7 @@ esac 22@@ -124,7 +124,7 @@ esac
23 23
24 # test options to exec 24 # test options to exec
25 (exec -a specialname ${THIS_SH} -c 'echo $0' ) 25 (exec -a specialname ${THIS_SH} -c 'echo $0' )
@@ -28,6 +28,3 @@ index 9d77520..63f3af8 100644
28 # test `clean' environment. if /bin/sh is bash, and the script version of 28 # test `clean' environment. if /bin/sh is bash, and the script version of
29 # printenv is run, there will be variables in the environment that bash 29 # printenv is run, there will be variables in the environment that bash
30 # sets on startup. Also test code that prefixes argv[0] with a dash. 30 # sets on startup. Also test code that prefixes argv[0] with a dash.
31--
322.8.1
33
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 @@
1From d11685286144c2e5630545e435d11387b2908fd0 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Wed, 14 Nov 2012 07:55:09 -0700
4Subject: [PATCH] bash: fix mkbuiltins build failure
5
1On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by 6On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by
2the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers 7the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers
3use the STRING() macro from unistd.h. A header in the bash sources overrides 8use 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
13defined, letting the unistd.h one be used, instead. 18defined, letting the unistd.h one be used, instead.
14 19
15Upstream-Status: Pending 20Upstream-Status: Pending
21---
22 builtins/mkbuiltins.c | 1 +
23 1 file changed, 1 insertion(+)
16 24
17--- bash-4.2.orig/builtins/mkbuiltins.c 25diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
18+++ bash-4.2/builtins/mkbuiltins.c 26index f505ebd..b5b2eed 100644
27--- a/builtins/mkbuiltins.c
28+++ b/builtins/mkbuiltins.c
19@@ -28,6 +28,7 @@ 29@@ -28,6 +28,7 @@
20 # define HAVE_STDLIB_H 30 # define HAVE_STDLIB_H
21 31
22 # define HAVE_RENAME 32 # define HAVE_RENAME
23+# define HAVE_STRINGIZE 33+# define HAVE_STRINGIZE
24 #endif /* CROSS_COMPILING */ 34 #endif /* CROSS_COMPILING */
25 35
26 #if defined (HAVE_UNISTD_H) 36 #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 @@
1From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001 1From f5cbd5a4954b89857c9e397cacceda552484f5d5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 10:01:56 +0800 3Date: Tue, 15 Aug 2017 10:01:56 +0800
4Subject: [PATCH 1/2] Add FAIL/PASS output to test output. 4Subject: [PATCH] Add FAIL/PASS output to test output.
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16 1 file changed, 10 insertions(+), 1 deletion(-) 16 1 file changed, 10 insertions(+), 1 deletion(-)
17 17
18diff --git a/tests/run-all b/tests/run-all 18diff --git a/tests/run-all b/tests/run-all
19index 2882fe0..e21d026 100644 19index 1f74923..ba36a1f 100644
20--- a/tests/run-all 20--- a/tests/run-all
21+++ b/tests/run-all 21+++ b/tests/run-all
22@@ -33,7 +33,16 @@ do 22@@ -57,7 +57,16 @@ do
23 case $x in 23 case $x in
24 $0|run-minimal|run-gprof) ;; 24 $0|run-minimal|run-gprof) ;;
25 *.orig|*~) ;; 25 *.orig|*~) ;;
@@ -37,6 +37,3 @@ index 2882fe0..e21d026 100644
37 esac 37 esac
38 done 38 done
39 39
40--
411.8.3.1
42
diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch
deleted file mode 100644
index bd6870b386..0000000000
--- a/meta/recipes-extended/bash/bash/use_aclocal.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 28 Dec 2020 21:04:27 +0100
4Subject: [PATCH] bash: update 5.0 -> 5.1
5
6Including m4 files directly like this confuses autotools.bbclass, remove
7the references and rely upon aclocal to collect the m4 files together
8as needed instead making it work like other autotools based projects.
9
10Upstream-Status: Inappropriate [OE configuration specific]
11RP 2021/1/20
12
13---
14 configure.ac | 43 -------------------------------------------
15 1 file changed, 43 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index 50a6e20..a3b5bd7 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -710,49 +710,6 @@ if test x$SIZE = x; then
22 fi
23 AC_SUBST(SIZE)
24
25-m4_include([m4/stat-time.m4])
26-m4_include([m4/timespec.m4])
27-
28-m4_include([m4/strtoimax.m4])
29-
30-dnl include files for gettext
31-
32-m4_include([m4/codeset.m4])
33-m4_include([m4/extern-inline.m4])
34-m4_include([m4/fcntl-o.m4])
35-m4_include([m4/gettext.m4])
36-m4_include([m4/glibc2.m4])
37-m4_include([m4/glibc21.m4])
38-m4_include([m4/host-cpu-c-abi.m4])
39-m4_include([m4/iconv.m4])
40-m4_include([m4/intdiv0.m4])
41-m4_include([m4/intl.m4])
42-m4_include([m4/intlmacosx.m4])
43-m4_include([m4/intl-thread-locale.m4])
44-m4_include([m4/intmax.m4])
45-m4_include([m4/inttypes-pri.m4])
46-m4_include([m4/inttypes.m4])
47-m4_include([m4/inttypes_h.m4])
48-m4_include([m4/lcmessage.m4])
49-m4_include([m4/lib-ld.m4])
50-m4_include([m4/lib-link.m4])
51-m4_include([m4/lib-prefix.m4])
52-m4_include([m4/lock.m4])
53-m4_include([m4/nls.m4])
54-m4_include([m4/po.m4])
55-m4_include([m4/printf-posix.m4])
56-m4_include([m4/progtest.m4])
57-m4_include([m4/pthread_rwlock_rdlock.m4])
58-m4_include([m4/size_max.m4])
59-m4_include([m4/stdint_h.m4])
60-m4_include([m4/threadlib.m4])
61-m4_include([m4/uintmax_t.m4])
62-m4_include([m4/ulonglong.m4])
63-m4_include([m4/visibility.m4])
64-m4_include([m4/wchar_t.m4])
65-m4_include([m4/wint_t.m4])
66-m4_include([m4/xsize.m4])
67-
68 dnl C compiler characteristics
69 AC_C_CONST
70 AC_C_INLINE
diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.37.bb
index 46d921bbe6..2c0645cbd9 100644
--- a/meta/recipes-extended/bash/bash_5.2.21.bb
+++ b/meta/recipes-extended/bash/bash_5.2.37.bb
@@ -11,13 +11,18 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
11 file://run-ptest \ 11 file://run-ptest \
12 file://run-bash-ptests \ 12 file://run-bash-ptests \
13 file://fix-run-builtins.patch \ 13 file://fix-run-builtins.patch \
14 file://use_aclocal.patch \
15 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ 14 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
15 file://fix-filesubst-errexit.patch \
16 " 16 "
17 17
18SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" 18SRC_URI[tarball.sha256sum] = "9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff"
19 19
20DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 20DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
21DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 21DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
22 22
23CFLAGS += "-std=gnu17"
24# mkbuiltins.c is built with native toolchain and needs gnu17 as well:
25# http://errors.yoctoproject.org/Errors/Details/853016/
26BUILD_CFLAGS += "-std=gnu17"
27
23BBCLASSEXTEND = "nativesdk" 28BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch b/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch
deleted file mode 100644
index 1ef797dd66..0000000000
--- a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From e174b6e7d195d5a7465575641b7f68581f162574 Mon Sep 17 00:00:00 2001
2From: Li Zhou <li.zhou@windriver.com>
3Date: Thu, 27 Jun 2019 13:10:47 +0800
4Subject: [PATCH] dc: fix exit code of q command
5
6The exit code for "echo q | dc" is 1 for dc-1.4.1;
7while the exit code for "echo q | dc" is 0 for dc-1.4.
8
9Here is the answer from ken@gnu.org:
10dc-1.4 was right. There was a rewrite of a chunk of code for 1.4.1 to
11fix a corner case in the Q command, and somehow the placement of the
12clean-up label for the 'q' command got misplaced on the error-handling
13branch instead of the clean-exit branch. The patch below fixes this
14(it is committed for whenever the next bc/dc release gets made).
15
16Thanks for the report,
17 --Ken Pizzini
18
19Upstream-Status: Backport [Got the solution from maintainer]
20
21Signed-off-by: Li Zhou <li.zhou@windriver.com>
22---
23 dc/eval.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/dc/eval.c b/dc/eval.c
27index 05a3d9e..bcab8db 100644
28--- a/dc/eval.c
29+++ b/dc/eval.c
30@@ -814,10 +814,10 @@ error_fail:
31 fprintf(stderr, "%s: ", progname);
32 perror("error reading input");
33 return DC_FAIL;
34-reset_and_exit_quit:
35 reset_and_exit_fail:
36 signal(SIGINT, sigint_default);
37 return DC_FAIL;
38+reset_and_exit_quit:
39 reset_and_exit_success:
40 signal(SIGINT, sigint_default);
41 return DC_SUCCESS;
42--
431.9.1
44
diff --git a/meta/recipes-extended/bc/bc/libmath.h b/meta/recipes-extended/bc/bc/libmath.h
deleted file mode 100644
index 63e1acb9ef..0000000000
--- a/meta/recipes-extended/bc/bc/libmath.h
+++ /dev/null
@@ -1,46 +0,0 @@
1{"@iK20:s2:p@r",
2"@iF1,5.6,7,8,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C1,0:",
3"s14:pl7:s0:pl14:RN1:l5:0<Z2:1s12:pl5:ns5:pN2:l2:s15:pK6:l15:+",
4"K.44:l5:*+s13:pl5:cS1+s2:pN3:l5:1>Z4:l10:1+s10:pl5:K2:/s5:pl2:",
5"1+s2:pJ3:N4:l13:s2:p1l5:+s14:pl5:s6:p1s8:pK2:s11:pN6:1B7:J5:N8:",
6"l11:i11:pJ6:N7:l6:l5:*s6:l8:l11:*s8:/s9:pl9:0=Z9:l10:0>Z10:N11:",
7"l10:d10:Z12:l14:l14:*s14:pJ11:N12:N10:l15:s2:pl12:Z13:1l14:/R",
8"N13:l14:1/RN9:l14:l9:+s14:pJ8:N5:0R]@r",
9"@iF2,5.7,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C2,0:",
10"s14:pl7:s0:pl14:RN1:l5:0{Z2:1K10:l2:^-1/RN2:l2:s15:pK6:l2:+s2:",
11"pK2:s10:p0s11:pN3:l5:K2:}Z4:l10:K2:*s10:pl5:cRs5:pJ3:N4:N5:l5:",
12"K.5:{Z6:l10:K2:*s10:pl5:cRs5:pJ5:N6:l5:1-l5:1+/s13:s14:pl13:l13:",
13"*s12:pK3:s11:pN8:1B9:J7:N10:l11:K2:+s11:pJ8:N9:l13:l12:*s13:l11:",
14"/s9:pl9:0=Z11:l10:l14:*s14:pl15:s2:pl14:1/RN11:l14:l9:+s14:pJ10:N7:",
15"0R]@r",
16"@iF3,5.7,9,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C3,0:",
17"s14:pl7:s0:pl14:RN1:l2:s15:pK1.1:l15:*K2:+s2:p1C4,0:s14:pl5:0",
18"<Z2:1s12:pl5:ns5:pN2:0s2:pl5:l14:/K2:+K4:/s13:pl5:K4:l13:*l14:",
19"*-s5:pl13:K2:%Z3:l5:ns5:pN3:l15:K2:+s2:pl5:s9:s14:pl5:nl5:*s16:",
20"pK3:s11:pN5:1B6:J4:N7:l11:K2:+s11:pJ5:N6:l9:l16:l11:l11:1-*/*",
21"s9:pl9:0=Z8:l15:s2:pl12:Z9:l14:n1/RN9:l14:1/RN8:l14:l9:+s14:p",
22"J7:N4:0R]@r",
23"@iF5,5.7,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C5,0:s14:pl7:s0:pl14:",
24"RN1:l2:s15:pl2:K1.2:*s2:pl5:1C4,0:K2:*+C3,0:s14:pl15:s2:pl14:",
25"1/R0R]@r",
26"@iF4,5.6,7,9,10,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:",
27"C4,0:s14:pl7:s0:pl14:RN1:1s12:pl5:0<Z2:1ns12:pl5:ns5:pN2:l5:1",
28"=Z3:l2:K25:{Z4:K.7853981633974483096156608:l12:/RN4:l2:K40:{Z5:",
29"K.7853981633974483096156608458198757210492:l12:/RN5:l2:K60:{Z6:",
30"K.785398163397448309615660845819875721049292349843776455243736",
31":l12:/RN6:N3:l5:K.2:=Z7:l2:K25:{Z8:K.1973955598498807583700497",
32":l12:/RN8:l2:K40:{Z9:K.1973955598498807583700497651947902934475",
33":l12:/RN9:l2:K60:{Z10:K.197395559849880758370049765194790293447585103787852101517688",
34":l12:/RN10:N7:l2:s15:pl5:K.2:>Z11:l15:K5:+s2:pK.2:C4,0:s6:pN11:",
35"l15:K3:+s2:pN12:l5:K.2:>Z13:l10:1+s10:pl5:K.2:-1l5:K.2:*+/s5:",
36"pJ12:N13:l5:s13:s14:pl5:nl5:*s16:pK3:s11:pN15:1B16:J14:N17:l11:",
37"K2:+s11:pJ15:N16:l13:l16:*s13:l11:/s9:pl9:0=Z18:l15:s2:pl10:l6:",
38"*l14:+l12:/RN18:l14:l9:+s14:pJ17:N14:0R]@r",
39"@iF6,13,5.6,7,8,9,10,11,12,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl13:",
40"l5:C6,00:s14:pl7:s0:pl14:RN1:l2:s15:p0s2:pl13:1/s13:pl13:0<Z2:",
41"l13:ns13:pl13:K2:%1=Z3:1s12:pN3:N2:1s10:pK2:s11:pN5:l11:l13:{",
42"B6:J4:N7:l11:i11:pJ5:N6:l10:l11:*s10:pJ7:N4:K1.5:l15:*s2:pl5:",
43"l13:^K2:l13:^/l10:/s10:p1s9:s14:pl5:nl5:*K4:/s16:pK1.5:l15:*l10:",
44"cL+l10:cS-s2:p1s11:pN9:1B10:J8:N11:l11:i11:pJ9:N10:l9:l16:*l11:",
45"/l13:l11:+/s9:pl9:0=Z12:l15:s2:pl12:Z13:l10:nl14:*1/RN13:l10:",
46"l14:*1/RN12:l14:l9:+s14:pJ11:N8:0R]@r",0}
diff --git a/meta/recipes-extended/bc/bc/no-gen-libmath.patch b/meta/recipes-extended/bc/bc/no-gen-libmath.patch
deleted file mode 100644
index c4cce58759..0000000000
--- a/meta/recipes-extended/bc/bc/no-gen-libmath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1These rules are not cross-friendly so delete them and we'll generate the file offline.
2
3Upstream-Status: Inappropriate
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/bc/Makefile.am b/bc/Makefile.am
7index d9d412e..f244241 100644
8--- a/bc/Makefile.am
9+++ b/bc/Makefile.am
10@@ -31,14 +31,6 @@ global.o: libmath.h
11
12 fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o
13
14-libmath.h: libmath.b $(fbcOBJ) $(LIBBC)
15- echo '{0}' > libmath.h
16- $(MAKE) global.o
17- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS)
18- ./fbc -c $(srcdir)/libmath.b </dev/null >libmath.h
19- $(srcdir)/fix-libmath_h
20- rm -f ./fbc ./global.o
21-
22 sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \
23 warranty.o
24 sbc.o: sbc.c
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.08.2.bb
index 819da6cda6..cebfed9642 100644
--- a/meta/recipes-extended/bc/bc_1.07.1.bb
+++ b/meta/recipes-extended/bc/bc_1.08.2.bb
@@ -5,20 +5,16 @@ DESCRIPTION = "bc is an arbitrary precision numeric processing language. Syntax
5LICENSE = "GPL-3.0-or-later" 5LICENSE = "GPL-3.0-or-later"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
7 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ 7 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
8 file://bc/bcdefs.h;endline=17;md5=4295c06df9e833519a342f7b5d43db06 \ 8 file://bc/bcdefs.h;endline=17;md5=f4a0239b216b8407783955e74938f190 \
9 file://dc/dc.h;endline=18;md5=36b8c600b63ee8c3aeade2764f6b2a4b \ 9 file://dc/dc.h;endline=18;md5=bad31533d57fe5948c996f9ef6643206 \
10 file://lib/number.c;endline=20;md5=cf43068cc88f837731dc53240456cfaf" 10 file://lib/number.c;endline=20;md5=cf43068cc88f837731dc53240456cfaf"
11 11
12SECTION = "base" 12SECTION = "base"
13DEPENDS = "flex-native" 13DEPENDS = "flex-native"
14 14
15SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ 15SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
16 file://no-gen-libmath.patch \
17 file://libmath.h \
18 file://0001-dc-fix-exit-code-of-q-command.patch \
19 file://run-ptest" 16 file://run-ptest"
20SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc" 17SRC_URI[sha256sum] = "ae470fec429775653e042015edc928d07c8c3b2fc59765172a330d3d87785f86"
21SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
22 18
23inherit autotools texinfo update-alternatives ptest 19inherit autotools texinfo update-alternatives ptest
24 20
@@ -26,10 +22,6 @@ PACKAGECONFIG ??= "readline"
26PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" 22PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
27PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" 23PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
28 24
29do_compile:prepend() {
30 cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h
31}
32
33do_install_ptest() { 25do_install_ptest() {
34 install ${S}/Test/*.b ${D}${PTEST_PATH} 26 install ${S}/Test/*.b ${D}${PTEST_PATH}
35} 27}
diff --git a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
deleted file mode 100644
index 25a2fabe15..0000000000
--- a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 9cb1667f9d3a9bcfc3b83466cd8d3b79f0554ff0 Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Wed, 8 Jul 2015 01:37:09 +0300
4Subject: [PATCH 1/3] fix typos in manpage
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 blktool.8 | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/blktool.8 b/blktool.8
17index a1f5c96..45b7724 100644
18--- a/blktool.8
19+++ b/blktool.8
20@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate)
21 Query the detected (or overridden, via -t) device class.
22 Typically this will result in 'ATA' or 'SCSI' for most devices.
23 Detection is based on device major; thus your SATA device may appear as
24-'SCSI'.
25+\&'SCSI'.
26
27 .TP
28 .B cd-speed
29@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state.
30
31 .TP
32 .B media
33-Lock in (or unlock) a removeable device.
34+Lock in (or unlock) a removable device.
35
36 .TP
37 .B multiple-count
38--
392.1.4
40
diff --git a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
deleted file mode 100644
index 401e41e3ed..0000000000
--- a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From ddb1071da2c78d8155aab62e9f0d46f69500200f Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Wed, 8 Jul 2015 01:42:24 +0300
4Subject: [PATCH 2/3] fix string error
5
6This patch is taken from
7ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
8
9Upstream-Status: Inappropriate [upstream is dead]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 util.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/util.c b/util.c
17index 1f3a9ca..2ccf56a 100644
18--- a/util.c
19+++ b/util.c
20@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr)
21 if (perr)
22 perror(msg);
23 else
24- fprintf(stderr, msg);
25+ fprintf(stderr, "%s", msg);
26 if (blkdev >= 0)
27 close(blkdev);
28 exit(1);
29--
302.1.4
31
diff --git a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
deleted file mode 100644
index d1f1e797fe..0000000000
--- a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From 68faa63aaad81f4a289e4a03173ab4cf798deb53 Mon Sep 17 00:00:00 2001
2From: Azat Khuzhin <a3at.mail@gmail.com>
3Date: Sat, 1 Nov 2014 22:24:32 +0300
4Subject: [PATCH 3/3] Fix 3-d argument for BLKROSET it must be 'const int *'
5
6Most of *SET ioctls have int type for 3-d argument, except BLKROSET.
7So add bc_arg_type enum, build it into bool_comand and install arg_type
8to bc_arg_int_ptr for BLKROSET only.
9
10Debian-bug-id: 641164
11Link: https://bugs.debian.org/641164
12
13This patch is taken from
14ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz
15
16Upstream-Status: Inappropriate [upstream is dead]
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18
19---
20 blktool.c | 11 +++++++++--
21 blktool.h | 7 +++++++
22 2 files changed, 16 insertions(+), 2 deletions(-)
23
24diff --git a/blktool.c b/blktool.c
25index fbefecd..221a195 100644
26--- a/blktool.c
27+++ b/blktool.c
28@@ -85,7 +85,7 @@ static struct bool_command bool_cmd_tbl[] = {
29 { { DEF_BOOL("pio-data"), dc_ata, DEF_HDIO(32BIT) },
30 "16-bit", "32-bit" },
31 { { DEF_BOOL("readonly"), dc_any, IOCNAME(BLKROGET), IOCNAME(BLKROSET) },
32- DEF_BOOLSTR },
33+ DEF_BOOLSTR, bc_arg_int_ptr },
34 { { DEF_BOOL("unmask-irq"), dc_ata, DEF_HDIO(UNMASKINTR) },
35 DEF_BOOLSTR },
36 { { "wcache", ct_bool, handle_wcache, dc_any,
37@@ -171,7 +171,14 @@ static void handle_bool(int argc, char **argv, struct command *cmd)
38
39 } else if ((argc == 4) && (cmd->write_ioctl_name != NULL)) {
40 do_32 = parse_bool(argc, argv, bcm);
41- if (ioctl(blkdev, cmd->write_ioctl, do_32))
42+
43+ int ret;
44+ if (bcm->arg_type == bc_arg_int_ptr) {
45+ ret = ioctl(blkdev, cmd->write_ioctl, &do_32);
46+ } else {
47+ ret = ioctl(blkdev, cmd->write_ioctl, do_32);
48+ }
49+ if (ret)
50 pdie(cmd->write_ioctl_name, 1);
51 }
52 else {
53diff --git a/blktool.h b/blktool.h
54index fce4387..85add83 100644
55--- a/blktool.h
56+++ b/blktool.h
57@@ -85,11 +85,18 @@ struct command {
58 const char *write_ioctl_name;
59 };
60
61+enum bc_arg_type {
62+ bc_arg_int,
63+ bc_arg_int_ptr,
64+};
65+
66 struct bool_command {
67 struct command cmd;
68
69 const char *str_false;
70 const char *str_true;
71+
72+ enum bc_arg_type arg_type;
73 };
74
75 struct class_operations {
76--
772.1.4
78
diff --git a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
deleted file mode 100644
index 65bca65100..0000000000
--- a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Description: Fix FTBFS with glibc 2.28
2Author: Adrian Bunk <bunk@debian.org>
3Bug-Debian: https://bugs.debian.org/917055
4
5This patch is taken from
6http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz
7
8Upstream-Status: Inappropriate [upstream is dead]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10--- blktool-4.orig/blktool.c
11+++ blktool-4/blktool.c
12@@ -18,6 +18,7 @@
13 #include <unistd.h>
14 #include <sys/stat.h>
15 #include <sys/ioctl.h>
16+#include <sys/sysmacros.h>
17 #include <fcntl.h>
18 #include <errno.h>
19 #include <getopt.h>
diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb
deleted file mode 100644
index bb44befb56..0000000000
--- a/meta/recipes-extended/blktool/blktool_4-7.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "Tune low-level block device parameters"
2DESCRIPTION = "blktool is used for querying and/or changing settings \
3of a block device. It is like hdparm but a more general tool, as it \
4works on SCSI, IDE and SATA devices."
5HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool"
6LICENSE = "GPL-2.0-or-later"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373"
9
10DEPENDS = "glib-2.0"
11
12SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \
13 file://0001-fix-typos-in-manpage.patch \
14 file://0002-fix-string-error.patch \
15 file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
16 file://0004-fix-ftbfs-glibc-2.28.patch \
17 "
18
19SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
20SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764"
21
22# for this package we're mostly interested in tracking debian patches,
23# and not in the upstream version where all development has effectively stopped
24UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/"
25UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)"
26
27S = "${WORKDIR}/${BPN}-4.orig"
28
29inherit autotools pkgconfig
diff --git a/meta/recipes-extended/bzip2/bzip2/0001-fix-bzip2-version-tmp-aaa-will-hang.patch b/meta/recipes-extended/bzip2/bzip2/0001-fix-bzip2-version-tmp-aaa-will-hang.patch
new file mode 100644
index 0000000000..84206b2a4d
--- /dev/null
+++ b/meta/recipes-extended/bzip2/bzip2/0001-fix-bzip2-version-tmp-aaa-will-hang.patch
@@ -0,0 +1,62 @@
1From a9dd6acbaca836fc4e943e69a31b2e7acda32045 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 13 Nov 2024 19:49:23 +0800
4Subject: [PATCH] fix 'bzip2 --version > /tmp/aaa 2>&1' hang
5
6According to [1]
7
8As of the current version 1.0.8, bzip2 --version will print version
9info but it will also continue compressing stdin:
10
11 $ ./bzip2 --version
12 bzip2, a block-sorting file compressor. Version 1.0.8, 13-Jul-2019.
13
14 Copyright (C) 1996-2019 by Julian Seward.
15
16 This program is free software; [...]
17
18 bzip2: I won't write compressed data to a terminal.
19 bzip2: For help, type: `bzip2 --help'.
20
21Debian (and its downstreams like Ubuntu) will patch this out [2],
22making the < /dev/null unnecessary:
23
24[1] https://stackoverflow.com/questions/59757176/why-using-dev-null-with-a-program-like-bzip2
25[2] https://sources.debian.org/src/bzip2/1.0.8-6/debian/patches/20-legacy.patch/
26
27Upstream-Status: Submitted [bzip2-devel@sourceware.org]
28
29Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
30---
31 bzip2.c | 8 +++++---
32 1 file changed, 5 insertions(+), 3 deletions(-)
33
34diff --git a/bzip2.c b/bzip2.c
35index d95d280..6ec9871 100644
36--- a/bzip2.c
37+++ b/bzip2.c
38@@ -1890,7 +1890,9 @@ IntNative main ( IntNative argc, Char *argv[] )
39 case '8': blockSize100k = 8; break;
40 case '9': blockSize100k = 9; break;
41 case 'V':
42- case 'L': license(); break;
43+ case 'L': license();
44+ exit ( 0 );
45+ break;
46 case 'v': verbosity++; break;
47 case 'h': usage ( progName );
48 exit ( 0 );
49@@ -1916,8 +1918,8 @@ IntNative main ( IntNative argc, Char *argv[] )
50 if (ISFLAG("--keep")) keepInputFiles = True; else
51 if (ISFLAG("--small")) smallMode = True; else
52 if (ISFLAG("--quiet")) noisy = False; else
53- if (ISFLAG("--version")) license(); else
54- if (ISFLAG("--license")) license(); else
55+ if (ISFLAG("--version")) { license(); exit ( 0 ); } else
56+ if (ISFLAG("--license")) { license(); exit ( 0 ); } else
57 if (ISFLAG("--exponential")) workFactor = 1; else
58 if (ISFLAG("--repetitive-best")) redundant(aa->name); else
59 if (ISFLAG("--repetitive-fast")) redundant(aa->name); else
60--
612.34.1
62
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 4e3a06f240..5b10821ccb 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -14,20 +14,20 @@ LICENSE:libbz2 = "bzip2-1.0.6"
14LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" 14LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib"
15 15
16LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ 16LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \
17 file://${WORKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ 17 file://${UNPACKDIR}/bzip2-tests/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
18 file://${WORKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \ 18 file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
19 file://${WORKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \ 19 file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
20 file://${WORKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \ 20 file://${UNPACKDIR}/bzip2-tests/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
21 file://${WORKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 21 file://${UNPACKDIR}/bzip2-tests/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
22" 22"
23 23
24SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ 24SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
25 git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https \ 25 git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https;destsuffix=bzip2-tests/ \
26 file://configure.ac;subdir=${BP} \ 26 file://configure.ac;subdir=${BP} \
27 file://Makefile.am;subdir=${BP} \ 27 file://Makefile.am;subdir=${BP} \
28 file://run-ptest \ 28 file://run-ptest \
29 file://0001-fix-bzip2-version-tmp-aaa-will-hang.patch;subdir=${BP} \
29 " 30 "
30SRC_URI[md5sum] = "67e051268d0c475ea773822f7500d0e5"
31SRC_URI[sha256sum] = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269" 31SRC_URI[sha256sum] = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"
32 32
33SRCREV_bzip2-tests = "f9061c030a25de5b6829e1abf373057309c734c0" 33SRCREV_bzip2-tests = "f9061c030a25de5b6829e1abf373057309c734c0"
@@ -36,7 +36,7 @@ UPSTREAM_CHECK_URI = "https://www.sourceware.org/pub/bzip2/"
36 36
37PACKAGES =+ "libbz2" 37PACKAGES =+ "libbz2"
38 38
39CFLAGS:append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" 39CFLAGS += "-fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
40 40
41inherit autotools update-alternatives ptest relative_symlinks 41inherit autotools update-alternatives ptest relative_symlinks
42 42
@@ -52,13 +52,13 @@ do_configure:prepend () {
52 52
53do_install_ptest () { 53do_install_ptest () {
54 install -d ${D}${PTEST_PATH}/bzip2-tests 54 install -d ${D}${PTEST_PATH}/bzip2-tests
55 cp -r ${WORKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress 55 cp -r ${UNPACKDIR}/bzip2-tests/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
56 cp -r ${WORKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip 56 cp -r ${UNPACKDIR}/bzip2-tests/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
57 cp -r ${WORKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go 57 cp -r ${UNPACKDIR}/bzip2-tests/go ${D}${PTEST_PATH}/bzip2-tests/go
58 cp -r ${WORKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2 58 cp -r ${UNPACKDIR}/bzip2-tests/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
59 cp -r ${WORKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate 59 cp -r ${UNPACKDIR}/bzip2-tests/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
60 cp ${WORKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/ 60 cp ${UNPACKDIR}/bzip2-tests/README ${D}${PTEST_PATH}/bzip2-tests/
61 cp ${WORKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/ 61 cp ${UNPACKDIR}/bzip2-tests/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
62 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile 62 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
63} 63}
64 64
@@ -66,5 +66,7 @@ FILES:libbz2 = "${libdir}/lib*${SOLIBS}"
66 66
67RDEPENDS:${PN}-ptest += "make bash" 67RDEPENDS:${PN}-ptest += "make bash"
68 68
69CVE_PRODUCT = "bzip:bzip2"
70
69PROVIDES:append:class-native = " bzip2-replacement-native" 71PROVIDES:append:class-native = " bzip2-replacement-native"
70BBCLASSEXTEND = "native nativesdk" 72BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb
index 52070f59a2..fa011251e2 100644
--- a/meta/recipes-extended/cpio/cpio_2.15.bb
+++ b/meta/recipes-extended/cpio/cpio_2.15.bb
@@ -16,9 +16,12 @@ SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee41834
16inherit autotools gettext texinfo ptest 16inherit autotools gettext texinfo ptest
17 17
18CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" 18CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS"
19CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html"
19 20
20EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" 21EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
21 22
23CFLAGS += "-std=gnu17"
24
22do_install () { 25do_install () {
23 autotools_do_install 26 autotools_do_install
24 if [ "${base_bindir}" != "${bindir}" ]; then 27 if [ "${base_bindir}" != "${bindir}" ]; then
@@ -34,10 +37,10 @@ do_install () {
34} 37}
35 38
36do_compile_ptest() { 39do_compile_ptest() {
37 oe_runmake -C ${B}/gnu/ check 40 # Forcibly regenerate this script so we get our --am-fmt option
38 oe_runmake -C ${B}/lib/ check 41 rm -f ${S}/tests/testsuite
39 oe_runmake -C ${B}/rmt/ check 42 oe_runmake -C ${B}/tests/ testsuite
40 oe_runmake -C ${B}/src/ check 43
41 oe_runmake -C ${B}/tests/ genfile 44 oe_runmake -C ${B}/tests/ genfile
42} 45}
43 46
@@ -50,7 +53,7 @@ do_install_ptest() {
50 install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ 53 install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/
51 install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ 54 install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/
52 install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ 55 install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/
53 install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh 56 install --mode=755 ${UNPACKDIR}/test.sh ${D}${PTEST_PATH}/test.sh
54 sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh 57 sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh
55} 58}
56 59
@@ -63,10 +66,10 @@ do_install_ptest_base:append() {
63} 66}
64 67
65# The tests need to run as a non-root user, so pull in the ptest user 68# The tests need to run as a non-root user, so pull in the ptest user
66DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" 69DEPENDS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'ptest-runner', '', d)}"
67PACKAGE_WRITE_DEPS += "ptest-runner" 70PACKAGE_WRITE_DEPS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'ptest-runner', '', d)}"
68 71
69RDEPENDS:${PN}-ptest += "ptest-runner" 72RDEPENDS:${PN}-ptest += "ptest-runner coreutils"
70 73
71PACKAGES =+ "${PN}-rmt" 74PACKAGES =+ "${PN}-rmt"
72 75
diff --git a/meta/recipes-extended/cpio/files/test.sh b/meta/recipes-extended/cpio/files/test.sh
index f027574e86..e966ed91f8 100644
--- a/meta/recipes-extended/cpio/files/test.sh
+++ b/meta/recipes-extended/cpio/files/test.sh
@@ -1,10 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Define cpio test work dir 3cd @PTEST_PATH@/tests/
4WORKDIR=@PTEST_PATH@/tests/
5 4
6# Run test 5./testsuite --am-fmt
7cd ${WORKDIR}
8./atconfig ./atlocal ./testsuite
9
10./testsuite 2>&1 | grep -E '[0-9]{1,3}: ' | sed -e 's/^.....//' -e '/[ok]$/s/^/PASS: /;/FAILED (.*)/s/^/FAIL: /;/skipped (.*)/s/^/SKIP: /;/expected failure/ s/^/PASS: /;/UNEXPECTED PASS/s/^/FAIL: /' -e 's/ok$//g' -e 's/FAILED.*//g' -e 's/skipped.*//g' -e 's/expected failure.*//g' -e 's/UNEXPECTED PASS.*//g'
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 @@
1From aae03b7e626d5f62ab929d51d11352a5a2ff6b2d Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Tue, 9 Jun 2015 11:11:48 +0900
4Subject: [PATCH 1/2] packlib.c: support dictionary byte order dependent
5
6The previous dict files are NOT byte-order independent, in fact they are
7probably ARCHITECTURE SPECIFIC.
8Create the dict files in big endian, and convert to host endian while
9load them. This could fix the endian issue on multiple platform.
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/41]
13
14We can't use the endian.h, htobe* and be*toh functions because they are
15not available on older versions of glibc, such as that found in RHEL
165.9.
17
18Change to checking endian and directly calling bswap_* as defined in
19byteswap.h.
20
21Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
22
23Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
24---
25 lib/packlib.c | 214 +++++++++++++++++++++++++++++++++++++++++++++-
26 1 file changed, 210 insertions(+), 4 deletions(-)
27
28diff --git a/lib/packlib.c b/lib/packlib.c
29index 9396e1d..d0bb181 100644
30--- a/lib/packlib.c
31+++ b/lib/packlib.c
32@@ -16,6 +16,12 @@
33 #ifdef HAVE_STDINT_H
34 #include <stdint.h>
35 #endif
36+
37+#ifndef _BSD_SOURCE
38+#define _BSD_SOURCE /* See feature_test_macros(7) */
39+#endif
40+#include <endian.h>
41+#include <byteswap.h>
42 #include "packer.h"
43
44 #define DEBUG 0
45@@ -43,6 +49,185 @@ typedef struct
46 char data_get[NUMWORDS][MAXWORDLEN];
47 } PWDICT64;
48
49+enum{
50+ en_is32,
51+ en_is64
52+};
53+
54+static int
55+IheaderHostToBigEndian(char *pHeader, int nBitType)
56+{
57+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
58+ {
59+ struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader;
60+
61+ pHeader64->pih_magic = bswap_64(pHeader64->pih_magic);
62+ pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords);
63+ pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen);
64+ pHeader64->pih_pad = bswap_16(pHeader64->pih_pad);
65+
66+#if DEBUG
67+ printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n",
68+ pHeader64->pih_magic, pHeader64->pih_numwords,
69+ pHeader64->pih_blocklen, pHeader64->pih_pad);
70+#endif
71+ }
72+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
73+ {
74+ struct pi_header *pHeader32 = (struct pi_header*)pHeader;
75+
76+ pHeader32->pih_magic = bswap_32(pHeader32->pih_magic);
77+ pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords);
78+ pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen);
79+ pHeader32->pih_pad = bswap_16(pHeader32->pih_pad);
80+
81+#if DEBUG
82+ printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n",
83+ pHeader32->pih_magic, pHeader32->pih_numwords,
84+ pHeader32->pih_blocklen, pHeader32->pih_pad);
85+#endif
86+ }
87+ else if (__BYTE_ORDER == __LITTLE_ENDIAN)
88+ {
89+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
90+ return (-1);
91+ }
92+
93+ return 0;
94+}
95+
96+static int
97+IheaderBigEndianToHost(char *pHeader, int nBitType)
98+{
99+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
100+ {
101+ struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader;
102+
103+ pHeader64->pih_magic = bswap_64(pHeader64->pih_magic);
104+ pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords);
105+ pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen);
106+ pHeader64->pih_pad = bswap_16(pHeader64->pih_pad);
107+
108+#if DEBUG
109+ printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n",
110+ pHeader64->pih_magic, pHeader64->pih_numwords,
111+ pHeader64->pih_blocklen, pHeader64->pih_pad);
112+#endif
113+ }
114+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
115+ {
116+ struct pi_header *pHeader32 = (struct pi_header*)pHeader;
117+
118+ pHeader32->pih_magic = bswap_32(pHeader32->pih_magic);
119+ pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords);
120+ pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen);
121+ pHeader32->pih_pad = bswap_16(pHeader32->pih_pad);
122+
123+#if DEBUG
124+ printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n",
125+ pHeader32->pih_magic, pHeader32->pih_numwords,
126+ pHeader32->pih_blocklen, pHeader32->pih_pad);
127+#endif
128+ }
129+ else if (__BYTE_ORDER == __LITTLE_ENDIAN)
130+ {
131+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
132+ return (-1);
133+ }
134+
135+ return 0;
136+}
137+
138+static int
139+HwmsHostToBigEndian(char *pHwms, int nLen,int nBitType)
140+{
141+ int i = 0;
142+
143+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
144+ {
145+ uint64_t *pHwms64 = (uint64_t*)pHwms;
146+
147+ for (i = 0; i < nLen / sizeof(uint64_t); i++)
148+ {
149+ *pHwms64 = bswap_64(*pHwms64);
150+ *pHwms64++;
151+ }
152+
153+ }
154+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
155+ {
156+ uint32_t *pHwms32 = (uint32_t*)pHwms;
157+
158+ for (i = 0; i < nLen / sizeof(uint32_t); i++)
159+ {
160+ *pHwms32 = bswap_32(*pHwms32);
161+ *pHwms32++;
162+ }
163+
164+ }
165+ else if (__BYTE_ORDER == __LITTLE_ENDIAN)
166+ {
167+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
168+ return (-1);
169+ }
170+
171+#if DEBUG
172+ for (i = 0; i < nLen; i+=8)
173+ {
174+ printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n",
175+ nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF,
176+ pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF,
177+ pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF);
178+ }
179+#endif
180+
181+ return 0;
182+}
183+
184+static int
185+HwmsBigEndianToHost(char *pHwms, int nLen, int nBitType)
186+{
187+ int i = 0;
188+
189+ if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
190+ {
191+ uint64_t *pHwms64 = (uint64_t*)pHwms;
192+
193+ for (i = 0; i < nLen / sizeof(uint64_t); i++)
194+ {
195+ *pHwms64++ = bswap_64(*pHwms64);
196+ }
197+
198+ }
199+ else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
200+ {
201+ uint32_t *pHwms32 = (uint32_t*)pHwms;
202+
203+ for (i = 0; i < nLen / sizeof(uint32_t); i++)
204+ {
205+ *pHwms32 = bswap_32(*pHwms32);
206+ *pHwms32++;
207+ }
208+
209+ }
210+ else if (__BYTE_ORDER == __LITTLE_ENDIAN)
211+ {
212+ fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
213+ return (-1);
214+ }
215+
216+#if DEBUG
217+ for (i = 0; i < nLen; i+=8)
218+ {
219+ printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n",
220+ nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF,
221+ pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF,
222+ pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF);
223+ }
224+#endif
225+
226+ return 0;
227+}
228
229 static int
230 _PWIsBroken64(FILE *ifp)
231@@ -55,6 +240,7 @@ _PWIsBroken64(FILE *ifp)
232 return 0;
233 }
234
235+ IheaderBigEndianToHost((char *) &pdesc64.header, en_is64);
236 return (pdesc64.header.pih_magic == PIH_MAGIC);
237 }
238
239@@ -147,7 +333,11 @@ PWOpen(prefix, mode)
240 pdesc.header.pih_blocklen = NUMWORDS;
241 pdesc.header.pih_numwords = 0;
242
243- fwrite((char *) &pdesc.header, sizeof(pdesc.header), 1, ifp);
244+ struct pi_header tmpheader32;
245+
246+ memcpy(&tmpheader32, &pdesc.header, sizeof(pdesc.header));
247+ IheaderHostToBigEndian((char *) &tmpheader32, en_is32);
248+ fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, ifp);
249 } else
250 {
251 pdesc.flags &= ~PFOR_WRITE;
252@@ -171,6 +361,7 @@ PWOpen(prefix, mode)
253 return NULL;
254 }
255
256+ IheaderBigEndianToHost((char *) &pdesc.header, en_is32);
257 if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0))
258 {
259 /* uh-oh. either a broken "64-bit" file or a garbage file. */
260@@ -193,6 +384,7 @@ PWOpen(prefix, mode)
261 }
262 return NULL;
263 }
264+ IheaderBigEndianToHost((char *) &pdesc64.header, en_is64);
265 if (pdesc64.header.pih_magic != PIH_MAGIC)
266 {
267 /* nope, not "64-bit" after all */
268@@ -288,6 +480,7 @@ PWOpen(prefix, mode)
269 {
270 pdesc.flags &= ~PFOR_USEHWMS;
271 }
272+ HwmsBigEndianToHost((char*)pdesc64.hwms, sizeof(pdesc64.hwms), en_is64);
273 for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++)
274 {
275 pdesc.hwms[i] = pdesc64.hwms[i];
276@@ -297,6 +490,7 @@ PWOpen(prefix, mode)
277 {
278 pdesc.flags &= ~PFOR_USEHWMS;
279 }
280+ HwmsBigEndianToHost((char*)pdesc.hwms, sizeof(pdesc.hwms), en_is32);
281 #if DEBUG
282 for (i=1; i<=0xff; i++)
283 {
284@@ -330,7 +524,11 @@ PWClose(pwp)
285 return (-1);
286 }
287
288- if (!fwrite((char *) &pwp->header, sizeof(pwp->header), 1, pwp->ifp))
289+ struct pi_header tmpheader32;
290+
291+ memcpy(&tmpheader32, &pwp->header, sizeof(pwp->header));
292+ IheaderHostToBigEndian((char *) &tmpheader32, en_is32);
293+ if (!fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, pwp->ifp))
294 {
295 fprintf(stderr, "index magic fwrite failed\n");
296 return (-1);
297@@ -349,7 +547,12 @@ PWClose(pwp)
298 printf("hwm[%02x] = %d\n", i, pwp->hwms[i]);
299 #endif
300 }
301- fwrite(pwp->hwms, 1, sizeof(pwp->hwms), pwp->wfp);
302+
303+ PWDICT tmp_pwp;
304+
305+ memcpy(&tmp_pwp, pwp, sizeof(PWDICT));
306+ HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32);
307+ fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp);
308 }
309 }
310
311@@ -403,7 +606,8 @@ PutPW(pwp, string)
312
313 datum = (uint32_t) ftell(pwp->dfp);
314
315- fwrite((char *) &datum, sizeof(datum), 1, pwp->ifp);
316+ uint32_t tmpdatum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum;
317+ fwrite((char *) &tmpdatum, sizeof(tmpdatum), 1, pwp->ifp);
318
319 fputs(pwp->data_put[0], pwp->dfp);
320 putc(0, (FILE*) pwp->dfp);
321@@ -462,6 +666,7 @@ GetPW(pwp, number)
322 perror("(index fread failed)");
323 return NULL;
324 }
325+ datum64 = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_64(datum64) : datum64;
326 datum = datum64;
327 } else {
328 if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
329@@ -475,6 +680,7 @@ GetPW(pwp, number)
330 perror("(index fread failed)");
331 return NULL;
332 }
333+ datum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum;
334 }
335
336 int r = 1;
337--
3382.20.1
339
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb b/meta/recipes-extended/cracklib/cracklib_2.10.3.bb
index 34ef2b65a1..7feba2c950 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.10.3.bb
@@ -10,11 +10,10 @@ DEPENDS = "cracklib-native zlib"
10EXTRA_OECONF = "--without-python --libdir=${base_libdir}" 10EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
11 11
12SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \ 12SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \
13 file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
14 " 13 "
15 14
16SRCREV = "4cf5125250c6325ef0a2dc085eabff875227edc3" 15SRCREV = "e73d5db1789d198b5f9ec44b68b9c775c3e6c042"
17S = "${WORKDIR}/git/src" 16S = "${UNPACKDIR}/${BP}/src"
18 17
19inherit autotools gettext 18inherit autotools gettext
20 19
diff --git a/meta/recipes-extended/cronie/cronie/make_error_func_prototype_complete.patch b/meta/recipes-extended/cronie/cronie/make_error_func_prototype_complete.patch
new file mode 100644
index 0000000000..71f0153ec6
--- /dev/null
+++ b/meta/recipes-extended/cronie/cronie/make_error_func_prototype_complete.patch
@@ -0,0 +1,41 @@
1From 09c630c654b2aeff06a90a412cce0a60ab4955a4 Mon Sep 17 00:00:00 2001
2From: Tomas Mraz <tmraz@fedoraproject.org>
3Date: Mon, 18 Nov 2024 21:02:30 +0100
4Subject: [PATCH] load_entry(): Make error_func prototype complete
5
6Fixes #193
7
8Upstream-Status: Backport [https://github.com/cronie-crond/cronie/commit/09c630c654b2aeff06a90a412cce0a60ab4955a4]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/entry.c | 2 +-
13 src/funcs.h | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/entry.c b/src/entry.c
17index 586eb9d..a2077e8 100644
18--- a/src/entry.c
19+++ b/src/entry.c
20@@ -90,7 +90,7 @@ void free_entry(entry * e) {
21 /* return NULL if eof or syntax error occurs;
22 * otherwise return a pointer to a new entry.
23 */
24-entry *load_entry(FILE * file, void (*error_func) (), struct passwd *pw,
25+entry *load_entry(FILE * file, void (*error_func) (const char *), struct passwd *pw,
26 char **envp) {
27 /* this function reads one crontab entry -- the next -- from a file.
28 * it skips any leading blank lines, ignores comments, and returns
29diff --git a/src/funcs.h b/src/funcs.h
30index 427e027..f28d634 100644
31--- a/src/funcs.h
32+++ b/src/funcs.h
33@@ -89,7 +89,7 @@ char *env_get(const char *, char **),
34 user *load_user(int, struct passwd *, const char *, const char *, const char *),
35 *find_user(cron_db *, const char *, const char *);
36
37-entry *load_entry(FILE *, void (*)(), struct passwd *, char **);
38+entry *load_entry(FILE *, void (*)(const char *), struct passwd *, char **);
39
40 FILE *cron_popen(char *, const char *, struct passwd *, char **);
41
diff --git a/meta/recipes-extended/cronie/cronie_1.7.1.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb
index 854b68163c..b250717ab8 100644
--- a/meta/recipes-extended/cronie/cronie_1.7.1.bb
+++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb
@@ -17,6 +17,7 @@ SECTION = "utils"
17GITHUB_BASE_URI = "https://github.com/cronie-crond/${BPN}/releases/" 17GITHUB_BASE_URI = "https://github.com/cronie-crond/${BPN}/releases/"
18 18
19SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ 19SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \
20 file://make_error_func_prototype_complete.patch \
20 file://crond.init \ 21 file://crond.init \
21 file://crontab \ 22 file://crontab \
22 file://crond.service \ 23 file://crond.service \
@@ -25,7 +26,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \
25PAM_SRC_URI = "file://crond_pam_config.patch" 26PAM_SRC_URI = "file://crond_pam_config.patch"
26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" 27PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
27 28
28SRC_URI[sha256sum] = "78033100c24413f0c40f93e6138774d6a4f55bc31050567b90db45a2f9f1b954" 29SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571"
29 30
30inherit autotools update-rc.d useradd systemd github-releases 31inherit autotools update-rc.d useradd systemd github-releases
31UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" 32UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)"
@@ -36,6 +37,7 @@ PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
36PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" 37PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}"
37PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron" 38PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron"
38PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" 39PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
40PACKAGECONFIG[inotify] = "--with-inotify,--without-inotify,"
39 41
40INITSCRIPT_NAME = "crond" 42INITSCRIPT_NAME = "crond"
41INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." 43INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
@@ -49,18 +51,18 @@ do_install:append () {
49 install -d ${D}${sysconfdir}/sysconfig/ 51 install -d ${D}${sysconfdir}/sysconfig/
50 install -d ${D}${sysconfdir}/init.d/ 52 install -d ${D}${sysconfdir}/init.d/
51 install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond 53 install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond
52 install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond 54 install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond
53 55
54 # install systemd unit files 56 # install systemd unit files
55 install -d ${D}${systemd_system_unitdir} 57 install -d ${D}${systemd_system_unitdir}
56 install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} 58 install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir}
57 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 59 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
58 -e 's,@SBINDIR@,${sbindir},g' \ 60 -e 's,@SBINDIR@,${sbindir},g' \
59 ${D}${systemd_system_unitdir}/crond.service 61 ${D}${systemd_system_unitdir}/crond.service
60 62
61 # below are necessary for a complete cron environment 63 # below are necessary for a complete cron environment
62 install -d ${D}${localstatedir}/spool/cron 64 install -d ${D}${localstatedir}/spool/cron
63 install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ 65 install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/
64 mkdir -p ${D}${sysconfdir}/cron.d 66 mkdir -p ${D}${sysconfdir}/cron.d
65 mkdir -p ${D}${sysconfdir}/cron.hourly 67 mkdir -p ${D}${sysconfdir}/cron.hourly
66 mkdir -p ${D}${sysconfdir}/cron.daily 68 mkdir -p ${D}${sysconfdir}/cron.daily
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index b70ba3ae58..b8761df0d5 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -84,11 +84,11 @@ do_install () {
84 rm -rf ${D}${sysconfdir}/init.d/ 84 rm -rf ${D}${sysconfdir}/init.d/
85 rm -rf ${D}${sysconfdir}/rc* 85 rm -rf ${D}${sysconfdir}/rc*
86 install -d ${D}${sysconfdir}/tmpfiles.d 86 install -d ${D}${sysconfdir}/tmpfiles.d
87 install -m 0644 ${WORKDIR}/cups-volatiles.conf \ 87 install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \
88 ${D}${sysconfdir}/tmpfiles.d/cups.conf 88 ${D}${sysconfdir}/tmpfiles.d/cups.conf
89 else 89 else
90 install -d ${D}${sysconfdir}/default/volatiles 90 install -d ${D}${sysconfdir}/default/volatiles
91 install -m 0644 ${WORKDIR}/volatiles.99_cups \ 91 install -m 0644 ${UNPACKDIR}/volatiles.99_cups \
92 ${D}${sysconfdir}/default/volatiles/99_cups 92 ${D}${sysconfdir}/default/volatiles/99_cups
93 fi 93 fi
94} 94}
@@ -96,7 +96,7 @@ do_install () {
96PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" 96PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif"
97 97
98RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" 98RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}"
99FILES:${PN} += "${libexecdir}/cups/" 99FILES:${PN} += "${libexecdir}/cups/ ${systemd_system_unitdir}/system-cups.slice"
100 100
101FILES:${PN}-lib = "${libdir}/libcups.so.*" 101FILES:${PN}-lib = "${libdir}/libcups.so.*"
102 102
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..c0cb7df581 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 @@
1From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001 1From c5f943b1ac6e1c86ae64686e29e178fedf933e96 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Thu, 13 Dec 2012 19:03:52 -0800 3Date: Thu, 13 Dec 2012 19:03:52 -0800
4Subject: [PATCH 1/4] use echo only in init 4Subject: [PATCH] use echo only in init
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in 12diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
13index 89ac36d..6618a0f 100644 13index 74cce18..c57f0db 100644
14--- a/scheduler/cups.sh.in 14--- a/scheduler/cups.sh.in
15+++ b/scheduler/cups.sh.in 15+++ b/scheduler/cups.sh.in
16@@ -50,7 +50,7 @@ case "`uname`" in 16@@ -51,7 +51,7 @@ case "`uname`" in
17 ECHO_ERROR=: 17 ECHO_ERROR=:
18 ;; 18 ;;
19 19
@@ -22,6 +22,3 @@ index 89ac36d..6618a0f 100644
22 IS_ON=/bin/true 22 IS_ON=/bin/true
23 if test -f /etc/init.d/functions; then 23 if test -f /etc/init.d/functions; then
24 . /etc/init.d/functions 24 . /etc/init.d/functions
25--
262.17.1
27
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..cf2f1a6747 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 @@
1From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001 1From da9a313ae5a2d1da683dd58572df0d7a660eb922 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 30 Jan 2011 16:37:27 +0100 3Date: Sun, 30 Jan 2011 16:37:27 +0100
4Subject: [PATCH 2/4] don't try to run generated binaries 4Subject: [PATCH] don't try to run generated binaries
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10--- 9---
11 ppdc/Makefile | 32 ++++++++++++++++---------------- 10 ppdc/Makefile | 4 ++--
12 1 file changed, 16 insertions(+), 16 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
13 12
14diff --git a/ppdc/Makefile b/ppdc/Makefile 13diff --git a/ppdc/Makefile b/ppdc/Makefile
15index 32e2e0b..f1478d4 100644 14index e36ed11..3fe97e1 100644
16--- a/ppdc/Makefile 15--- a/ppdc/Makefile
17+++ b/ppdc/Makefile 16+++ b/ppdc/Makefile
18@@ -186,8 +186,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ 17@@ -187,8 +187,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
19 $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ 18 $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \
20 libcupsppdc.a $(LINKCUPSSTATIC) 19 libcupsppdc.a $(LINKCUPSSTATIC)
21 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ 20 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -26,6 +25,3 @@ index 32e2e0b..f1478d4 100644
26 25
27 26
28 # 27 #
29--
302.17.1
31
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..31338822e6 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 @@
1From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 1From 880bad2c6b08afd2e2e303bc3ceea559edbe76d2 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 3 Oct 2018 00:27:11 +0800 3Date: Wed, 3 Oct 2018 00:27:11 +0800
4Subject: [PATCH 4/4] cups: fix multilib install file conflicts 4Subject: [PATCH] cups: fix multilib install file conflicts
5 5
6@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file 6@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file
7conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to 7conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
@@ -10,16 +10,15 @@ avoid the conflict.
10Upstream-Status: Inappropriate [OE specific] 10Upstream-Status: Inappropriate [OE specific]
11 11
12Signed-off-by: Kai Kang <kai.kang@windriver.com> 12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13
14--- 13---
15 conf/cups-files.conf.in | 2 +- 14 conf/cups-files.conf.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
17 16
18diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in 17diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
19index 4a78ba6..03c6582 100644 18index f96f745..27d8be9 100644
20--- a/conf/cups-files.conf.in 19--- a/conf/cups-files.conf.in
21+++ b/conf/cups-files.conf.in 20+++ b/conf/cups-files.conf.in
22@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log 21@@ -70,7 +70,7 @@ PageLog @CUPS_LOGDIR@/page_log
23 #RequestRoot @CUPS_REQUESTS@ 22 #RequestRoot @CUPS_REQUESTS@
24 23
25 # Location of helper programs... 24 # Location of helper programs...
@@ -28,6 +27,3 @@ index 4a78ba6..03c6582 100644
28 27
29 # SSL/TLS keychain for the scheduler... 28 # SSL/TLS keychain for the scheduler...
30 #ServerKeychain @CUPS_SERVERKEYCHAIN@ 29 #ServerKeychain @CUPS_SERVERKEYCHAIN@
31--
322.17.1
33
diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch
index 7ccad94f0f..493c7970ea 100644
--- a/meta/recipes-extended/cups/cups/libexecdir.patch
+++ b/meta/recipes-extended/cups/cups/libexecdir.patch
@@ -1,4 +1,4 @@
1From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 1From 4ae7ad87aa022f5128be222dffbf0c50ec6e846e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com> 2From: Ross Burton <ross.burton@arm.com>
3Date: Tue, 13 Jul 2021 12:56:30 +0100 3Date: Tue, 13 Jul 2021 12:56:30 +0100
4Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this 4Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this
@@ -6,13 +6,12 @@ Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8Signed-off-by: Ross Burton <ross.burton@arm.com> 8Signed-off-by: Ross Burton <ross.burton@arm.com>
9
10--- 9---
11 config-scripts/cups-directories.m4 | 4 ++-- 10 config-scripts/cups-directories.m4 | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
13 12
14diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 13diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
15index 2033d47..230166e 100644 14index 069ee7b..2f67e5b 100644
16--- a/config-scripts/cups-directories.m4 15--- a/config-scripts/cups-directories.m4
17+++ b/config-scripts/cups-directories.m4 16+++ b/config-scripts/cups-directories.m4
18@@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) 17@@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS])
diff --git a/meta/recipes-extended/cups/cups_2.4.7.bb b/meta/recipes-extended/cups/cups_2.4.12.bb
index f4b0282e4c..ac73c2780f 100644
--- a/meta/recipes-extended/cups/cups_2.4.7.bb
+++ b/meta/recipes-extended/cups/cups_2.4.12.bb
@@ -2,4 +2,4 @@ require cups.inc
2 2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
4 4
5SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" 5SRC_URI[sha256sum] = "b1dde191a4ae2760c47220c82ca6155a28c382701e6c1a0159d1054990231d59"
diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
index 0e155b6c95..7efe5cc592 100644
--- a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
+++ b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
@@ -5,10 +5,12 @@ DESCRIPTION = "A collection of autoconf macros, plus an autogen.sh script that c
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}.berlios/${BP}.tar.bz2" 8SOURCEFORGE_PROJECT = "${BPN}.berlios"
9SRC_URI[md5sum] = "074afcb50d0a8bff10786a2954b2b02d" 9SRC_URI = "${SOURCEFORGE_MIRROR}/${SOURCEFORGE_PROJECT}/${BP}.tar.bz2"
10SRC_URI[sha256sum] = "3115603b891f3a163c0bbb5fea2f3742113a183fa6745ee5e89e5f6d0e9f6121" 10SRC_URI[sha256sum] = "3115603b891f3a163c0bbb5fea2f3742113a183fa6745ee5e89e5f6d0e9f6121"
11 11
12inherit sourceforge-releases
13
12do_configure() { 14do_configure() {
13 : 15 :
14} 16}
diff --git a/meta/recipes-extended/diffutils/diffutils_3.10.bb b/meta/recipes-extended/diffutils/diffutils_3.12.bb
index 08e8305612..d00dd772ad 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.10.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.12.bb
@@ -8,16 +8,14 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
8 file://0001-Skip-strip-trailing-cr-test-case.patch \ 8 file://0001-Skip-strip-trailing-cr-test-case.patch \
9 " 9 "
10 10
11SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" 11SRC_URI[sha256sum] = "7c8b7f9fc8609141fdea9cece85249d308624391ff61dedaf528fcb337727dfd"
12 12
13EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" 13EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
14EXTRA_OECONF += "gl_cv_func_strcasecmp_works=yes"
14 15
15# latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators 16# latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators
16CFLAGS:mingw32 = " -DSA_RESTART=0" 17CFLAGS:mingw32 = " -DSA_RESTART=0"
17 18
18# Fix "Argument list too long" error when len(TMPDIR) = 410
19acpaths = "-I ./m4"
20
21EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'" 19EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'"
22inherit ptest 20inherit ptest
23 21
diff --git a/meta/recipes-extended/ed/ed_1.20.1.bb b/meta/recipes-extended/ed/ed_1.21.1.bb
index 9ae53002c3..03a61c6d5f 100644
--- a/meta/recipes-extended/ed/ed_1.20.1.bb
+++ b/meta/recipes-extended/ed/ed_1.21.1.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://www.gnu.org/software/ed/"
3DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands." 3DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands."
4 4
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=cca7f74ec83b7a9ce7ccd195aad471bd \
7 file://ed.h;endline=20;md5=c3212b6c53b09668107420af9368c0ef \ 7 file://ed.h;endline=20;md5=a24e7f91c0fb83e65a746f5994762a49 \
8 file://main.c;endline=17;md5=e5d2ae5ddd1ecb87dc71702c06dd06dc \ 8 file://main.c;endline=17;md5=fd6ad9f1853f123f4ae7a31d59761f09 \
9 " 9 "
10 10
11SECTION = "base" 11SECTION = "base"
@@ -19,7 +19,7 @@ bindir = "${base_bindir}"
19SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" 19SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz"
20UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" 20UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
21 21
22SRC_URI[sha256sum] = "b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca" 22SRC_URI[sha256sum] = "d6d0c7192b02b0519c902a93719053e865ade5a784a3b327d93d888457b23c4b"
23 23
24EXTRA_OEMAKE = "-e MAKEFLAGS=" 24EXTRA_OEMAKE = "-e MAKEFLAGS="
25 25
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index 69df8632f2..4affc332a9 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 @@
1From 758fde7186730ee331a0ee6149276cd412766ee0 Mon Sep 17 00:00:00 2001 1From 755cf01b02e6ec8c8acb79558cbad28e301519b3 Mon Sep 17 00:00:00 2001
2From: Tudor Florea <tudor.florea@enea.com> 2From: Tudor Florea <tudor.florea@enea.com>
3Date: Wed, 28 May 2014 18:59:54 +0200 3Date: Wed, 28 May 2014 18:59:54 +0200
4Subject: [PATCH] ethtool: use serial-tests config needed by ptest. 4Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -9,16 +9,15 @@ serial-tests is required to generate those targets.
9Signed-off-by: Tudor Florea <tudor.florea@enea.com> 9Signed-off-by: Tudor Florea <tudor.florea@enea.com>
10Upstream-Status: Inappropriate 10Upstream-Status: Inappropriate
11(default automake behavior incompatible with ptest) 11(default automake behavior incompatible with ptest)
12
13--- 12---
14 configure.ac | 2 +- 13 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
16 15
17diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
18index c871558..8ea1eaa 100644 17index db71394..5e93135 100644
19--- a/configure.ac 18--- a/configure.ac
20+++ b/configure.ac 19+++ b/configure.ac
21@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.7, netdev@vger.kernel.org) 20@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.14, netdev@vger.kernel.org)
22 AC_PREREQ(2.52) 21 AC_PREREQ(2.52)
23 AC_CONFIG_MACRO_DIR([m4]) 22 AC_CONFIG_MACRO_DIR([m4])
24 AC_CONFIG_SRCDIR([ethtool.c]) 23 AC_CONFIG_SRCDIR([ethtool.c])
diff --git a/meta/recipes-extended/ethtool/ethtool_6.7.bb b/meta/recipes-extended/ethtool/ethtool_6.14.bb
index 33df0e0e80..41164ac6ca 100644
--- a/meta/recipes-extended/ethtool/ethtool_6.7.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.14.bb
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
11 file://avoid_parallel_tests.patch \ 11 file://avoid_parallel_tests.patch \
12 " 12 "
13 13
14SRC_URI[sha256sum] = "ace0e95a03b38208af4ebacb415244568ace44c5d5a279ea434844f900179c75" 14SRC_URI[sha256sum] = "3dbfc910513d1fef683f27ab12325cc88551abffae66d0ad3afe2a13317d2339"
15 15
16UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" 16UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
17 17
@@ -22,6 +22,8 @@ RDEPENDS:${PN}-ptest += "make bash"
22PACKAGECONFIG ?= "netlink" 22PACKAGECONFIG ?= "netlink"
23PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," 23PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl,"
24 24
25FILES:${PN} += "${datadir}/metainfo/org.kernel.software.network.ethtool.metainfo.xml"
26
25do_compile_ptest() { 27do_compile_ptest() {
26 oe_runmake buildtest-TESTS 28 oe_runmake buildtest-TESTS
27} 29}
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"
7SECTION = "console/utils" 7SECTION = "console/utils"
8 8
9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
10 file://autoconf-2.73.patch \
11 file://run-ptest \ 10 file://run-ptest \
12 " 11 "
13 12
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 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next findutils upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest
index ec71583c51..0c9af47efd 100644
--- a/meta/recipes-extended/findutils/findutils/run-ptest
+++ b/meta/recipes-extended/findutils/findutils/run-ptest
@@ -5,39 +5,14 @@ ln -s /usr/bin/find /tmp/oldfind
5# make oldfind visible 5# make oldfind visible
6export PATH="/tmp:${PATH}" 6export PATH="/tmp:${PATH}"
7 7
8# Add findutils ptest directory to PATH for getlimits
9export PATH="/usr/lib/findutils/ptest:${PATH}"
10
8export built_programs="find xargs locate updatedb" 11export built_programs="find xargs locate updatedb"
9 12
10# this gets substituted by sed during build 13# this gets substituted by sed during build
11export VERSION="__run_ptest_version__" 14export VERSION="__run_ptest_version__"
12 15
13# define missing functions for tests/init.sh
14fu_path_prepend_ () {
15 path_prepend_ $@
16}
17
18print_ver_ () {
19 :
20}
21
22skip_if_root_ () {
23 [ $(id -u) = 0 ] && exit 77;
24}
25
26require_root_ () {
27 [ $(id -u) = 0 ] || exit 77;
28}
29
30expensive_ () {
31 :
32}
33
34export -f fu_path_prepend_
35export -f print_ver_
36export -f skip_if_root_
37export -f require_root_
38export -f expensive_
39
40
41for f in tests/*/*.sh; do 16for f in tests/*/*.sh; do
42 bash $f ; 17 bash $f ;
43 case $? in 18 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..aa21637657 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"
6 6
7DEPENDS = "bison-native" 7DEPENDS = "bison-native"
8 8
9SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" 9SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
10 10
11PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" 11PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
12# http://savannah.gnu.org/bugs/?27299 12# http://savannah.gnu.org/bugs/?27299
@@ -19,9 +19,10 @@ RDEPENDS:${PN}-ptest += "bash sed grep coreutils"
19 19
20do_install_ptest:class-target() { 20do_install_ptest:class-target() {
21 mkdir -p ${D}${PTEST_PATH}/tests/ 21 mkdir -p ${D}${PTEST_PATH}/tests/
22 cp ${S}/init.cfg ${D}${PTEST_PATH}
22 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ 23 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
24 install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/
23 25
24 # substitute value in run-ptest with actual version 26 # substitute value in run-ptest with actual version
25 sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest 27 sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
26
27} 28}
diff --git a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
new file mode 100644
index 0000000000..bcbc569531
--- /dev/null
+++ b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
@@ -0,0 +1,35 @@
1From 9ce3184188e3fa275fde0258a165f4446a6e80f7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 22 Nov 2024 12:13:58 +0100
4Subject: [PATCH] configure.ac: re-enable disabled printf features
5
6This is needed for ptests to pass for one thing.
7
8Upstream-Status: Inappropriate [needs a config option]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10---
11 configure.ac | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 0ccd460..7df7e5b 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -400,7 +400,7 @@ int main()
19 ])],
20 has_f_format=yes,
21 has_f_format=no,
22- has_f_format=no dnl Cross-compiling, assuming the worst.
23+ has_f_format=yes dnl Cross-compiling in oe-core
24 )
25 if test "$has_f_format" = yes
26 then
27@@ -429,7 +429,7 @@ int main()
28 ])],
29 has_a_format=yes,
30 has_a_format=no,
31- has_a_format=no dnl Cross-compiling, assuming the worst.
32+ has_a_format=yes dnl Cross-compiling in oe-core
33 )
34 if test "$has_a_format" = yes
35 then
diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.2.bb
index d7a0fc616d..833fe78bf9 100644
--- a/meta/recipes-extended/gawk/gawk_5.3.0.bb
+++ b/meta/recipes-extended/gawk/gawk_5.3.2.bb
@@ -11,15 +11,16 @@ SECTION = "console/utils"
11LICENSE = "GPL-3.0-only" 11LICENSE = "GPL-3.0-only"
12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 12LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14PACKAGECONFIG ??= "readline" 14PACKAGECONFIG ??= "readline mpfr"
15PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" 15PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
16PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" 16PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
17 17
18SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ 18SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
19 file://run-ptest \ 19 file://run-ptest \
20 file://0001-configure.ac-re-enable-disabled-printf-features.patch \
20 " 21 "
21 22
22SRC_URI[sha256sum] = "378f8864ec21cfceaa048f7e1869ac9b4597b449087caf1eb55e440d30273336" 23SRC_URI[sha256sum] = "8639a1a88fb411a1be02663739d03e902a6d313b5c6fe024d0bfeb3341a19a11"
23 24
24inherit autotools gettext texinfo update-alternatives 25inherit autotools gettext texinfo update-alternatives
25 26
@@ -51,6 +52,8 @@ do_install_ptest() {
51 cp ${S}/test/$i* ${D}${PTEST_PATH}/test 52 cp ${S}/test/$i* ${D}${PTEST_PATH}/test
52 done 53 done
53 sed -i \ 54 sed -i \
55 -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \
56 -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|g' \
54 -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk 57 -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk
55 58
56 sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests 59 sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
diff --git a/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch b/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch
new file mode 100644
index 0000000000..78f3fc1c34
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch
@@ -0,0 +1,67 @@
1From c595086bfe206776676e290df98cd09e91210e27 Mon Sep 17 00:00:00 2001
2From: Alex Cherepanov <alex@coscript.biz>
3Date: Thu, 3 Apr 2025 17:19:41 +0100
4Subject: [PATCH] Bug 708160: Fix compatibility with C23 compilers
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9* fixes:
10 http://errors.yoctoproject.org/Errors/Details/853021/
11
12In file included from ./base/genconf.c:18:
13./base/stdpre.h:348:13: error: ‘bool’ cannot be defined via ‘typedef’
14 348 | typedef int bool;
15 | ^~~~
16./base/stdpre.h:348:13: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
17./base/stdpre.h:348:1: warning: useless type name in empty declaration
18 348 | typedef int bool;
19 | ^~~~~~~
20
21Upstream-Status: Backport [Partial backport of https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/commit/base/stdpre.h?id=ae940946473ceb8c5353bc6e7f04673c6e60502d]
22
23Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
24---
25 base/stdpre.h | 6 ++++--
26 1 file changed, 4 insertions(+), 2 deletions(-)
27
28diff --git a/base/stdpre.h b/base/stdpre.h
29index dda30b6..2f9c84e 100644
30--- a/base/stdpre.h
31+++ b/base/stdpre.h
32@@ -1,4 +1,4 @@
33-/* Copyright (C) 2001-2023 Artifex Software, Inc.
34+/* Copyright (C) 2001-2025 Artifex Software, Inc.
35 All Rights Reserved.
36
37 This software is provided AS-IS with no warranty, either express or
38@@ -341,7 +341,9 @@ typedef signed char schar;
39 * and the MetroWerks C++ compiler insists that bool be equivalent to
40 * unsigned char.
41 */
42-#ifndef __cplusplus
43+
44+/* C23 has bool as a builtin type. */
45+#if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L)
46 #ifdef __BEOS__
47 typedef unsigned char bool;
48 #else
49diff --git a/base/gp.h b/base/gp.h
50index ad5bb61..cf2c9cf 100644
51--- a/base/gp.h
52+++ b/base/gp.h
53@@ -1,4 +1,4 @@
54-/* Copyright (C) 2001-2023 Artifex Software, Inc.
55+/* Copyright (C) 2001-2025 Artifex Software, Inc.
56 All Rights Reserved.
57
58 This software is provided AS-IS with no warranty, either express or
59@@ -646,7 +646,7 @@ int gp_fseek_impl(FILE *strm, gs_offset_t offset, int origin);
60 /* Create a second open gp_file on the basis of a given one */
61 FILE *gp_fdup_impl(FILE *f, const char *mode);
62
63-int gp_fseekable_impl(FILE *f);
64+bool gp_fseekable_impl(FILE *f);
65
66 /* Force given file into binary mode (no eol translations, etc) */
67 /* if 2nd param true, text mode if 2nd param false */
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
index 67f14bd368..d191231c7b 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
@@ -1,4 +1,4 @@
1From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001 1From 85905ce3b1bc63f0be9eda9888e40d8e7a803d21 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Thu, 29 Mar 2018 16:02:05 +0800 3Date: Thu, 29 Mar 2018 16:02:05 +0800
4Subject: [PATCH] avoid host contamination 4Subject: [PATCH] avoid host contamination
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/devices/devs.mak b/devices/devs.mak 17diff --git a/devices/devs.mak b/devices/devs.mak
18index 186f704..88ab8c9 100644 18index a5dbc7a..27b55f2 100644
19--- a/devices/devs.mak 19--- a/devices/devs.mak
20+++ b/devices/devs.mak 20+++ b/devices/devs.mak
21@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ 21@@ -403,7 +403,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT 22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
23 23
24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) 24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
index 8c4a5d44e3..0598c3dcd2 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
@@ -1,7 +1,7 @@
1From c481b055cd464734a3c2d80719ead4c1c92a40c9 Mon Sep 17 00:00:00 2001 1From c23b787f9a38be2cdc57133915c402b69acedd1a Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 4 May 2015 22:31:48 -0700 3Date: Mon, 4 May 2015 22:31:48 -0700
4Subject: [PATCH 02/10] base/gendev.c: fix for -Werror=return-type 4Subject: [PATCH] base/gendev.c: fix for -Werror=return-type
5 5
6Fixed: 6Fixed:
7base/gendev.c:80:1: error: return type defaults to 'int' [-Werror=return-type] 7base/gendev.c:80:1: error: return type defaults to 'int' [-Werror=return-type]
@@ -14,7 +14,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/base/gendev.c b/base/gendev.c 16diff --git a/base/gendev.c b/base/gendev.c
17index 59d5999..7766b08 100644 17index f36cfe2..031f30b 100644
18--- a/base/gendev.c 18--- a/base/gendev.c
19+++ b/base/gendev.c 19+++ b/base/gendev.c
20@@ -77,6 +77,7 @@ static const char *indent_item = ""; 20@@ -77,6 +77,7 @@ static const char *indent_item = "";
@@ -25,6 +25,3 @@ index 59d5999..7766b08 100644
25 main(int argc, char *argv[]) 25 main(int argc, char *argv[])
26 { 26 {
27 config conf; 27 config conf;
28--
291.8.3.1
30
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
index ff7d38676e..1cd6bacff9 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
@@ -21,13 +21,13 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
21def gs_verdir(v): 21def gs_verdir(v):
22 return "".join(v.split(".")) 22 return "".join(v.split("."))
23 23
24
25SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ 24SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
26 file://ghostscript-9.16-Werror-return-type.patch \ 25 file://ghostscript-9.16-Werror-return-type.patch \
27 file://avoid-host-contamination.patch \ 26 file://avoid-host-contamination.patch \
27 file://0001-Bug-708160-Fix-compatibility-with-C23-compilers.patch \
28 " 28 "
29 29
30SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" 30SRC_URI[sha256sum] = "121861b6d29b2461dec6575c9f3cab665b810bd408d4ec02c86719fa708b0a49"
31 31
32PACKAGECONFIG ??= "" 32PACKAGECONFIG ??= ""
33PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 33PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
@@ -47,6 +47,8 @@ EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0"
47EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" 47EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
48EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" 48EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
49 49
50TARGET_CFLAGS += "-std=gnu17"
51
50# Uses autoconf but not automake, can't do out-of-tree 52# Uses autoconf but not automake, can't do out-of-tree
51inherit autotools-brokensep pkgconfig 53inherit autotools-brokensep pkgconfig
52 54
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..f21cfbdf27 100644
--- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -5,14 +5,14 @@ HOMEPAGE = "https://golang.org/"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
7 7
8SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" 8SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
9SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" 9SRCREV = "d7b0ac1278591aea848a99258ccfdee8e4d454c1"
10UPSTREAM_CHECK_COMMITS = "1" 10UPSTREAM_CHECK_COMMITS = "1"
11 11
12GO_IMPORT = "golang.org/x/example" 12GO_IMPORT = "golang.org/x/example"
13GO_INSTALL = "${GO_IMPORT}/hello" 13GO_INSTALL = "${GO_IMPORT}/hello"
14 14
15export GO111MODULE="off" 15export GO111MODULE = "off"
16 16
17inherit go 17inherit go
18 18
@@ -20,3 +20,6 @@ inherit go
20do_install:append() { 20do_install:append() {
21 mv ${D}${bindir}/hello ${D}${bindir}/${BPN} 21 mv ${D}${bindir}/hello ${D}${bindir}/${BPN}
22} 22}
23
24# /usr/lib/go/src/golang.org/x/example/ragserver/tests/weaviate-show-all.sh is requiring bash
25RDEPENDS:${PN}-dev += "bash"
diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb
index c57ade9fe3..7a79c07042 100644
--- a/meta/recipes-extended/gperf/gperf_3.1.bb
+++ b/meta/recipes-extended/gperf/gperf_3.1.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
7 7
8SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
9 file://0001-Make-the-code-C-17-compliant.patch" 9 file://0001-Make-the-code-C-17-compliant.patch"
10SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e"
11SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" 10SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2"
12 11
13SRC_URI += "file://1862c6e57a308a05889c80c048dbc58bdc378dcb.patch" 12SRC_URI += "file://1862c6e57a308a05889c80c048dbc58bdc378dcb.patch"
@@ -18,4 +17,6 @@ inherit autotools
18# it where to look explicitly (mirroring the behaviour of upstream's Makefile.devel). 17# it where to look explicitly (mirroring the behaviour of upstream's Makefile.devel).
19EXTRA_AUTORECONF += " -I ${S} --exclude=aclocal" 18EXTRA_AUTORECONF += " -I ${S} --exclude=aclocal"
20 19
20CFLAGS += "-std=gnu17"
21
21BBCLASSEXTEND = "native nativesdk" 22BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/grep/grep_3.11.bb b/meta/recipes-extended/grep/grep_3.12.bb
index cb3105de04..2678d2d41e 100644
--- a/meta/recipes-extended/grep/grep_3.11.bb
+++ b/meta/recipes-extended/grep/grep_3.12.bb
@@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
8 8
9SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" 9SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz"
10 10
11SRC_URI[sha256sum] = "1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab" 11SRC_URI[sha256sum] = "2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9"
12 12
13inherit autotools gettext texinfo pkgconfig 13inherit autotools gettext texinfo pkgconfig
14 14
15# Fix "Argument list too long" error when len(TMPDIR) = 410
16acpaths = "-I ./m4"
17
18do_configure:prepend () { 15do_configure:prepend () {
19 sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh 16 sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh
20 rm -f ${S}/m4/init.m4 17 rm -f ${S}/m4/init.m4
diff --git a/meta/recipes-extended/groff/files/0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch b/meta/recipes-extended/groff/files/0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch
new file mode 100644
index 0000000000..de4a55bbab
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch
@@ -0,0 +1,31 @@
1From 771686c042d5f494550d0399f36e00b1ca557b2d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 11 Nov 2024 14:12:51 +0000
4Subject: [PATCH] contrib/hdtbl/hdtbl.am: Fix race issues for parallel build
5
6Fixed race issues for parallel build:
7groff: error: couldn't exec soelim: Permission
8
9And:
10groff: error: couldn't exec grn: Permission denied
11
12Upstream-Status: Submitted [https://lists.gnu.org/archive/html/groff/2024-11/msg00097.html]
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 contrib/hdtbl/hdtbl.am | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
20index 9384fac..70f7bc9 100644
21--- a/contrib/hdtbl/hdtbl.am
22+++ b/contrib/hdtbl/hdtbl.am
23@@ -119,7 +119,7 @@ SUFFIXES += .roff .in .ps
24 -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
25
26 $(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \
27- grops grn font/devps/stamp contrib/hdtbl/examples/common.roff
28+ grops grn soelim font/devps/stamp contrib/hdtbl/examples/common.roff
29
30 uninstall_groffdirs: uninstall-hdtbl-hook
31 uninstall-hdtbl-hook:
diff --git a/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch b/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch
new file mode 100644
index 0000000000..c69a2b4f67
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch
@@ -0,0 +1,27 @@
1From b68b3c6157c531bdcf5812fd93aadff9c18de6bd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 22 Mar 2025 14:41:23 -0700
4Subject: [PATCH] getopt: Fix type signature for getenv()
5
6This fixes build on musl with GCC 15
7
8Upstream-Status: Inappropriate [Next version is use getopt.c from gnulib]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/libs/libgroff/getopt.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/libs/libgroff/getopt.c b/src/libs/libgroff/getopt.c
16index 6efa529..ce39115 100644
17--- a/src/libs/libgroff/getopt.c
18+++ b/src/libs/libgroff/getopt.c
19@@ -122,7 +122,7 @@ static struct _getopt_data getopt_data;
20 whose names are inconsistent. */
21
22 #ifndef getenv
23-extern char *getenv ();
24+extern char *getenv (const char *);
25 #endif
26
27 #endif /* not __GNU_LIBRARY__ */
diff --git a/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
new file mode 100644
index 0000000000..d9455af2ac
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
@@ -0,0 +1,38 @@
1From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001
2From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
3Date: Thu, 10 Oct 2024 18:17:08 -0500
4Subject: [PATCH] [hdtbl]: Fix Savannah #66316 (missing `grn` dep).
5
6* hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Declare dependency on `grn`;
7 because `-I` flags are used, it is dragged in even though not
8 explicitly needed. Resolves race against `grn`'s availability in the
9 build tree.
10
11Fixes <https://savannah.gnu.org/bugs/?66316>. Thanks to Ross Burton for
12the report.
13
14Upstream-Status: Backport
15Signed-off-by: Ross Burton <ross.burton@arm.com>
16---
17 contrib/hdtbl/ChangeLog | 10 ++++++++++
18 contrib/hdtbl/hdtbl.am | 3 +--
19 2 files changed, 11 insertions(+), 2 deletions(-)
20
21diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
22index b6c334c18..3c37174f2 100644
23--- a/contrib/hdtbl/hdtbl.am
24+++ b/contrib/hdtbl/hdtbl.am
25@@ -119,9 +119,8 @@ SUFFIXES += .roff .in .ps
26 && sed -e "s|[@]fontdir[@]|$(fontdir)|" \
27 -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
28
29-
30 $(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \
31- grops font/devps/stamp contrib/hdtbl/examples/common.roff
32+ grops grn font/devps/stamp contrib/hdtbl/examples/common.roff
33
34 uninstall_groffdirs: uninstall-hdtbl-hook
35 uninstall-hdtbl-hook:
36--
372.34.1
38
diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb
index 0fc4f831d8..0c2ef61758 100644
--- a/meta/recipes-extended/groff/groff_1.23.0.bb
+++ b/meta/recipes-extended/groff/groff_1.23.0.bb
@@ -12,6 +12,9 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
12 file://0001-Make-manpages-mulitlib-identical.patch \ 12 file://0001-Make-manpages-mulitlib-identical.patch \
13 file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ 13 file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \
14 file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ 14 file://0001-build-meintro_fr.ps-depends-on-tbl.patch \
15 file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \
16 file://0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch \
17 file://0001-getopt-Fix-type-signature-for-getenv.patch \
15 " 18 "
16 19
17SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" 20SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
diff --git a/meta/recipes-extended/gzip/files/run-ptest b/meta/recipes-extended/gzip/files/run-ptest
index cf7c64949a..ee6b4326fa 100644
--- a/meta/recipes-extended/gzip/files/run-ptest
+++ b/meta/recipes-extended/gzip/files/run-ptest
@@ -1,6 +1,3 @@
1#!/bin/sh 1#!/bin/sh
2 2
3cd src/tests 3VERBOSE=1 make -C src/tests check
4
5make check
6
diff --git a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch
index 7f9e249de8..4d5e7a8e02 100644
--- a/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.14/wrong-path-fix.patch
@@ -1,4 +1,7 @@
1fix MakeMaker issues with using wrong SHELL/GREP 1From eda9b1d08c517acbdc5b26c24c94a3985f29c749 Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Fri, 21 Nov 2014 04:50:57 -0500
4Subject: [PATCH] fix MakeMaker issues with using wrong SHELL/GREP
2 5
3A set of substitution is being processed to all target scripts with sed by 6A set of substitution is being processed to all target scripts with sed by
4replacing some key words with the detected values at configure time, this 7replacing some key words with the detected values at configure time, this
@@ -12,16 +15,15 @@ instead.
12Signed-off-by: Ming Liu <ming.liu@windriver.com> 15Signed-off-by: Ming Liu <ming.liu@windriver.com>
13 16
14Upstream-Status: Pending 17Upstream-Status: Pending
15
16--- 18---
17 Makefile.am | 3 +-- 19 Makefile.am | 3 +--
18 1 file changed, 1 insertion(+), 2 deletions(-) 20 1 file changed, 1 insertion(+), 2 deletions(-)
19 21
20diff --git a/Makefile.am b/Makefile.am 22diff --git a/Makefile.am b/Makefile.am
21index 4f51b61..80a5ddf 100644 23index 23e0d3e..3455878 100644
22--- a/Makefile.am 24--- a/Makefile.am
23+++ b/Makefile.am 25+++ b/Makefile.am
24@@ -93,8 +93,7 @@ SUFFIXES = .in 26@@ -95,8 +95,7 @@ SUFFIXES = .in
25 .in: 27 .in:
26 $(AM_V_GEN)rm -f $@-t $@ \ 28 $(AM_V_GEN)rm -f $@-t $@ \
27 && sed \ 29 && sed \
@@ -31,6 +33,3 @@ index 4f51b61..80a5ddf 100644
31 -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ 33 -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
32 -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ 34 -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
33 -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ 35 -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
34--
352.7.4
36
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 62b3e2f4f9..12232dd4da 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gnu.org/software/gzip/"
5SECTION = "console/utils" 5SECTION = "console/utils"
6 6
7inherit autotools texinfo 7inherit autotools texinfo
8export DEFS="NO_ASM" 8export DEFS = "NO_ASM"
9 9
10EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" 10EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep"
11EXTRA_OEMAKE:append:class-nativesdk = " GREP=grep" 11EXTRA_OEMAKE:append:class-nativesdk = " GREP=grep"
@@ -30,4 +30,4 @@ ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
30ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" 30ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
31ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" 31ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
32 32
33export CONFIG_SHELL="/bin/sh" 33export CONFIG_SHELL = "/bin/sh"
diff --git a/meta/recipes-extended/gzip/gzip_1.13.bb b/meta/recipes-extended/gzip/gzip_1.14.bb
index fd846b30a5..c7837cdae0 100644
--- a/meta/recipes-extended/gzip/gzip_1.13.bb
+++ b/meta/recipes-extended/gzip/gzip_1.14.bb
@@ -10,11 +10,12 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
10SRC_URI:append:class-target = " file://wrong-path-fix.patch" 10SRC_URI:append:class-target = " file://wrong-path-fix.patch"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
13 file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" 13 file://gzip.h;beginline=8;endline=20;md5=a22158dc3dd3f5cf6e5a556940a49212 \
14 "
14 15
15PROVIDES:append:class-native = " gzip-replacement-native" 16PROVIDES:append:class-native = " gzip-replacement-native"
16 17
17RDEPENDS:${PN}-ptest += "make perl grep diffutils" 18RDEPENDS:${PN}-ptest += "make perl grep diffutils coreutils"
18 19
19BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
20 21
@@ -33,9 +34,10 @@ do_install_ptest() {
33 -e 's/^Makefile: ..*/Makefile: /' \ 34 -e 's/^Makefile: ..*/Makefile: /' \
34 -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ 35 -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
35 -e 's|${DEBUG_PREFIX_MAP}||g' \ 36 -e 's|${DEBUG_PREFIX_MAP}||g' \
37 -e 's|${BUILD_LDFLAGS}||g' \
36 -e 's:${HOSTTOOLS_DIR}/::g' \ 38 -e 's:${HOSTTOOLS_DIR}/::g' \
37 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ 39 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
38 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile 40 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
39} 41}
40 42
41SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" 43SRC_URI[sha256sum] = "613d6ea44f1248d7370c7ccdeee0dd0017a09e6c39de894b3c6f03f981191c6b"
diff --git a/meta/recipes-extended/hdparm/hdparm_9.65.bb b/meta/recipes-extended/hdparm/hdparm_9.65.bb
index d5e6ab6065..e541d58fa5 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.65.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.65.bb
@@ -8,14 +8,12 @@ LICENSE = "BSD-2-Clause & GPL-2.0-only & hdparm"
8LICENSE:${PN} = "BSD-2-Clause & hdparm" 8LICENSE:${PN} = "BSD-2-Clause & hdparm"
9LICENSE:${PN}-dbg = "BSD-2-Clause & hdparm" 9LICENSE:${PN}-dbg = "BSD-2-Clause & hdparm"
10LICENSE:wiper = "GPL-2.0-only" 10LICENSE:wiper = "GPL-2.0-only"
11NO_GENERIC_LICENSE[hdparm] = "LICENSE.TXT"
12 11
13LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ 12LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \
14 file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ 13 file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \
15 file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \ 14 file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \
16 file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09" 15 file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09"
17 16
18
19PACKAGES =+ "wiper" 17PACKAGES =+ "wiper"
20 18
21FILES:wiper = "${bindir}/wiper.sh" 19FILES:wiper = "${bindir}/wiper.sh"
@@ -27,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \
27 " 25 "
28 26
29SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" 27SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b"
28UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/hdparm/files/hdparm/"
30 29
31EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' 30EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'
32 31
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
deleted file mode 100644
index 8824bf2af7..0000000000
--- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:16:31 +0200
4Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
5
6This changes the configure behaviour from autodetecting
7for libnfnetlink to having an option to disable it explicitly
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13
14---
15 configure.ac | 10 +++++++---
16 1 file changed, 7 insertions(+), 3 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index d99fa3b..d607772 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
23 AC_ARG_ENABLE([nftables],
24 AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]),
25 [enable_nftables="$enableval"], [enable_nftables="yes"])
26+AC_ARG_ENABLE([libnfnetlink],
27+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
28+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
29 AC_ARG_ENABLE([connlabel],
30 AS_HELP_STRING([--disable-connlabel],
31 [Do not build libnetfilter_conntrack]),
32@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
33 AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
34 AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
35
36-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
37- [nfnetlink=1], [nfnetlink=0])
38-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
39+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
40+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
41+ ])
42+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
43
44 if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
45 PKG_CHECK_MODULES([libpcap], [libpcap], [], [
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 @@
1From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 17 May 2022 10:56:59 +0200
4Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
5
6This resolves the build error under musl:
7
8| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
9| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
10| | ^~~~~~~~~
11| | uint16_t
12
13Upstream-Status: Submitted [via email to phil@nwl.cc]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15
16---
17 iptables/xshared.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/iptables/xshared.h b/iptables/xshared.h
21index a200e0d..f543dbf 100644
22--- a/iptables/xshared.h
23+++ b/iptables/xshared.h
24@@ -6,6 +6,7 @@
25 #include <stdint.h>
26 #include <netinet/in.h>
27 #include <net/if.h>
28+#include <sys/types.h>
29 #include <linux/netfilter_arp/arp_tables.h>
30 #include <linux/netfilter_ipv4/ip_tables.h>
31 #include <linux/netfilter_ipv6/ip6_tables.h>
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 @@
1From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:49:07 +0200
4Subject: [PATCH] configure.ac:
5 only-check-conntrack-when-libnfnetlink-enabled.patch
6
7Package libnetfilter-conntrack depends on package libnfnetlink. iptables
8checks package libnetfilter-conntrack whatever its package config
9libnfnetlink is enabled or not. When libnfnetlink is disabled but
10package libnetfilter-conntrack exists, it fails randomly with:
11
12In file included from
13.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0:
14
15.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42:
16fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory
17
18compilation terminated.
19GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed
20Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it.
21
22Upstream-Status: Pending
23
24Signed-off-by: Kai Kang <kai.kang@windriver.com>
25Signed-off-by: Maxin B. John <maxin.john@intel.com>
26
27---
28 configure.ac | 6 ++++--
29 1 file changed, 4 insertions(+), 2 deletions(-)
30
31diff --git a/configure.ac b/configure.ac
32index d607772..25a8e75 100644
33--- a/configure.ac
34+++ b/configure.ac
35@@ -159,10 +159,12 @@ if test "$nftables" != 1; then
36 fi
37
38 if test "x$enable_connlabel" = "xyes"; then
39- PKG_CHECK_MODULES([libnetfilter_conntrack],
40+ nfconntrack=0
41+ AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
42+ PKG_CHECK_MODULES([libnetfilter_conntrack],
43 [libnetfilter_conntrack >= 1.0.6],
44 [nfconntrack=1], [nfconntrack=0])
45-
46+ ])
47 if test "$nfconntrack" -ne 1; then
48 blacklist_modules="$blacklist_modules connlabel";
49 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.11.bb
index cd2f3bce0b..686dc5afe5 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.11.bb
@@ -13,11 +13,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
13 file://iptables.rules \ 13 file://iptables.rules \
14 file://ip6tables.service \ 14 file://ip6tables.service \
15 file://ip6tables.rules \ 15 file://ip6tables.rules \
16 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
17 file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
18 file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
19 " 16 "
20SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" 17SRC_URI[sha256sum] = "d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2"
21 18
22SYSTEMD_SERVICE:${PN} = "\ 19SYSTEMD_SERVICE:${PN} = "\
23 iptables.service \ 20 iptables.service \
@@ -34,7 +31,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
34PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
35 32
36# libnfnetlink recipe is in meta-networking layer 33# libnfnetlink recipe is in meta-networking layer
37PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" 34PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink --enable-connlabel,--disable-libnfnetlink --disable-connlabel,libnfnetlink libnetfilter-conntrack"
38 35
39# libnftnl recipe is in meta-networking layer(previously known as libnftables) 36# libnftnl recipe is in meta-networking layer(previously known as libnftables)
40PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" 37PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl"
@@ -52,10 +49,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}"
52 49
53do_install:append() { 50do_install:append() {
54 install -d ${D}${IPTABLES_RULES_DIR} 51 install -d ${D}${IPTABLES_RULES_DIR}
55 install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} 52 install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR}
56 53
57 install -d ${D}${systemd_system_unitdir} 54 install -d ${D}${systemd_system_unitdir}
58 install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} 55 install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir}
59 56
60 sed -i \ 57 sed -i \
61 -e 's,@SBINDIR@,${sbindir},g' \ 58 -e 's,@SBINDIR@,${sbindir},g' \
@@ -63,8 +60,8 @@ do_install:append() {
63 ${D}${systemd_system_unitdir}/iptables.service 60 ${D}${systemd_system_unitdir}/iptables.service
64 61
65 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then 62 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then
66 install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} 63 install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR}
67 install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} 64 install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir}
68 65
69 sed -i \ 66 sed -i \
70 -e 's,@SBINDIR@,${sbindir},g' \ 67 -e 's,@SBINDIR@,${sbindir},g' \
@@ -75,6 +72,10 @@ do_install:append() {
75 # if libnftnl is included, make the iptables symlink point to the nft-based binary by default 72 # if libnftnl is included, make the iptables symlink point to the nft-based binary by default
76 if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then 73 if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then
77 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables 74 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables
75 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-save
76 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-restore
77 # ethertypes is provided by the netbase package
78 rm -f ${D}${sysconfdir}/ethertypes
78 fi 79 fi
79} 80}
80 81
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20250605.bb
index 5a5e15528e..4618fbb29a 100644
--- a/meta/recipes-extended/iputils/iputils_20240117.bb
+++ b/meta/recipes-extended/iputils/iputils_20250605.bb
@@ -8,12 +8,9 @@ LICENSE = "BSD-3-Clause & GPL-2.0-or-later"
8 8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819"
10 10
11DEPENDS = "gnutls" 11SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
12 12 "
13SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https" 13SRCREV = "6e1cb146547eb6fbb127ffc8397a9241be0d33c2"
14SRCREV = "8372f355bdf7a9b0c79338dd8ef8464c00a5c4e2"
15
16S = "${WORKDIR}/git"
17 14
18UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
19 16
@@ -35,7 +32,11 @@ ALTERNATIVE_PRIORITY = "100"
35ALTERNATIVE:${PN}-ping = "ping" 32ALTERNATIVE:${PN}-ping = "ping"
36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" 33ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
37 34
38SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" 35ALTERNATIVE:${PN}-ping6 = "ping6"
36ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
37
38SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}"
39PACKAGES += "${SPLITPKGS}" 40PACKAGES += "${SPLITPKGS}"
40 41
41ALLOW_EMPTY:${PN} = "1" 42ALLOW_EMPTY:${PN} = "1"
@@ -43,6 +44,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}"
43 44
44FILES:${PN} = "" 45FILES:${PN} = ""
45FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" 46FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
47FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
46FILES:${PN}-arping = "${base_bindir}/arping" 48FILES:${PN}-arping = "${base_bindir}/arping"
47FILES:${PN}-tracepath = "${base_bindir}/tracepath" 49FILES:${PN}-tracepath = "${base_bindir}/tracepath"
48FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" 50FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
51
52do_install:append() {
53 if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then
54 ln -sf ping ${D}/${base_bindir}/ping6
55 fi
56}
diff --git a/meta/recipes-extended/less/less_643.bb b/meta/recipes-extended/less/less_678.bb
index 67834bdd58..87ec6c92ca 100644
--- a/meta/recipes-extended/less/less_643.bb
+++ b/meta/recipes-extended/less/less_678.bb
@@ -21,7 +21,7 @@ SECTION = "console/utils"
21 21
22LICENSE = "GPL-3.0-or-later | BSD-2-Clause" 22LICENSE = "GPL-3.0-or-later | BSD-2-Clause"
23LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ 23LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
24 file://LICENSE;md5=1b2446f5c8632bf63a97d7a49750e1c6 \ 24 file://LICENSE;md5=8051a271adb36d1462531a3b40c22878 \
25 " 25 "
26DEPENDS = "ncurses" 26DEPENDS = "ncurses"
27 27
@@ -29,7 +29,7 @@ SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
29 file://run-ptest \ 29 file://run-ptest \
30 " 30 "
31 31
32SRC_URI[sha256sum] = "2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8" 32SRC_URI[sha256sum] = "4c085364f3028290d34647df27f56018c365dc4c0092ab7de74ed8fe89014fe7"
33 33
34UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" 34UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
35 35
@@ -55,7 +55,7 @@ do_install_ptest () {
55 cp -r ${S}/lesstest/lt ${D}${PTEST_PATH} 55 cp -r ${S}/lesstest/lt ${D}${PTEST_PATH}
56} 56}
57 57
58RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd locale-base-en-us" 58RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd perl-module-file-basename locale-base-en-us"
59 59
60ALTERNATIVE:${PN} = "less" 60ALTERNATIVE:${PN} = "less"
61ALTERNATIVE_PRIORITY = "100" 61ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/libaio/libaio_0.3.113.bb b/meta/recipes-extended/libaio/libaio_0.3.113.bb
index 87ab22ed17..2392fd5db2 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.113.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.113.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://pagure.io/libaio.git;protocol=https;branch=master \
11 file://system-linkage.patch \ 11 file://system-linkage.patch \
12 " 12 "
13SRCREV = "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448" 13SRCREV = "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448"
14S = "${WORKDIR}/git"
15 14
16EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" 15EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
17 16
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
deleted file mode 100644
index f3989d99eb..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1To work with autoconf 2.73, tweak the macro ordering in configure.in.
2
3Upstream-Status: Pending
4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5
6Index: libarchive-3.6.2/configure.ac
7===================================================================
8--- libarchive-3.6.2.orig/configure.ac
9+++ libarchive-3.6.2/configure.ac
10@@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then
11 esac
12 fi
13
14+# Checks for typedefs, structures, and compiler characteristics.
15+AC_C_CONST
16+# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
17+# and MSVC. Use a customized version.
18+la_TYPE_UID_T
19+AC_TYPE_MODE_T
20+# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
21+# most systems... default to "long long" instead.
22+AC_CHECK_TYPE(off_t, [long long])
23+AC_TYPE_SIZE_T
24+AC_CHECK_TYPE(id_t, [unsigned long])
25+AC_CHECK_TYPE(uintptr_t, [unsigned int])
26+
27 AC_ARG_WITH([libb2],
28 AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
29
30@@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS
31
32 AC_SUBST(GC_SECTIONS)
33
34-# Checks for typedefs, structures, and compiler characteristics.
35-AC_C_CONST
36-# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
37-# and MSVC. Use a customized version.
38-la_TYPE_UID_T
39-AC_TYPE_MODE_T
40-# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
41-# most systems... default to "long long" instead.
42-AC_CHECK_TYPE(off_t, [long long])
43-AC_TYPE_SIZE_T
44-AC_CHECK_TYPE(id_t, [unsigned long])
45-AC_CHECK_TYPE(uintptr_t, [unsigned int])
46-
47 # Check for tm_gmtoff in struct tm
48 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
49 [
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb b/meta/recipes-extended/libarchive/libarchive_3.8.1.bb
index 91f521fa4d..69520b1bad 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.8.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi
3HOMEPAGE = "http://www.libarchive.org/" 3HOMEPAGE = "http://www.libarchive.org/"
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "BSD-2-Clause" 5LICENSE = "BSD-2-Clause"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" 6LIC_FILES_CHKSUM = "file://COPYING;md5=7ce08437ff7f5e24d72e666313ae4084"
7 7
8DEPENDS = "e2fsprogs-native" 8DEPENDS = "e2fsprogs-native"
9 9
@@ -29,13 +29,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
29 29
30EXTRA_OECONF += "--enable-largefile --without-iconv" 30EXTRA_OECONF += "--enable-largefile --without-iconv"
31 31
32SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" 32SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz"
33SRC_URI += "file://configurehack.patch" 33UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
34UPSTREAM_CHECK_URI = "http://libarchive.org/"
35 34
36SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" 35SRC_URI[sha256sum] = "bde832a5e3344dc723cfe9cc37f8e54bde04565bfe6f136bc1bd31ab352e9fab"
37
38CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe"
39 36
40inherit autotools update-alternatives pkgconfig 37inherit autotools update-alternatives pkgconfig
41 38
diff --git a/meta/recipes-extended/libidn/libidn2_2.3.7.bb b/meta/recipes-extended/libidn/libidn2_2.3.8.bb
index 7ae933e047..a53ac47d66 100644
--- a/meta/recipes-extended/libidn/libidn2_2.3.7.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.3.8.bb
@@ -3,16 +3,16 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
3HOMEPAGE = "http://www.gnu.org/software/libidn/" 3HOMEPAGE = "http://www.gnu.org/software/libidn/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "(GPL-2.0-or-later | LGPL-3.0-only) & GPL-3.0-or-later & Unicode-DFS-2016" 5LICENSE = "(GPL-2.0-or-later | LGPL-3.0-only) & GPL-3.0-or-later & Unicode-DFS-2016"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
7 file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 7 file://COPYING.LESSERv3;md5=3000208d539ec061b899bce1d9ce9404 \
8 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://COPYINGv2;md5=570a9b3749dd0463a1778803b12a6dce \
9 file://COPYING.unicode;md5=684cf5f7e3fded3546679424528261a9 \ 9 file://COPYING.unicode;md5=684cf5f7e3fded3546679424528261a9 \
10 file://src/idn2.c;endline=16;md5=afc1531bda991ba6338e33a7eff758a0 \ 10 file://src/idn2.c;endline=16;md5=c44fb6f201f22da3a19857499b49b15d \
11 file://lib/idn2.h.in;endline=27;md5=f88d218005a5c45b68a83cecb5bd7f26 \ 11 file://lib/idn2.h.in;endline=27;md5=f27aee1b44326be3a28961c55319099f \
12 " 12 "
13 13
14SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz" 14SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
15SRC_URI[sha256sum] = "4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64" 15SRC_URI[sha256sum] = "f557911bf6171621e1f72ff35f5b1825bb35b52ed45325dcdee931e5d3c0787a"
16 16
17DEPENDS = "virtual/libiconv libunistring" 17DEPENDS = "virtual/libiconv libunistring"
18 18
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
11 11
12inherit autotools pkgconfig 12inherit autotools pkgconfig
13 13
14EXTRA_OECONF += "--with-doxygen=no"
15
14BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_2.0.1.bb
index 8cc1f7cec3..ff4ae6c243 100644
--- a/meta/recipes-extended/libnsl/libnsl2_git.bb
+++ b/meta/recipes-extended/libnsl/libnsl2_2.0.1.bb
@@ -10,15 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
10SECTION = "libs" 10SECTION = "libs"
11DEPENDS = "libtirpc" 11DEPENDS = "libtirpc"
12 12
13PV = "2.0.1" 13CVE_PRODUCT = "libnsl_project:libnsl"
14 14
15SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https"
15SRCREV = "d4b22e54b5e6637a69b26eab5faad2a326c9b182" 16SRCREV = "d4b22e54b5e6637a69b26eab5faad2a326c9b182"
16 17
17SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https \
18 "
19
20S = "${WORKDIR}/git"
21
22inherit autotools pkgconfig gettext 18inherit autotools pkgconfig gettext
23 19
24BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/libnss-nis/libnss-nis.bb b/meta/recipes-extended/libnss-nis/libnss-nis.bb
index f0e687c330..2198606de5 100644
--- a/meta/recipes-extended/libnss-nis/libnss-nis.bb
+++ b/meta/recipes-extended/libnss-nis/libnss-nis.bb
@@ -20,8 +20,6 @@ SRCREV = "cd0d391af9535b56e612ed227c1b89be269f3d59"
20SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \ 20SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \
21 " 21 "
22 22
23S = "${WORKDIR}/git"
24
25inherit autotools pkgconfig 23inherit autotools pkgconfig
26 24
27BBCLASSEXTEND += "native nativesdk" 25BBCLASSEXTEND += "native nativesdk"
diff --git a/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch b/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch
deleted file mode 100644
index e61e5aa869..0000000000
--- a/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next libpipeline upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb b/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
index 7e3f13ebde..1f6de1d925 100644
--- a/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.8.bb
@@ -7,9 +7,6 @@ LICENSE = "GPL-3.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" 7LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
8 8
9SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz" 9SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
10SRC_URI += "file://autoconf-2.73.patch" 10SRC_URI[sha256sum] = "1b1203ca152ccd63983c3f2112f7fe6fa5afd453218ede5153d1b31e11bb8405"
11SRC_URI[sha256sum] = "b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0"
12 11
13inherit pkgconfig autotools 12inherit pkgconfig autotools
14
15acpaths = "-I ${S}/gl/m4 -I ${S}/m4"
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..d6e983dec8 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 @@
1From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 1From da99bf09e83469612e2c821696025a4e591bb95c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 28 Oct 2021 22:28:45 -0700 3Date: Thu, 28 Oct 2021 22:28:45 -0700
4Subject: [PATCH] utils: Conside musl when wrapping qsort_r 4Subject: [PATCH] utils: Conside musl when wrapping qsort_r
@@ -29,6 +29,3 @@ index 72426e09..8f29bc5a 100644
29 29
30 void 30 void
31 solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) 31 solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard)
32--
332.33.1
34
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb b/meta/recipes-extended/libsolv/libsolv_0.7.33.bb
index 201059323a..13a6df2290 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.33.bb
@@ -12,18 +12,16 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \
12 file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ 12 file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \
13" 13"
14 14
15SRCREV = "c8dbb3a77c86600ce09d4f80a504cf4e78a3c359" 15SRCREV = "9fb855d872139fb1ebebec4c892b338fccda69ba"
16 16
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
18 18
19S = "${WORKDIR}/git"
20
21inherit cmake 19inherit cmake
22 20
23PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}"
24PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" 22PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm"
25 23
26EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON -DENABLE_ZSTD_COMPRESSION=ON" 24EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON -DENABLE_ZSTD_COMPRESSION=ON -DENABLE_STATIC=ON"
27 25
28PACKAGES =+ "${PN}-tools ${PN}ext" 26PACKAGES =+ "${PN}-tools ${PN}ext"
29 27
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch
new file mode 100644
index 0000000000..7bfe7c2924
--- /dev/null
+++ b/meta/recipes-extended/libtirpc/libtirpc/0001-Update-declarations-to-allow-compile-with-gcc-15.patch
@@ -0,0 +1,64 @@
1From b526c0a90953f47d4cbf7ef01e9ac13e9e76904a Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Thu, 12 Dec 2024 04:16:02 -0500
4Subject: [PATCH 1/2] Update declarations to allow compile with gcc-15
5
6This patch fixes some of the compile errors with gcc 15-20241117.
7
8In addition the follow declarations need to be fixed:
9 sed -n 75,77p libtirpc-1.3.6/src/key_call.c
10 cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
11 cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
12 des_block *(*__key_gendes_LOCAL)() = 0;
13
14Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d473f1e1f6ba80bfaee4daa058da159305167323]
15Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
16Signed-off-by: Steve Dickson <steved@redhat.com>
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/auth_none.c | 2 +-
20 src/getpublickey.c | 2 +-
21 src/svc_auth_none.c | 4 ++--
22 3 files changed, 4 insertions(+), 4 deletions(-)
23
24diff --git a/src/auth_none.c b/src/auth_none.c
25index 0b0bbd1..aca6e71 100644
26--- a/src/auth_none.c
27+++ b/src/auth_none.c
28@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *, struct opaque_auth *);
29 static bool_t authnone_refresh (AUTH *, void *);
30 static void authnone_destroy (AUTH *);
31
32-extern bool_t xdr_opaque_auth();
33+extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
34
35 static struct auth_ops *authnone_ops();
36
37diff --git a/src/getpublickey.c b/src/getpublickey.c
38index be37a24..4e96c7c 100644
39--- a/src/getpublickey.c
40+++ b/src/getpublickey.c
41@@ -52,7 +52,7 @@
42 /*
43 * Hack to let ypserv/rpc.nisd use AUTH_DES.
44 */
45-int (*__getpublickey_LOCAL)() = 0;
46+int (*__getpublickey_LOCAL)(const char *, char *) = 0;
47
48 /*
49 * Get somebody's public key
50diff --git a/src/svc_auth_none.c b/src/svc_auth_none.c
51index 887e809..5ca98e9 100644
52--- a/src/svc_auth_none.c
53+++ b/src/svc_auth_none.c
54@@ -37,8 +37,8 @@
55
56 #include <rpc/rpc.h>
57
58-static bool_t svcauth_none_destroy();
59-static bool_t svcauth_none_wrap();
60+static bool_t svcauth_none_destroy(SVCAUTH *);
61+static bool_t svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *);
62
63 struct svc_auth_ops svc_auth_none_ops = {
64 svcauth_none_wrap,
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch b/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch
new file mode 100644
index 0000000000..83e2105a1a
--- /dev/null
+++ b/meta/recipes-extended/libtirpc/libtirpc/0002-update-signal-and-key_call-declarations-to-allow-com.patch
@@ -0,0 +1,60 @@
1From 55452e6ae71869880f8c85d5dba9aa24d7147d8b Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Thu, 2 Jan 2025 08:46:24 -0500
4Subject: [PATCH 2/2] update signal and key_call declarations to allow compile
5 with gcc-15
6
7Follow up patch addressing the following declarations:
8 sed -n 75,77p libtirpc-1.3.6/src/key_call.c
9 cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
10 cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
11 des_block *(*__key_gendes_LOCAL)() = 0;
12
13Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=240ee6c774729c9c24812aa8912f1fcf8996b162]
14Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
15Signed-off-by: Steve Dickson <steved@redhat.com>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 src/auth_time.c | 4 ++--
19 src/key_call.c | 6 +++---
20 2 files changed, 5 insertions(+), 5 deletions(-)
21
22diff --git a/src/auth_time.c b/src/auth_time.c
23index 936dd76..c21b1df 100644
24--- a/src/auth_time.c
25+++ b/src/auth_time.c
26@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
27 char ut[64], ipuaddr[64];
28 endpoint teps[32];
29 nis_server tsrv;
30- void (*oldsig)() = NULL; /* old alarm handler */
31+ void (*oldsig)(int) = NULL; /* old alarm handler */
32 struct sockaddr_in sin;
33 int s = RPC_ANYSOCK;
34 socklen_t len;
35@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid)
36 } else {
37 int res;
38
39- oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
40+ oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
41 saw_alarm = 0; /* global tracking the alarm */
42 alarm(20); /* only wait 20 seconds */
43 res = connect(s, (struct sockaddr *)&sin, sizeof(sin));
44diff --git a/src/key_call.c b/src/key_call.c
45index 9f4b1d2..43f990e 100644
46--- a/src/key_call.c
47+++ b/src/key_call.c
48@@ -72,9 +72,9 @@
49 * implementations of these functions, and to call those in key_call().
50 */
51
52-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
53-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
54-des_block *(*__key_gendes_LOCAL)() = 0;
55+cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0;
56+cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0;
57+des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0;
58
59 static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
60
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 @@
1From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
2Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
3From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
4Date: Thu, 12 Oct 2023 16:22:59 +0200
5Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10If the configuration for IPv6 is disabled, the netconfig should not contain
11settings for tcp6 and udp6.
12
13The test for the configure option didn't work, because it check the wrong
14variable.
15
16Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
17Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net]
18Upstream-Status: Submitted [linux-nfs@vger.kernel.org]
19---
20 configure.ac | 2 +-
21 doc/Makefile.am | 5 +++++
22 2 files changed, 6 insertions(+), 1 deletion(-)
23
24diff --git a/configure.ac b/configure.ac
25index fe6c517..b687f8d 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -64,7 +64,7 @@ fi
29 AC_ARG_ENABLE(ipv6,
30 [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
31 [],[enable_ipv6=yes])
32-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
33+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
34 if test "x$enable_ipv6" != xno; then
35 AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
36 fi
37diff --git a/doc/Makefile.am b/doc/Makefile.am
38index d42ab90..b9678f6 100644
39--- a/doc/Makefile.am
40+++ b/doc/Makefile.am
41@@ -2,3 +2,8 @@ dist_sysconf_DATA = netconfig bindresvport.blacklist
42
43 CLEANFILES = cscope.* *~
44 DISTCLEANFILES = Makefile.in
45+
46+if ! INET6
47+install-exec-hook:
48+ $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
49+endif
50--
512.34.1
52
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb
index aa526e9e1c..6ea9a725db 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.6.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
10PROVIDES = "virtual/librpc" 10PROVIDES = "virtual/librpc"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
13 file://ipv6.patch \ 13 file://0001-Update-declarations-to-allow-compile-with-gcc-15.patch \
14" 14 file://0002-update-signal-and-key_call-declarations-to-allow-com.patch \
15 "
15UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" 16UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
16UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
17SRC_URI[sha256sum] = "1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860" 18SRC_URI[sha256sum] = "bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508"
18 19
19CVE_STATUS[CVE-2021-46828] = "fixed-version: fixed in 1.3.3rc1 so not present in 1.3.3" 20CVE_STATUS[CVE-2021-46828] = "fixed-version: fixed in 1.3.3rc1 so not present in 1.3.3"
20 21
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.75.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.79.bb
index fc3b7e005d..cd6790dff9 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.75.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.79.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
16 file://lighttpd \ 16 file://lighttpd \
17 " 17 "
18 18
19SRC_URI[sha256sum] = "8b721ca939d312afaa6ef31dcbd6afb5161ed385ac828e6fccd4c5b76be189d6" 19SRC_URI[sha256sum] = "3b29a625b3ad88702d1fea4f5f42bb7d87488f2e4efc977d7f185329ca6084bd"
20 20
21DEPENDS = "virtual/crypt" 21DEPENDS = "virtual/crypt"
22 22
@@ -47,9 +47,9 @@ SYSTEMD_SERVICE:${PN} = "lighttpd.service"
47 47
48do_install:append() { 48do_install:append() {
49 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav 49 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
50 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d 50 install -m 0755 ${UNPACKDIR}/lighttpd ${D}${sysconfdir}/init.d
51 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd 51 install -m 0644 ${UNPACKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd
52 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 52 install -m 0644 ${UNPACKDIR}/index.html.lighttpd ${D}/www/pages/index.html
53 53
54 install -d ${D}${systemd_system_unitdir} 54 install -d ${D}${systemd_system_unitdir}
55 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} 55 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..5c4a0a9807 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.21.0.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.22.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only"
6 6
7# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox? 7# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
8 8
9DEPENDS="coreutils popt" 9DEPENDS = "coreutils popt"
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12 12
@@ -14,7 +14,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \
14 file://run-ptest \ 14 file://run-ptest \
15 " 15 "
16 16
17SRC_URI[sha256sum] = "8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516" 17SRC_URI[sha256sum] = "42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618"
18 18
19CVE_STATUS_GROUPS = "CVE_STATUS_RECIPE" 19CVE_STATUS_GROUPS = "CVE_STATUS_RECIPE"
20CVE_STATUS_RECIPE = "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" 20CVE_STATUS_RECIPE = "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550"
diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb
index 00d8183a4f..a7039ea4d1 100644
--- a/meta/recipes-extended/lsb/lsb-release_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb
@@ -29,7 +29,7 @@ do_install() {
29 echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release 29 echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release
30 echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release 30 echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release
31 if [ -n "${DISTRO_CODENAME}" ]; then 31 if [ -n "${DISTRO_CODENAME}" ]; then
32 echo "DISTRIB_CODENAME=${DISTRO_CODENAME}" >> ${D}${sysconfdir}/lsb-release 32 echo "DISTRIB_CODENAME=\"${DISTRO_CODENAME}\"" >> ${D}${sysconfdir}/lsb-release
33 fi 33 fi
34 echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release 34 echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release
35} 35}
diff --git a/meta/recipes-extended/lsof/lsof_4.99.3.bb b/meta/recipes-extended/lsof/lsof_4.99.4.bb
index 93e91fb427..b977fc4897 100644
--- a/meta/recipes-extended/lsof/lsof_4.99.3.bb
+++ b/meta/recipes-extended/lsof/lsof_4.99.4.bb
@@ -8,9 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510"
8 8
9SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ 9SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
10 file://remove-host-information.patch" 10 file://remove-host-information.patch"
11SRCREV = "2e4c7a1a9bc7258dc5b6a3ab28ebca44174279a8" 11SRCREV = "bbf320ce586a848f880bca7b758d50ae4c712624"
12
13S = "${WORKDIR}/git"
14 12
15inherit update-alternatives autotools pkgconfig manpages 13inherit update-alternatives autotools pkgconfig manpages
16PACKAGECONFIG[manpages] = "" 14PACKAGECONFIG[manpages] = ""
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 @@
1From 2d384f268791ecd5ff0f26c8137dd4de0a1c4566 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 10 Jun 2024 22:52:56 -0700
4Subject: [PATCH] Add __clear_cache declaration for clang
5
6__clear_cache was enabled on RISCV recently with 7352ba02390116f1cd6a9b583860ba28aa0a1b7a
7however it fails to compile with clang19 on RISCV
8With this error
9
10 hugemmap15.c:51:2: error: call to undeclared function '__clear_cache'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
11 51 | __clear_cache(p, p + COPY_SIZE);
12 | ^
13
14Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2024-June/038762.html]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Cc: Hui Min Mina Chou <minachou@andestech.com>
17---
18 testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
22index a84ba6476..856e22ff3 100644
23--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
24+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
25@@ -21,6 +21,7 @@
26
27 #if defined(__clang__)
28 #pragma clang optimize off
29+ void __clear_cache(void *start, void *end);
30 #endif
31
32 #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 @@
1From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 1From 768159aa53257d247645a12518778f50b8fdf578 Mon Sep 17 00:00:00 2001
2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> 2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
3Date: Wed, 29 Jul 2020 08:47:09 -0400 3Date: Wed, 29 Jul 2020 08:47:09 -0400
4Subject: [PATCH] Remove OOM tests from runtest/mm 4Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -14,10 +14,10 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
14 1 file changed, 6 deletions(-) 14 1 file changed, 6 deletions(-)
15 15
16diff --git a/runtest/mm b/runtest/mm 16diff --git a/runtest/mm b/runtest/mm
17index d859b331c..3c2962f44 100644 17index 6a8cd0b9d..8ce3f4416 100644
18--- a/runtest/mm 18--- a/runtest/mm
19+++ b/runtest/mm 19+++ b/runtest/mm
20@@ -74,12 +74,6 @@ ksm07 ksm07 20@@ -76,12 +76,6 @@ ksm07 ksm07
21 21
22 cpuset01 cpuset01 22 cpuset01 cpuset01
23 23
@@ -30,6 +30,3 @@ index d859b331c..3c2962f44 100644
30 swapping01 swapping01 -i 5 30 swapping01 swapping01 -i 5
31 31
32 thp01 thp01 -I 120 32 thp01 thp01 -I 120
33--
342.43.0
35
diff --git a/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch b/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch
new file mode 100644
index 0000000000..c6fae88eb9
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-cve-2015-3290-Disable-AVX-for-x86_64.patch
@@ -0,0 +1,42 @@
1From 28d823a63ee29f5d72c2aba781a06a7e2651cadc Mon Sep 17 00:00:00 2001
2From: Siddhesh Poyarekar <siddhesh@gotplt.org>
3Date: Mon, 7 Apr 2025 06:24:47 -0400
4Subject: [PATCH] cve-2015-3290: Disable AVX for x86_64
5
6When the input compiler enables AVX, stack realignment requirements
7causes gcc to fail to omit %rbp use, due to which the test fails to
8clobber %rbp in inline asm. Disable AVX to build the test on x86_64 so
9that the test continues working.
10
11Link: https://lore.kernel.org/ltp/20250407102448.2605506-2-siddhesh@gotplt.org/
12
13Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/28d823a63ee29f5d72c2aba781a06a7e2651cadc]
14
15Reviewed-by: Martin Doucha <mdoucha@suse.cz>
16Reviewed-by: Petr Vorel <pvorel@suse.cz>
17Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
18
19---
20 testcases/cve/Makefile | 6 ++++++
21 1 file changed, 6 insertions(+)
22
23diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
24index 01b9b9ccb..98c38e908 100644
25--- a/testcases/cve/Makefile
26+++ b/testcases/cve/Makefile
27@@ -22,6 +22,12 @@ ifneq (,$(filter $(HOST_CPU),x86 x86_64))
28 meltdown: CFLAGS += -msse2
29 endif
30
31+# The test needs to clobber %rbp, which requires frame pointer omission. Also
32+# for x86_64, disable AVX since that could sometimes require a stack
33+# realignment, which gets in the way of frame pointer omission.
34 cve-2015-3290: CFLAGS += -pthread -fomit-frame-pointer
35+ifeq ($(HOST_CPU),x86_64)
36+cve-2015-3290: CFLAGS += -mno-avx
37+endif
38
39 include $(top_srcdir)/include/mk/generic_leaf_target.mk
40--
412.37.3
42
diff --git a/meta/recipes-extended/ltp/ltp/0001-kernel-kvm-don-t-hardcode-objcopy.patch b/meta/recipes-extended/ltp/ltp/0001-kernel-kvm-don-t-hardcode-objcopy.patch
new file mode 100644
index 0000000000..256c8eaa34
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-kernel-kvm-don-t-hardcode-objcopy.patch
@@ -0,0 +1,69 @@
1From 0a42a8ee0ae8c6f1e603c1836b7c9c7fab0ca3a8 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Thu, 27 Feb 2025 12:38:50 +0000
4Subject: [PATCH] kernel/kvm: don't hardcode objcopy
5
6testcases/kernel/kvm uses objcopy to contruct a payload binary, but in
7cross builds the host objcopy may not know how to handle target
8binaries:
9
10 CC testcases/kernel/kvm/lib_host.o
11 objcopy: Unable to recognise the format of the input file `kvm_svm03-payload.elf'
12 make[3]: *** [ltp/testcases/kernel/kvm/Makefile:67: kvm_svm03-payload.o] Error 1
13
14This is trivially fixed by searching for an objcopy tool (so
15host-prefixed in cross builds) and using that instead.
16
17Upstream-Status: Backport [a3942c0a5f9b4463e8320e80cd8522a2e008bfd2]
18Signed-off-by: Ross Burton <ross.burton@arm.com>
19---
20 configure.ac | 1 +
21 include/mk/config.mk.in | 1 +
22 testcases/kernel/kvm/Makefile | 4 ++--
23 3 files changed, 4 insertions(+), 2 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index 344b2ae2c..0f2b6f332 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -30,6 +30,7 @@ AC_PROG_RANLIB
30 AC_DEFUN([AC_PROG_STRIP], [AC_CHECK_TOOL(STRIP, strip, :)])
31 AC_PROG_STRIP
32 AC_PROG_YACC
33+AC_CHECK_TOOL([OBJCOPY], [objcopy], [:])
34
35 m4_ifndef([PKG_CHECK_EXISTS],
36 [m4_fatal([must install pkg-config or pkgconfig and pkg.m4 macro (usual dependency), see INSTALL])])
37diff --git a/include/mk/config.mk.in b/include/mk/config.mk.in
38index 2b7c8a071..4c3da304f 100644
39--- a/include/mk/config.mk.in
40+++ b/include/mk/config.mk.in
41@@ -11,6 +11,7 @@ AR := @AR@
42 CC := @CC@
43 LEX := @LEX@
44 RANLIB := @RANLIB@
45+OBJCOPY := @OBJCOPY@
46 STRIP := @STRIP@
47 YACC := @YACC@
48
49diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile
50index 07bdd9705..e93528a33 100644
51--- a/testcases/kernel/kvm/Makefile
52+++ b/testcases/kernel/kvm/Makefile
53@@ -60,11 +60,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk
54 %-payload.o: %.c lib_guest.o $(ARCH_OBJ)
55 ifdef VERBOSE
56 $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS)
57- objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
58+ $(OBJCOPY) -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
59 $(KVM_LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
60 else
61 @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS)
62- @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
63+ @$(OBJCOPY) -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
64 @$(KVM_LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
65 @echo KVM_CC $(target_rel_dir)$@
66 endif
67--
682.43.0
69
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 @@
1From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Thu, 14 Mar 2024 09:47:10 +0800
4Subject: [PATCH] scenario_groups/default: remove connectors
5
6runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default.
7
8Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc")
9Closes: https://github.com/linux-test-project/ltp/pull/1144
10
11Upstream-Status: Backport from
12[https://github.com/linux-test-project/ltp/commit/14c710ca]
13
14Reviewed-by: Petr Vorel <pvorel@suse.cz>
15Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
16---
17 scenario_groups/default | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/scenario_groups/default b/scenario_groups/default
21index f17b2061a..ec77d8fb8 100644
22--- a/scenario_groups/default
23+++ b/scenario_groups/default
24@@ -16,7 +16,6 @@ controllers
25 filecaps
26 cap_bounds
27 fcntl-locktests
28-connectors
29 power_management_tests
30 hugetlb
31 commands
32--
332.34.1
34
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20250130.bb
index 3e896957d1..fc643c2ab9 100644
--- a/meta/recipes-extended/ltp/ltp_20240129.bb
+++ b/meta/recipes-extended/ltp/ltp_20250130.bb
@@ -24,30 +24,29 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse"
24 24
25CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" 25CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
26CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 26CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
27SRCREV = "68737d20556d37364c95776044b1119c0912a36a" 27SRCREV = "a7c31dff7edc089a32e990765e12952cc4d7666a"
28 28
29SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ 29SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
30 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 30 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
31 file://0001-scenario_groups-default-remove-connectors.patch \ 31 file://0001-Add-__clear_cache-declaration-for-clang.patch \
32 file://0001-kernel-kvm-don-t-hardcode-objcopy.patch \
33 file://0001-cve-2015-3290-Disable-AVX-for-x86_64.patch \
32 " 34 "
33 35
34S = "${WORKDIR}/git"
35
36inherit autotools-brokensep pkgconfig 36inherit autotools-brokensep pkgconfig
37 37
38# Version 20220527 added KVM test infrastructure which currently fails to build with gold due to 38# Version 20220527 added KVM test infrastructure which currently fails to build with lld due to
39# SORT_NONE in linker script which isn't supported by gold: 39# SORT_NONE in linker script which isn't supported by gold:
40# https://sourceware.org/bugzilla/show_bug.cgi?id=18097 40# https://sourceware.org/bugzilla/show_bug.cgi?id=18097
41# https://github.com/linux-test-project/ltp/commit/3fce2064b54843218d085aae326c8f7ecf3a8c41#diff-39268f0855c634ca48c8993fcd2c95b12a65b79e8d9fa5ccd6b0f5a8785c0dd6R36 41# https://github.com/linux-test-project/ltp/commit/3fce2064b54843218d085aae326c8f7ecf3a8c41#diff-39268f0855c634ca48c8993fcd2c95b12a65b79e8d9fa5ccd6b0f5a8785c0dd6R36
42LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" 42LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '-fuse-ld=bfd', '', d)}"
43LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}"
44 43
45# After 0002-kvm-use-LD-instead-of-hardcoding-ld.patch 44# After 0002-kvm-use-LD-instead-of-hardcoding-ld.patch
46# https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb 45# https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb
47# it fails with gold also a bit later when trying to use *-payload.bin 46# it fails with lld also a bit later when trying to use *-payload.bin
48# http://errors.yoctoproject.org/Errors/Details/663094/ 47# http://errors.yoctoproject.org/Errors/Details/663094/
49# work around this by forcing .bfd linked in LD when ld-is-gold is in DISTRO_FEATURES 48# work around this by forcing .bfd linked in LD when ld-is-lld is in DISTRO_FEATURES
50KVM_LD = "${@bb.utils.contains_any('DISTRO_FEATURES', 'ld-is-gold ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${LD}', d)}" 49KVM_LD = "${@bb.utils.contains_any('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${LD}', d)}"
51 50
52TARGET_CC_ARCH += "${LDFLAGS}" 51TARGET_CC_ARCH += "${LDFLAGS}"
53 52
@@ -98,6 +97,7 @@ RDEPENDS:${PN} = "\
98 gdb \ 97 gdb \
99 gzip \ 98 gzip \
100 iproute2 \ 99 iproute2 \
100 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'iputils-ping6', '', d)} \
101 ldd \ 101 ldd \
102 libaio \ 102 libaio \
103 logrotate \ 103 logrotate \
@@ -120,6 +120,8 @@ FILES:${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${pr
120INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01" 120INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01"
121INSANE_SKIP:${PN} += "already-stripped staticdev" 121INSANE_SKIP:${PN} += "already-stripped staticdev"
122 122
123CACHED_CONFIGUREVARS:libc-musl = "ac_cv_type_struct_mnt_id_req=no ac_cv_type_struct_statmount=no"
124
123remove_broken_musl_sources() { 125remove_broken_musl_sources() {
124 [ "${TCLIBC}" = "musl" ] || return 0 126 [ "${TCLIBC}" = "musl" ] || return 0
125 127
@@ -133,7 +135,8 @@ remove_broken_musl_sources() {
133 testcases/kernel/syscalls/getcontext/getcontext01.c \ 135 testcases/kernel/syscalls/getcontext/getcontext01.c \
134 testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ 136 testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \
135 testcases/kernel/syscalls/timer_create/timer_create01.c \ 137 testcases/kernel/syscalls/timer_create/timer_create01.c \
136 testcases/kernel/syscalls/timer_create/timer_create03.c 138 testcases/kernel/syscalls/timer_create/timer_create03.c \
139 testcases/kernel/syscalls/statmount/statmount02.c
137} 140}
138do_patch[postfuncs] += "remove_broken_musl_sources" 141do_patch[postfuncs] += "remove_broken_musl_sources"
139 142
diff --git a/meta/recipes-extended/lzip/lzip_1.24.1.bb b/meta/recipes-extended/lzip/lzip_1.25.bb
index 6eda012734..590e35cb75 100644
--- a/meta/recipes-extended/lzip/lzip_1.24.1.bb
+++ b/meta/recipes-extended/lzip/lzip_1.25.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "http://lzip.nongnu.org/lzip.html"
3DESCRIPTION = "Lzip is a lossless data compressor with a user interface similar to the one of gzip or bzip2. Lzip uses a simplified form of the Lempel-Ziv-Markov chain-Algorithm (LZMA) stream format, chosen to maximize safety and interoperability." 3DESCRIPTION = "Lzip is a lossless data compressor with a user interface similar to the one of gzip or bzip2. Lzip uses a simplified form of the Lempel-Ziv-Markov chain-Algorithm (LZMA) stream format, chosen to maximize safety and interoperability."
4SECTION = "console/utils" 4SECTION = "console/utils"
5LICENSE = "GPL-2.0-or-later" 5LICENSE = "GPL-2.0-or-later"
6LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=cca7f74ec83b7a9ce7ccd195aad471bd \
7 file://decoder.cc;beginline=3;endline=16;md5=18c279060cd0be128188404b45837f88 \ 7 file://decoder.cc;beginline=3;endline=16;md5=18c279060cd0be128188404b45837f88 \
8 " 8 "
9 9
10SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" 10SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
11SRC_URI[sha256sum] = "30c9cb6a0605f479c496c376eb629a48b0a1696d167e3c1e090c5defa481b162" 11SRC_URI[sha256sum] = "09418a6d8fb83f5113f5bd856e09703df5d37bae0308c668d0f346e3d3f0a56f"
12 12
13B = "${WORKDIR}/build" 13B = "${WORKDIR}/build"
14do_configure[cleandirs] = "${B}" 14do_configure[cleandirs] = "${B}"
diff --git a/meta/recipes-extended/lzip/lzlib_1.14.bb b/meta/recipes-extended/lzip/lzlib_1.15.bb
index a6010bbf27..087b781873 100644
--- a/meta/recipes-extended/lzip/lzlib_1.14.bb
+++ b/meta/recipes-extended/lzip/lzlib_1.15.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=04d943636aa1482e0a97d924d9f4f68f \
6 " 6 "
7 7
8SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzlib/lzlib-${PV}.tar.gz" 8SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzlib/lzlib-${PV}.tar.gz"
9SRC_URI[sha256sum] = "5acac8714ed4f306020bae660dddce706e5f8a795863679037da9fe6bf4dcf6f" 9SRC_URI[sha256sum] = "4afab907a46d5a7d14e927a1080c3f4d7e3ca5a0f9aea81747d8fed0292377ff"
10 10
11B = "${WORKDIR}/build" 11B = "${WORKDIR}/build"
12do_configure[cleandirs] = "${B}" 12do_configure[cleandirs] = "${B}"
diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
deleted file mode 100644
index 57ecd48b1f..0000000000
--- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Feb 2022 17:30:16 -0800
4Subject: [PATCH] man: Move local variable declaration to function scope
5
6There is a clang bug [1] unearthed here, so help clang by re-arranging
7code without changing the logic, until its fixed in clang
8
9[1] https://github.com/llvm/llvm-project/issues/53692
10
11Upstream-Status: Inappropriate [Inappropriate: Clang bug]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/man.c | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/src/man.c b/src/man.c
18index 195d35d..6870989 100644
19--- a/src/man.c
20+++ b/src/man.c
21@@ -379,7 +379,7 @@ static void init_html_pager (void)
22 static error_t parse_opt (int key, char *arg, struct argp_state *state)
23 {
24 static bool apropos, whatis; /* retain values between calls */
25-
26+ char *s;
27 /* Please keep these keys in the same order as in options above. */
28 switch (key) {
29 case 'C':
30@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
31 case OPT_WARNINGS:
32 #ifdef NROFF_WARNINGS
33 {
34- char *s = xstrdup
35+ s = xstrdup
36 (arg ? arg : default_roff_warnings);
37 const char *warning;
38
diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.13.1.bb
index 27b47a7f47..f044a47f7d 100644
--- a/meta/recipes-extended/man-db/man-db_2.12.1.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.1.bb
@@ -9,23 +9,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
9 9
10SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ 10SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
11 file://99_mandb \ 11 file://99_mandb \
12 file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ 12 "
13 " 13SRC_URI[sha256sum] = "8afebb6f7eb6bb8542929458841f5c7e6f240e30c86358c1fbcefbea076c87d9"
14SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265"
15 14
16DEPENDS = "libpipeline gdbm groff-native base-passwd" 15DEPENDS = "libpipeline gdbm groff-native base-passwd"
17RDEPENDS:${PN} += "base-passwd" 16RDEPENDS:${PN} += "base-passwd"
18PACKAGE_WRITE_DEPS += "base-passwd" 17PACKAGE_WRITE_DEPS += "base-passwd"
19 18
20# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
21USE_NLS:libc-musl = "no"
22
23inherit gettext pkgconfig autotools systemd 19inherit gettext pkgconfig autotools systemd
24 20
25EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}" 21EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}"
26EXTRA_AUTORECONF += "-I ${S}/gl/m4" 22EXTRA_AUTORECONF += "-I ${S}/gl/m4"
27 23
24PACKAGECONFIG ??= ""
25
28PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2" 26PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2"
27# util-linux col is deprecated and only builds for glibc
28PACKAGECONFIG[col] = "--with-col=col,--with-col=,,util-linux-col"
29PACKAGECONFIG[gzip] = "--with-gzip=gzip,ac_cv_prog_have_gzip='',gzip" 29PACKAGECONFIG[gzip] = "--with-gzip=gzip,ac_cv_prog_have_gzip='',gzip"
30PACKAGECONFIG[lzip] = "--with-lzip=lzip,ac_cv_prog_have_lzip='',lzip" 30PACKAGECONFIG[lzip] = "--with-lzip=lzip,ac_cv_prog_have_lzip='',lzip"
31PACKAGECONFIG[lzma] = "--with-lzma=lzma,ac_cv_prog_have_lzma='',xz" 31PACKAGECONFIG[lzma] = "--with-lzma=lzma,ac_cv_prog_have_lzma='',xz"
@@ -37,14 +37,10 @@ do_install() {
37 37
38 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 38 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
39 install -d ${D}/etc/default/volatiles 39 install -d ${D}/etc/default/volatiles
40 install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles 40 install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles
41 fi 41 fi
42} 42}
43 43
44do_install:append:libc-musl() {
45 rm -f ${D}${libdir}/charset.alias
46}
47
48FILES:${PN} += "${prefix}/lib/tmpfiles.d" 44FILES:${PN} += "${prefix}/lib/tmpfiles.d"
49 45
50FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" 46FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so"
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 @@
1From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 13 Mar 2024 17:30:02 +0100
4Subject: [PATCH] GNUmakefile: use env from PATH
5
6This allows using env from coreutils-native (rather than host env),
7which resolves the problem of missing -S option on distributions
8with much older coreutils such as Ubuntu 18.04.
9
10Once all autobuilder distros are newer than that, this patch
11can be dropped, together with corutils-native dependency.
12
13Upstream-Status: Inappropriate [made for obsolete host distros]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15---
16 GNUmakefile | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/GNUmakefile b/GNUmakefile
20index 1234194..65ba327 100644
21--- a/GNUmakefile
22+++ b/GNUmakefile
23@@ -21,7 +21,7 @@
24 ########################################################################
25
26
27-SHELL := /usr/bin/env
28+SHELL := env
29 .SHELLFLAGS := -S bash -Eeuo pipefail -c
30
31
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 @@
1From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Mar 2024 14:35:16 +0100
4Subject: [PATCH] man.ml: do not use /dev/stdin
5
6This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e
7(presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence),
8but it doesn't work under pseudo where /dev/stdin is absent.
9
10Upstream-Status: Inappropriate [yocto specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 share/mk/install/man.mk | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
17index b9865b9..06880f0 100644
18--- a/share/mk/install/man.mk
19+++ b/share/mk/install/man.mk
20@@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \
21
22 $(_manpages):
23 $(info INSTALL $@)
24- <$< \
25- $(SED) $(foreach s, $(MANSECTIONS), \
26+ $(INSTALL_DATA) -T $< $@
27+ $(SED) -i $(foreach s, $(MANSECTIONS), \
28 -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
29- | $(INSTALL_DATA) -T /dev/stdin $@
30+ $@
31 ifeq ($(LINK_PAGES),symlink)
32 if $(GREP) '^\.so ' <$@ >/dev/null; then \
33 $(GREP) '^\.so ' <$@ \
diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.14.bb
index 0f091bbd7d..92afff640d 100644
--- a/meta/recipes-extended/man-pages/man-pages_6.06.bb
+++ b/meta/recipes-extended/man-pages/man-pages_6.14.bb
@@ -2,7 +2,7 @@ SUMMARY = "Linux man-pages"
2DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" 2DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs"
3SECTION = "console/utils" 3SECTION = "console/utils"
4HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" 4HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
5LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" 5LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT"
6 6
7LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ 7LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \
8 file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \ 8 file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \
@@ -18,16 +18,11 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \
18 file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ 18 file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
19 " 19 "
20SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ 20SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \
21 file://0001-man.ml-do-not-use-dev-stdin.patch \
22 file://0001-GNUmakefile-use-env-from-PATH.patch \
23 " 21 "
24 22
25SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" 23SRC_URI[sha256sum] = "a298963d8baf37fa5ecd2b07c803e1f29ab0476add405a7e263e5c63baf43588"
26 24
27inherit manpages 25inherit manpages lib_package
28
29# can be dropped when ubuntu 18.04 is not in use anymore
30DEPENDS += "coreutils-native"
31 26
32MAN_PKG = "${PN}" 27MAN_PKG = "${PN}"
33 28
@@ -37,6 +32,7 @@ PACKAGECONFIG[manpages] = ""
37do_configure[noexec] = "1" 32do_configure[noexec] = "1"
38do_compile[noexec] = "1" 33do_compile[noexec] = "1"
39 34
35EXTRA_OEMAKE += "-R"
40do_install() { 36do_install() {
41 oe_runmake install prefix=${prefix} DESTDIR=${D} 37 oe_runmake install prefix=${prefix} DESTDIR=${D}
42 rm -rf ${D}${mandir}/man3/crypt.3 38 rm -rf ${D}${mandir}/man3/crypt.3
@@ -45,6 +41,10 @@ do_install() {
45 rm -rf ${D}${mandir}/man5/passwd.5 41 rm -rf ${D}${mandir}/man5/passwd.5
46} 42}
47 43
44RDEPENDS:${PN}-bin += " \
45 bash \
46"
47
48# Only deliveres man-pages so FILES:${PN} gets everything 48# Only deliveres man-pages so FILES:${PN} gets everything
49FILES:${PN}-doc = "" 49FILES:${PN}-doc = ""
50FILES:${PN} = "${mandir}/*" 50FILES:${PN} = "${mandir}/*"
diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch
index 92fa443865..297d2c7bd1 100644
--- a/meta/recipes-extended/mc/files/nomandate.patch
+++ b/meta/recipes-extended/mc/files/nomandate.patch
@@ -1,4 +1,4 @@
1From 78c5fd90a052f95157b3914c708a08b2eeab0154 Mon Sep 17 00:00:00 2001 1From 75b0c46bce7438fd4d4cf3d18c2d83f874793111 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 4 Feb 2020 18:12:15 +0000 3Date: Tue, 4 Feb 2020 18:12:15 +0000
4Subject: [PATCH] mc: Fix manpage date indeterminism 4Subject: [PATCH] mc: Fix manpage date indeterminism
@@ -20,7 +20,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
21 21
22diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am 22diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
23index 96f9f10..d734c5d 100644 23index ede02e4..19300eb 100644
24--- a/doc/man/date-of-man-include.am 24--- a/doc/man/date-of-man-include.am
25+++ b/doc/man/date-of-man-include.am 25+++ b/doc/man/date-of-man-include.am
26@@ -1,5 +1,5 @@ 26@@ -1,5 +1,5 @@
diff --git a/meta/recipes-extended/mc/mc_4.8.31.bb b/meta/recipes-extended/mc/mc_4.8.33.bb
index 69c32887a2..fd18edf7be 100644
--- a/meta/recipes-extended/mc/mc_4.8.31.bb
+++ b/meta/recipes-extended/mc/mc_4.8.33.bb
@@ -8,10 +8,10 @@ DEPENDS = "ncurses glib-2.0 util-linux file-replacement-native"
8RDEPENDS:${PN} = "ncurses-terminfo-base" 8RDEPENDS:${PN} = "ncurses-terminfo-base"
9RRECOMMENDS:${PN} = "ncurses-terminfo" 9RRECOMMENDS:${PN} = "ncurses-terminfo"
10 10
11SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "http://ftp.midnight-commander.org/${BPN}-${PV}.tar.bz2 \
12 file://nomandate.patch \ 12 file://nomandate.patch \
13 " 13 "
14SRC_URI[sha256sum] = "f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841" 14SRC_URI[sha256sum] = "a3ceb0af84226fedfe5f339464ff2849c3f6bf0321b72027c47b2c10e66a6dba"
15 15
16inherit autotools gettext pkgconfig 16inherit autotools gettext pkgconfig
17 17
@@ -31,6 +31,8 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
31CACHED_CONFIGUREVARS += "ac_cv_path_PERL_FOR_BUILD='/usr/bin/env perl'" 31CACHED_CONFIGUREVARS += "ac_cv_path_PERL_FOR_BUILD='/usr/bin/env perl'"
32CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" 32CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'"
33CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" 33CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'"
34CACHED_CONFIGUREVARS += "ac_cv_path_ZIP='/usr/bin/zip'"
35CACHED_CONFIGUREVARS += "ac_cv_path_UNZIP='/usr/bin/unzip'"
34CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" 36CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes"
35 37
36do_install:append () { 38do_install:append () {
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
index fa1f0aa520..8598aea1f1 100644
--- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
@@ -1,4 +1,4 @@
1From 76856a34a4e339e4a53b09d028f89fcc520e3127 Mon Sep 17 00:00:00 2001 1From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com> 2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 9 Feb 2016 11:44:01 +0200 3Date: Tue, 9 Feb 2016 11:44:01 +0200
4Subject: [PATCH] Fix the path of corosync and dlm header files check 4Subject: [PATCH] Fix the path of corosync and dlm header files check
@@ -14,10 +14,10 @@ Signed-off-by: Maxin B. John <maxin.john@intel.com>
14 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
17index cbdba49..7bfd336 100644 17index bcd092de..0a78cd22 100644
18--- a/Makefile 18--- a/Makefile
19+++ b/Makefile 19+++ b/Makefile
20@@ -109,8 +109,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots 20@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
21 SYSTEMD_DIR=/lib/systemd/system 21 SYSTEMD_DIR=/lib/systemd/system
22 LIB_DIR=/usr/libexec/mdadm 22 LIB_DIR=/usr/libexec/mdadm
23 23
diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
index a4be1aa8a1..bb4e8d0604 100644
--- a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
@@ -1,4 +1,4 @@
1From 0be066d57a7dd1aead5488d0a095863608f2e559 Mon Sep 17 00:00:00 2001 1From 407691e11037709af888ce2cf6bd5eac6971ac61 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 25 Jan 2022 16:25:01 +0800 3Date: Tue, 25 Jan 2022 16:25:01 +0800
4Subject: [PATCH] Makefile: install mdcheck 4Subject: [PATCH] Makefile: install mdcheck
@@ -14,10 +14,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
17index 1141971..f4059e2 100644 17index 981e16fa..b28e7855 100644
18--- a/Makefile 18--- a/Makefile
19+++ b/Makefile 19+++ b/Makefile
20@@ -325,6 +325,7 @@ install-systemd: systemd/mdmon@.service 20@@ -345,6 +345,7 @@ install-systemd: systemd/mdmon@.service
21 install-bin: mdadm mdmon 21 install-bin: mdadm mdmon
22 $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm 22 $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
23 $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon 23 $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
diff --git a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
deleted file mode 100644
index 16fdefbbd1..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From c29d086714b49a6d76ccca83b4a6fa2f139bad6e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 13 Oct 2017 10:27:34 -0700
4Subject: [PATCH] Use CC to check for implicit-fallthrough warning support
5
6This warning it new in gcc7 and in cross compile case
7its possible that build host gcc is version 7+ but the
8cross compile used for compiling mdadm is < version 7
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Pending
12---
13 Makefile | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/Makefile b/Makefile
17index 7bfd336..9ab6a65 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -56,21 +56,21 @@ CWFLAGS += -Wp -O3
21 endif
22
23 ifeq ($(origin FALLTHROUGH), undefined)
24- FALLTHROUGH := $(shell gcc -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
25+ FALLTHROUGH := $(shell ${CC} -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
26 ifneq "$(FALLTHROUGH)" "0"
27 CWFLAGS += -Wimplicit-fallthrough=0
28 endif
29 endif
30
31 ifeq ($(origin FORMATOVERFLOW), undefined)
32- FORMATOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
33+ FORMATOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
34 ifneq "$(FORMATOVERFLOW)" "0"
35 CWFLAGS += -Wformat-overflow
36 endif
37 endif
38
39 ifeq ($(origin STRINGOPOVERFLOW), undefined)
40- STRINGOPOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
41+ STRINGOPOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
42 ifneq "$(STRINGOPOVERFLOW)" "0"
43 CWFLAGS += -Wstringop-overflow
44 endif
diff --git a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
deleted file mode 100644
index 3cf295106f..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 78e5bb08971a5644a56af60d51ef35e13522e811 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 14 Dec 2018 15:12:31 +0800
4Subject: [PATCH] fix gcc-8 format-truncation warning
5
6While compiling with `-Werror=format-truncation=', it failed
7[snip]
8|super0.c:236:32: error: 'snprintf' output may be truncated
9before the last format character [-Werror=format-truncation=]
10| snprintf(nb, sizeof(nb), "%4d", d);
11| ^
12|super0.c:236:3: note: 'snprintf' output between 5 and 12 bytes
13into a destination of size 11
14| snprintf(nb, sizeof(nb), "%4d", d);
15[snip]
16
17Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/34]
18
19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20---
21 super0.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/super0.c b/super0.c
25index a7c5f81..a79b6bd 100644
26--- a/super0.c
27+++ b/super0.c
28@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost)
29 d++) {
30 mdp_disk_t *dp;
31 char *dv;
32- char nb[11];
33+ char nb[12];
34 int wonly, failfast;
35 if (d>=0) dp = &sb->disks[d];
36 else dp = &sb->this_disk;
diff --git a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch
deleted file mode 100644
index 70be43c15e..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 7759ceda978aba38861d4846d0c1657465b72f04 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 24 Mar 2024 23:13:32 -0700
4Subject: [PATCH] include libgen.h for basename API
5
6Musl does no more provide it via string.h therefore builds with newer
7compilers e.g. clang-18 fails due to missing prototype for basename
8therefore add libgen.h to included headers list
9
10Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20240325061537.275811-1-raj.khem@gmail.com/T/#u]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Monitor.c | 1 +
14 platform-intel.c | 1 +
15 super-intel.c | 1 +
16 3 files changed, 3 insertions(+)
17
18diff --git a/Monitor.c b/Monitor.c
19index 824a69f..e3942e1 100644
20--- a/Monitor.c
21+++ b/Monitor.c
22@@ -26,6 +26,7 @@
23 #include "udev.h"
24 #include "md_p.h"
25 #include "md_u.h"
26+#include <libgen.h>
27 #include <sys/wait.h>
28 #include <limits.h>
29 #include <syslog.h>
30diff --git a/platform-intel.c b/platform-intel.c
31index ac282bc..5d6687d 100644
32--- a/platform-intel.c
33+++ b/platform-intel.c
34@@ -19,6 +19,7 @@
35 #include "mdadm.h"
36 #include "platform-intel.h"
37 #include "probe_roms.h"
38+#include <libgen.h>
39 #include <stdio.h>
40 #include <stdlib.h>
41 #include <string.h>
42diff --git a/super-intel.c b/super-intel.c
43index dbea235..881dbda 100644
44--- a/super-intel.c
45+++ b/super-intel.c
46@@ -23,6 +23,7 @@
47 #include "dlink.h"
48 #include "sha1.h"
49 #include "platform-intel.h"
50+#include <libgen.h>
51 #include <values.h>
52 #include <scsi/sg.h>
53 #include <ctype.h>
54--
552.44.0
56
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
deleted file mode 100644
index f224d0008d..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From c27e128fdc062ec3fcdf7b48a8c5078615c538df Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 1 Jul 2019 11:34:49 +0800
4Subject: [PATCH] mdadm: add option -y for use syslog to recive event report
5
6fix service startup failed when there is
7No mail address or alert command
8
9Upstream-Status: Inappropriate [configuration]
10
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 systemd/mdmonitor.service | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
17index 9c36478..d289846 100644
18--- a/systemd/mdmonitor.service
19+++ b/systemd/mdmonitor.service
20@@ -14,4 +14,4 @@ Documentation=man:mdadm(8)
21 Environment= MDADM_MONITOR_ARGS=--scan
22 EnvironmentFile=-/run/sysconfig/mdadm
23 ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
24-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
25+ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
deleted file mode 100644
index 52daea2a49..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 4dd5c2659722b44409cee28b4cea68cdeaa1f987 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 9 May 2016 22:03:57 +0000
4Subject: [PATCH] mdadm.h: Undefine dprintf before redefining
5
6dprintf is also defined in libc see
7usr/include/bits/stdio2.h, this comes into
8play especially when fortify sources is enabled
9and compilers like clang reports the override
10
11In file included from policy.c:25:
12./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined]
13 ^
14/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Upstream-Status: Pending
18---
19 mdadm.h | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/mdadm.h b/mdadm.h
23index 1f28b3e..04996e2 100644
24--- a/mdadm.h
25+++ b/mdadm.h
26@@ -1869,11 +1869,13 @@ static inline sighandler_t signal_s(int sig, sighandler_t handler)
27 }
28
29 #ifdef DEBUG
30+#undef dprintf
31 #define dprintf(fmt, arg...) \
32 fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg)
33 #define dprintf_cont(fmt, arg...) \
34 fprintf(stderr, fmt, ##arg)
35 #else
36+#undef dprintf
37 #define dprintf(fmt, arg...) \
38 ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; })
39 #define dprintf_cont(fmt, arg...) \
diff --git a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
index 13435ee418..aa874dbec3 100644
--- a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
+++ b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
@@ -1,4 +1,4 @@
1From aa86de05cd6a75222b38e0789ac96fe00f705430 Mon Sep 17 00:00:00 2001 1From 9e3b15adf86147fe581cd2159cb99708abe26158 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Nov 2022 12:31:22 -0800 3Date: Thu, 10 Nov 2022 12:31:22 -0800
4Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support 4Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 3 files changed, 22 insertions(+), 15 deletions(-) 16 3 files changed, 22 insertions(+), 15 deletions(-)
17 17
18diff --git a/raid6check.c b/raid6check.c 18diff --git a/raid6check.c b/raid6check.c
19index 9947776..8e7f142 100644 19index 99477761..8e7f1421 100644
20--- a/raid6check.c 20--- a/raid6check.c
21+++ b/raid6check.c 21+++ b/raid6check.c
22@@ -22,6 +22,9 @@ 22@@ -22,6 +22,9 @@
@@ -60,7 +60,7 @@ index 9947776..8e7f142 100644
60 if (seek_res < 0) { 60 if (seek_res < 0) {
61 fprintf(stderr, "lseek to source %d failed\n", i); 61 fprintf(stderr, "lseek to source %d failed\n", i);
62diff --git a/restripe.c b/restripe.c 62diff --git a/restripe.c b/restripe.c
63index a7a7229..1c03577 100644 63index 5e126eb7..af76c634 100644
64--- a/restripe.c 64--- a/restripe.c
65+++ b/restripe.c 65+++ b/restripe.c
66@@ -22,6 +22,9 @@ 66@@ -22,6 +22,9 @@
@@ -71,9 +71,9 @@ index a7a7229..1c03577 100644
71+#define _FILE_OFFSET_BITS 64 71+#define _FILE_OFFSET_BITS 64
72+ 72+
73 #include "mdadm.h" 73 #include "mdadm.h"
74 #include <stdint.h> 74 #include "xmalloc.h"
75 75
76@@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned long long *offsets, 76@@ -583,7 +586,7 @@ int save_stripes(int *source, unsigned long long *offsets,
77 raid_disks, level, layout); 77 raid_disks, level, layout);
78 if (dnum < 0) abort(); 78 if (dnum < 0) abort();
79 if (source[dnum] < 0 || 79 if (source[dnum] < 0 ||
@@ -82,7 +82,7 @@ index a7a7229..1c03577 100644
82 offsets[dnum] + offset, 0) < 0 || 82 offsets[dnum] + offset, 0) < 0 ||
83 read(source[dnum], buf+disk * chunk_size, 83 read(source[dnum], buf+disk * chunk_size,
84 chunk_size) != chunk_size) { 84 chunk_size) != chunk_size) {
85@@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, 85@@ -756,8 +759,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
86 raid_disks, level, layout); 86 raid_disks, level, layout);
87 if (src_buf == NULL) { 87 if (src_buf == NULL) {
88 /* read from file */ 88 /* read from file */
@@ -93,7 +93,7 @@ index a7a7229..1c03577 100644
93 rv = -1; 93 rv = -1;
94 goto abort; 94 goto abort;
95 } 95 }
96@@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, 96@@ -818,7 +821,7 @@ int restore_stripes(int *dest, unsigned long long *offsets,
97 } 97 }
98 for (i=0; i < raid_disks ; i++) 98 for (i=0; i < raid_disks ; i++)
99 if (dest[i] >= 0) { 99 if (dest[i] >= 0) {
@@ -102,7 +102,7 @@ index a7a7229..1c03577 100644
102 offsets[i]+offset, 0) < 0) { 102 offsets[i]+offset, 0) < 0) {
103 rv = -1; 103 rv = -1;
104 goto abort; 104 goto abort;
105@@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned long long *offsets, 105@@ -868,7 +871,7 @@ int test_stripes(int *source, unsigned long long *offsets,
106 int disk; 106 int disk;
107 107
108 for (i = 0 ; i < raid_disks ; i++) { 108 for (i = 0 ; i < raid_disks ; i++) {
@@ -112,7 +112,7 @@ index a7a7229..1c03577 100644
112 chunk_size)) { 112 chunk_size)) {
113 free(q); 113 free(q);
114diff --git a/swap_super.c b/swap_super.c 114diff --git a/swap_super.c b/swap_super.c
115index b6db574..18c89e2 100644 115index b6db5743..18c89e2b 100644
116--- a/swap_super.c 116--- a/swap_super.c
117+++ b/swap_super.c 117+++ b/swap_super.c
118@@ -1,3 +1,6 @@ 118@@ -1,3 +1,6 @@
diff --git a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch
deleted file mode 100644
index 0916efafdf..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 8fa7d3cb96e8833743b635fb198675ad6c020b6e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 12 Mar 2024 10:51:51 +0100
4Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition
5
6Upstream-Status: Submitted [mariusz.tkaczyk@linux.intel.com,linux-raid@vger.kernel.org]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 util.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/util.c b/util.c
13index b145447..a9cb6c4 100644
14--- a/util.c
15+++ b/util.c
16@@ -36,7 +36,7 @@
17 #include <ctype.h>
18 #include <dirent.h>
19 #include <dlfcn.h>
20-
21+#include <limits.h>
22
23 /*
24 * following taken from linux/blkpg.h because they aren't
diff --git a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
index 145c65477a..e425fc446e 100644
--- a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
+++ b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
@@ -1,4 +1,4 @@
1From a22b2345b9773d362acd85dd4c4a6a3cda9100d4 Mon Sep 17 00:00:00 2001 1From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 12 Mar 2024 10:54:08 +0100 3Date: Tue, 12 Mar 2024 10:54:08 +0100
4Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE 4Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE
@@ -14,14 +14,14 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/Create.c b/Create.c 16diff --git a/Create.c b/Create.c
17index 8082f54..7071f0a 100644 17index fd6c9215..3210a03e 100644
18--- a/Create.c 18--- a/Create.c
19+++ b/Create.c 19+++ b/Create.c
20@@ -31,6 +31,7 @@ 20@@ -33,6 +33,7 @@
21 #include <signal.h> 21 #include <signal.h>
22 #include <sys/signalfd.h> 22 #include <sys/signalfd.h>
23 #include <sys/wait.h> 23 #include <sys/wait.h>
24+#include <linux/falloc.h> 24+#include <linux/falloc.h>
25 25
26 static int round_size_and_verify(unsigned long long *size, int chunk) 26 #ifndef FALLOC_FL_ZERO_RANGE
27 { 27 #define FALLOC_FL_ZERO_RANGE 16
diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
deleted file mode 100644
index b758fcd0ab..0000000000
--- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 319b3191f088cea7b0fb6038ab7625d5e049dcf7 Mon Sep 17 00:00:00 2001
2From: "martin f. krafft" <madduck@debian.org>
3Date: Mon, 3 Jan 2022 19:14:12 +0000
4Subject: [PATCH] Remove -Werror from compiler flags
5
6-Werror seems like a bad idea on released/packaged code because a toolchain
7update (introducing new warnings) could break the build. We'll let upstream
8use it to beautify the code, but remove it for out builds.
9
10Signed-off-by: martin f. krafft <madduck@debian.org>
11
12Upstream-Status: Pending
13---
14 Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index 9ab6a65..1141971 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
22 CC := $(CROSS_COMPILE)gcc
23 endif
24 CXFLAGS ?= -ggdb
25-CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
26+CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
27 ifdef WARN_UNUSED
28 CWFLAGS += -Wp -O3
29 endif
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
deleted file mode 100644
index ecd1f037d0..0000000000
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From ca91d9fc07943f209988411f2596e4b69828f208 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Sun, 15 Mar 2015 09:02:14 +0000
4Subject: [PATCH] mdadm: Fix build in x32 ABI
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9When try to print time_t values as a long int it causes an error because time_t
10data type in x32 ABI is long long int.
11
12Upstream-Status: Pending
13
14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
15---
16 monitor.c | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
18
19diff --git a/monitor.c b/monitor.c
20index 4acec67..8dcdfd6 100644
21--- a/monitor.c
22+++ b/monitor.c
23@@ -447,9 +447,12 @@ static int read_and_act(struct active_array *a, fd_set *fds)
24 if (FD_ISSET(mdi->bb_fd, fds))
25 check_for_cleared_bb(a, mdi);
26 }
27-
28 gettimeofday(&tv, NULL);
29+#if defined(__x86_64__) && defined(__ILP32__)
30+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
31+#else
32 dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
33+#endif
34 a->info.container_member,
35 tv.tv_sec, tv.tv_usec,
36 array_states[a->curr_state],
diff --git a/meta/recipes-extended/mdadm/files/xmalloc.patch b/meta/recipes-extended/mdadm/files/xmalloc.patch
new file mode 100644
index 0000000000..61774721d0
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/xmalloc.patch
@@ -0,0 +1,32 @@
1From c5cf5a83be4e3ce04ebf3250f77aeb465eeb53a1 Mon Sep 17 00:00:00 2001
2From: Xiao Ni <xni@redhat.com>
3Date: Fri, 17 Jan 2025 15:15:40 +0800
4Subject: [PATCH] mdadm/raid6check: add xmalloc.h to raid6check.c
5
6It reports building error:
7raid6check.c:324:26: error: implicit declaration of function xmalloc
8
9Add xmalloc.h to raid6check.c file to fix this.
10
11Signed-off-by: Xiao Ni <xni@redhat.com>
12Link: https://lore.kernel.org/r/20250117071540.4094-1-xni@redhat.com
13Signed-off-by: Song Liu <song@kernel.org>
14
15Upstream-Status: Backport [https://web.git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=e0df6c4c984d564e9e40913727e916a6cd8f466e]
16Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17---
18 raid6check.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/raid6check.c b/raid6check.c
22index 8e7f1421..486b10c6 100644
23--- a/raid6check.c
24+++ b/raid6check.c
25@@ -26,6 +26,7 @@
26 #define _FILE_OFFSET_BITS 64
27
28 #include "mdadm.h"
29+#include "xmalloc.h"
30 #include <stdint.h>
31 #include <sys/mman.h>
32
diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.4.bb
index 228fc6f84e..26a60e4c1a 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.3.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.4.bb
@@ -8,27 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ 8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" 9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
10 10
11 11SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
13 file://run-ptest \ 12 file://run-ptest \
14 file://mdadm-3.3.2_x32_abi_time_t.patch \
15 file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \
16 file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ 13 file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \
17 file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
18 file://0001-fix-gcc-8-format-truncation-warning.patch \
19 file://debian-no-Werror.patch \
20 file://mdadm.init \ 14 file://mdadm.init \
21 file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
22 file://0001-Makefile-install-mdcheck.patch \ 15 file://0001-Makefile-install-mdcheck.patch \
23 file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ 16 file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \
24 file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ 17 file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \
25 file://0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch \ 18 file://xmalloc.patch \
26 file://0001-include-libgen.h-for-basename-API.patch \
27 " 19 "
28 20
29SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" 21SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a"
30 22
31inherit autotools-brokensep ptest systemd 23inherit ptest systemd
32 24
33DEPENDS = "udev" 25DEPENDS = "udev"
34 26
@@ -43,29 +35,18 @@ CFLAGS:append:powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
43CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' 35CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
44CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' 36CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
45 37
46EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ 38EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \
47 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' 39 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \
40 SYSROOT="${STAGING_DIR_TARGET}" STRIP='
48 41
49DEBUG_OPTIMIZATION:append = " -Wno-error" 42DEBUG_OPTIMIZATION:append = " -Wno-error"
50 43
51do_compile() {
52 oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
53}
54
55do_install() { 44do_install() {
56 export STRIP="" 45 oe_runmake 'DESTDIR=${D}' install install-systemd
57 autotools_do_install
58}
59
60do_install:append() {
61 install -d ${D}/${sysconfdir}/ 46 install -d ${D}/${sysconfdir}/
62 install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf 47 install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
63 install -d ${D}/${sysconfdir}/init.d 48 install -d ${D}/${sysconfdir}/init.d
64 install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor 49 install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
65}
66
67do_install:append() {
68 oe_runmake install-systemd DESTDIR=${D}
69} 50}
70 51
71do_compile_ptest() { 52do_compile_ptest() {
diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb
index aa5a989df2..892233054b 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb
@@ -7,7 +7,6 @@ LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" 7LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e"
8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" 8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
9 9
10SRC_URI[md5sum] = "2a75ad6487ff271424ffc00a64420990"
11SRC_URI[sha256sum] = "0f55c90ba4faa913d91ef99cbf5cb2eb4dbe2780314c3bb17953f849c8cddd17" 10SRC_URI[sha256sum] = "0f55c90ba4faa913d91ef99cbf5cb2eb4dbe2780314c3bb17953f849c8cddd17"
12 11
13# substitute our CFLAGS for "-O2 -Wall -W -pipe" 12# substitute our CFLAGS for "-O2 -Wall -W -pipe"
@@ -16,12 +15,12 @@ EXTRA_OEMAKE = "CC='${CC}' \
16 CFLAGS='${CFLAGS} -D_GNU_SOURCE'" 15 CFLAGS='${CFLAGS} -D_GNU_SOURCE'"
17 16
18do_install(){ 17do_install(){
19 sed -i -e "s;SBINDIR=/sbin;SBINDIR=$base_sbindir;" ${S}/Makefile 18 sed -i -e "/^SBINDIR=/c SBINDIR=$base_sbindir" ${S}/Makefile
20 install -d ${D}${mandir}/man8 ${D}/${base_sbindir} 19 install -d ${D}${mandir}/man8 ${D}/${base_sbindir}
21 oe_runmake install DESTDIR=${D} 20 oe_runmake install DESTDIR=${D}
22} 21}
23 22
24inherit update-alternatives 23inherit update-alternatives sourceforge-releases
25 24
26ALTERNATIVE:${PN} = "getty" 25ALTERNATIVE:${PN} = "getty"
27ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" 26ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
diff --git a/meta/recipes-extended/minicom/minicom_2.9.bb b/meta/recipes-extended/minicom/minicom_2.10.bb
index 907d5c79c9..20ce5662c2 100644
--- a/meta/recipes-extended/minicom/minicom_2.9.bb
+++ b/meta/recipes-extended/minicom/minicom_2.10.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
9 9
10SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2" 10SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2"
11 11
12SRC_URI[sha256sum] = "9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c" 12SRC_URI[sha256sum] = "90e7ce2856b3eaaa3f452354d17981c49d32c426a255b6f0d3063a227c101538"
13 13
14PACKAGECONFIG ??= "" 14PACKAGECONFIG ??= ""
15PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" 15PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev"
diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb b/meta/recipes-extended/msmtp/msmtp_1.8.30.bb
index b575fad5e1..83ec83f326 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.8.30.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" 11UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/"
12 12
13SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" 13SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz"
14SRC_URI[sha256sum] = "2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738" 14SRC_URI[sha256sum] = "f826a3c500c4dfeed814685097cead9b2b3dca5a2ec3897967cb9032570fa9ab"
15 15
16inherit gettext autotools update-alternatives pkgconfig 16inherit gettext autotools update-alternatives pkgconfig
17 17
diff --git a/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch
new file mode 100644
index 0000000000..0d55512497
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch
@@ -0,0 +1,91 @@
1From 7a8f42fb20013a1493d8cae1c43436f85e656f2d Mon Sep 17 00:00:00 2001
2From: Zephkeks <zephyrofficialdiscord@gmail.com>
3Date: Tue, 13 May 2025 11:04:17 +0200
4Subject: [PATCH] CVE-2025-46836: interface.c: Stack-based Buffer Overflow in
5 get_name()
6
7Coordinated as GHSA-pfwf-h6m3-63wf
8
9CVE: CVE-2025-46836
10Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/7a8f42fb20013a1493d8cae1c43436f85e656f2d/]
11Signed-off-by: Peter Marko <peter.marko@siemens.com>
12---
13 lib/interface.c | 63 ++++++++++++++++++++++++++++++-------------------
14 1 file changed, 39 insertions(+), 24 deletions(-)
15
16diff --git a/lib/interface.c b/lib/interface.c
17index 71d4163..a054f12 100644
18--- a/lib/interface.c
19+++ b/lib/interface.c
20@@ -211,32 +211,47 @@ out:
21 }
22
23 static const char *get_name(char *name, const char *p)
24+/* Safe version — guarantees at most IFNAMSIZ‑1 bytes are copied
25+ and the destination buffer is always NUL‑terminated. */
26 {
27- while (isspace(*p))
28- p++;
29- while (*p) {
30- if (isspace(*p))
31- break;
32- if (*p == ':') { /* could be an alias */
33- const char *dot = p++;
34- while (*p && isdigit(*p)) p++;
35- if (*p == ':') {
36- /* Yes it is, backup and copy it. */
37- p = dot;
38- *name++ = *p++;
39- while (*p && isdigit(*p)) {
40- *name++ = *p++;
41- }
42- } else {
43- /* No, it isn't */
44- p = dot;
45- }
46- p++;
47- break;
48- }
49- *name++ = *p++;
50+ char *dst = name; /* current write ptr */
51+ const char *end = name + IFNAMSIZ - 1; /* last byte we may write */
52+
53+ /* Skip leading white‑space. */
54+ while (isspace((unsigned char)*p))
55+ ++p;
56+
57+ /* Copy until white‑space, end of string, or buffer full. */
58+ while (*p && !isspace((unsigned char)*p) && dst < end) {
59+ if (*p == ':') { /* possible alias veth0:123: */
60+ const char *dot = p; /* remember the colon */
61+ ++p;
62+ while (*p && isdigit((unsigned char)*p))
63+ ++p;
64+
65+ if (*p == ':') { /* confirmed alias */
66+ p = dot; /* rewind and copy it all */
67+
68+ /* copy the colon */
69+ if (dst < end)
70+ *dst++ = *p++;
71+
72+ /* copy the digits */
73+ while (*p && isdigit((unsigned char)*p) && dst < end)
74+ *dst++ = *p++;
75+
76+ if (*p == ':') /* consume trailing colon */
77+ ++p;
78+ } else { /* if so treat as normal */
79+ p = dot;
80+ }
81+ break; /* interface name ends here */
82+ }
83+
84+ *dst++ = *p++; /* ordinary character copy */
85 }
86- *name++ = '\0';
87+
88+ *dst = '\0'; /* always NUL‑terminate */
89 return p;
90 }
91
diff --git a/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch
new file mode 100644
index 0000000000..d2c3673a24
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch
@@ -0,0 +1,31 @@
1From ddb0e375fb9ca95bb69335540b85bbdaa2714348 Mon Sep 17 00:00:00 2001
2From: Bernd Eckenfels <net-tools@lina.inka.de>
3Date: Sat, 17 May 2025 21:53:23 +0200
4Subject: [PATCH] Interface statistic regression after 7a8f42fb2
5
6CVE: CVE-2025-46836
7Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/ddb0e375fb9ca95bb69335540b85bbdaa2714348/]
8Signed-off-by: Peter Marko <peter.marko@siemens.com>
9---
10 lib/interface.c | 5 ++---
11 1 file changed, 2 insertions(+), 3 deletions(-)
12
13diff --git a/lib/interface.c b/lib/interface.c
14index a054f12..ca4adf1 100644
15--- a/lib/interface.c
16+++ b/lib/interface.c
17@@ -239,12 +239,11 @@ static const char *get_name(char *name, const char *p)
18 /* copy the digits */
19 while (*p && isdigit((unsigned char)*p) && dst < end)
20 *dst++ = *p++;
21-
22- if (*p == ':') /* consume trailing colon */
23- ++p;
24 } else { /* if so treat as normal */
25 p = dot;
26 }
27+ if (*p == ':') /* consume trailing colon */
28+ ++p;
29 break; /* interface name ends here */
30 }
31
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..6c8297ba39 100644
--- a/meta/recipes-extended/net-tools/net-tools_2.10.bb
+++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb
@@ -11,10 +11,10 @@ SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \
11 file://net-tools-config.h \ 11 file://net-tools-config.h \
12 file://net-tools-config.make \ 12 file://net-tools-config.make \
13 file://Add_missing_headers.patch \ 13 file://Add_missing_headers.patch \
14 file://CVE-2025-46836-01.patch \
15 file://CVE-2025-46836-02.patch \
14" 16"
15 17
16S = "${WORKDIR}/git"
17
18inherit gettext 18inherit gettext
19 19
20# The Makefile is lame, no parallel build 20# The Makefile is lame, no parallel build
@@ -31,8 +31,8 @@ PACKAGECONFIG[plipconfig] = ""
31do_configure() { 31do_configure() {
32 # net-tools has its own config mechanism requiring "make config" 32 # net-tools has its own config mechanism requiring "make config"
33 # we pre-generate desired options and copy to source directory instead 33 # we pre-generate desired options and copy to source directory instead
34 cp ${WORKDIR}/net-tools-config.h ${S}/config.h 34 cp ${UNPACKDIR}/net-tools-config.h ${S}/config.h
35 cp ${WORKDIR}/net-tools-config.make ${S}/config.make 35 cp ${UNPACKDIR}/net-tools-config.make ${S}/config.make
36 36
37 if [ "${USE_NLS}" = "no" ]; then 37 if [ "${USE_NLS}" = "no" ]; then
38 sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make 38 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 @@
1From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 21 Sep 2016 21:14:40 +0200
4Subject: [PATCH] detect gold as GNU linker too
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Pending
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index 468c718..cd93f30 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *])
22 AC_MSG_CHECKING([for GNU ld])
23 LD=$($CC -print-prog-name=ld 2>&5)
24
25-if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then
26+if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then
27 # Not
28 GNU_LD=""
29 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 @@
1From fad40cfc18a42946a9a9e440c3434cd6b847ff9d Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Mon, 18 Jan 2016 17:05:19 +0000
4Subject: [PATCH] Makefile.in: Add tinfo library to the linking libraries
5Organization: O.S. Systems Software LTDA.
6
7Upstream-Status: Pending
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10---
11 Makefile.in | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile.in b/Makefile.in
15index a85d00f..98b85f9 100644
16--- a/Makefile.in
17+++ b/Makefile.in
18@@ -1,4 +1,4 @@
19-LIBS = -lslang @LIBS@
20+LIBS = -lslang -ltinfo @LIBS@
21 LIBTCL = @TCL_LIB_FLAG@
22
23 CC = @CC@
24--
252.1.4
26
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 @@
1Fix cross link using autoconf detected AR
2
3If building on 32bit host and creating 64bit libraries, the target
4package builds should not invoke the 32bit hosts's ar. Specifically
5you will get an error message like:
6
7x86_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
8libnewt.a: could not read symbols: Archive has no index; run ranlib to add one
9collect2: error: ld returned 1 exit status
10
11Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12
13Upstream-Status: Pending
14
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 Makefile.in | 3 ++-
18 configure.ac | 4 ++++
19 2 files changed, 6 insertions(+), 1 deletion(-)
20
21Index: newt-0.52.20/Makefile.in
22===================================================================
23--- newt-0.52.20.orig/Makefile.in
24+++ newt-0.52.20/Makefile.in
25@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
26 LDFLAGS = @LDFLAGS@
27 CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
28 GNU_LD = @GNU_LD@
29+AR = @AR@
30
31 VERSION = @VERSION@
32 TAG = r$(subst .,-,$(VERSION))
33@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE
34 $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
35
36 $(LIBNEWT): $(LIBOBJS)
37- ar rv $@ $^
38+ $(AR) rv $@ $^
39
40 newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
41
42Index: newt-0.52.20/configure.ac
43===================================================================
44--- newt-0.52.20.orig/configure.ac
45+++ newt-0.52.20/configure.ac
46@@ -15,6 +15,10 @@ AC_PROG_INSTALL
47 AC_PROG_LN_S
48 AC_PROG_GREP
49 AC_SYS_LARGEFILE
50+AN_MAKEVAR([AR], [AC_PROG_AR])
51+AN_PROGRAM([ar], [AC_PROG_AR])
52+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
53+AC_PROG_AR
54
55 AC_CHECK_SIZEOF([long])
56 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 @@
1SUMMARY = "A library for text mode user interfaces"
2
3DESCRIPTION = "Newt is a programming library for color text mode, widget based user \
4interfaces. Newt can be used to add stacked windows, entry widgets, \
5checkboxes, radio buttons, labels, plain text fields, scrollbars, \
6etc., to text mode user interfaces. This package also contains the \
7shared library needed by programs built with newt, as well as a \
8/usr/bin/dialog replacement called whiptail. Newt is based on the \
9slang library."
10
11HOMEPAGE = "https://releases.pagure.org/newt/"
12SECTION = "libs"
13
14LICENSE = "LGPL-2.0-only"
15LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
16
17# slang needs to be >= 2.2
18DEPENDS = "slang popt python3"
19
20SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
21 file://cross_ar.patch \
22 file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
23 file://0001-detect-gold-as-GNU-linker-too.patch \
24 "
25
26SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb"
27
28S = "${WORKDIR}/newt-${PV}"
29
30inherit autotools-brokensep python3native python3-dir python3targetconfig
31
32EXTRA_OECONF = "--without-tcl --with-python"
33
34EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
35
36CLEANBROKEN = "1"
37
38export CPPFLAGS
39
40PACKAGES:prepend = "whiptail ${PN}-python "
41
42RDEPENDS:${PN}-python += "python3-core"
43FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
44
45do_configure:prepend() {
46 sh autogen.sh
47}
48
49do_compile:prepend() {
50 # Make sure the recompile is OK
51 rm -f ${B}/.depend
52}
53
54FILES:whiptail = "${bindir}/whiptail"
55
56BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch
new file mode 100644
index 0000000000..ef087ffc06
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/0001-meson.build-correct-check-for-existence-of-two-prepr.patch
@@ -0,0 +1,40 @@
1From 9b5182d4781bcd6fb37a4030faf325965fde3e93 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 28 Nov 2024 20:32:17 +0100
4Subject: [PATCH] meson: correct check for existence of two preprocessor
5 defines
6
7sizeof is meant for *types*, and in case of cross compiling
8the test program produced by it has incorrect syntax
9 __NR_keyctl something;
10and will always fail to compile.
11
12* meson.build: Use cc.get_define() instead of cc.sizeof() to check for
13preprocessor symbols.
14
15Co-authored-by: Dmitry V. Levin <ldv@strace.io>
16Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/pull/861]
17Signed-off-by: Alexander Kanavin <alex@linutronix.de>
18---
19 meson.build | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index f6a7dafe9..307fed0aa 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -198,12 +198,12 @@ foreach ident: check_functions
27 endif
28 endforeach
29
30-enable_pam_keyinit = cc.sizeof('__NR_keyctl', prefix: '#include <sys/syscall.h>') > 0
31+enable_pam_keyinit = cc.get_define('__NR_keyctl', prefix: '#include <sys/syscall.h>') != ''
32
33 if get_option('mailspool') != ''
34 cdata.set_quoted('PAM_PATH_MAILDIR', get_option('mailspool'))
35 else
36- have = cc.sizeof('_PATH_MAILDIR', prefix: '#include <paths.h>') > 0
37+ have = cc.get_define('_PATH_MAILDIR', prefix: '#include <paths.h>') != ''
38 cdata.set('PAM_PATH_MAILDIR', have ? '_PATH_MAILDIR' : '"/var/spool/mail"')
39 endif
40
diff --git a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch b/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
deleted file mode 100644
index 124e5f1c3c..0000000000
--- a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001
2From: Jacob Heider <jacob@pkgx.dev>
3Date: Wed, 17 Jan 2024 11:49:26 -0500
4Subject: [PATCH] pam_namespace: include stdint.h
5
6pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h,
7resulting in the following build failures on 1.6.0:
8
9 pam_namespace.c: In function 'process_line':
10 pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
11 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
12 | ^~~~~~~~
13 pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
14 40 | #include "argv_parse.h"
15 +++ |+#include <stdint.h>
16 41 |
17 pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in
18 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
19 | ^~~~~~~~
20
21Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config")
22Resolves: https://github.com/linux-pam/linux-pam/issues/733
23
24Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13]
25Signed-off-by: Khem Raj <raj.khem@gmail.com>
26---
27 modules/pam_namespace/pam_namespace.c | 2 ++
28 1 file changed, 2 insertions(+)
29
30diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
31index f72d67189..b16731c22 100644
32--- a/modules/pam_namespace/pam_namespace.c
33+++ b/modules/pam_namespace/pam_namespace.c
34@@ -34,6 +34,8 @@
35
36 #define _ATFILE_SOURCE
37
38+#include "config.h"
39+#include <stdint.h>
40 #include "pam_cc_compat.h"
41 #include "pam_inline.h"
42 #include "pam_namespace.h"
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
deleted file mode 100644
index f2dafa72a5..0000000000
--- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001
2From: Kang Kai <kai.kang@windriver.com>
3Date: Tue, 19 Jul 2011 17:08:31 +0800
4Subject: [PATCH] This patch is used to create a new sub package libpam-xtests
5 to do more checks.
6
7Upstream-Status: Pending
8
9Signed-off-by: Kang Kai <kai.kang@windriver.com>
10---
11 xtests/Makefile.am | 17 ++++++++++++++++-
12 1 file changed, 16 insertions(+), 1 deletion(-)
13
14diff --git a/xtests/Makefile.am b/xtests/Makefile.am
15index acf9746..9826c9f 100644
16--- a/xtests/Makefile.am
17+++ b/xtests/Makefile.am
18@@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
19 LDADD = $(top_builddir)/libpam/libpam.la \
20 $(top_builddir)/libpam_misc/libpam_misc.la
21
22-CLEANFILES = *~ $(XTESTS)
23+CLEANFILES = *~
24
25 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
26 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
27@@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS)
28
29 xtests: $(XTESTS) run-xtests.sh
30 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
31+
32+all: $(XTESTS)
33+
34+install: install_xtests
35+
36+install_xtests:
37+ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests
38+ for file in $(EXTRA_DIST) ; do \
39+ $(INSTALL) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \
40+ done
41+ for file in $(XTESTS); do \
42+ $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \
43+ done
44+
45+.PHONY: all install_xtests
diff --git a/meta/recipes-extended/pam/libpam_1.6.0.bb b/meta/recipes-extended/pam/libpam_1.7.0.bb
index e1ed940d1e..dea9ff592b 100644
--- a/meta/recipes-extended/pam/libpam_1.6.0.bb
+++ b/meta/recipes-extended/pam/libpam_1.7.0.bb
@@ -20,41 +20,33 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \
20 file://pam.d/common-session \ 20 file://pam.d/common-session \
21 file://pam.d/common-session-noninteractive \ 21 file://pam.d/common-session-noninteractive \
22 file://pam.d/other \ 22 file://pam.d/other \
23 file://libpam-xtests.patch \
24 file://run-ptest \ 23 file://run-ptest \
25 file://pam-volatiles.conf \ 24 file://pam-volatiles.conf \
26 file://0001-pam_namespace-include-stdint-h.patch \ 25 file://0001-meson.build-correct-check-for-existence-of-two-prepr.patch \
27 " 26 "
28 27
29SRC_URI[sha256sum] = "fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad" 28SRC_URI[sha256sum] = "57dcd7a6b966ecd5bbd95e1d11173734691e16b68692fa59661cdae9b13b1697"
30 29
31DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" 30DEPENDS = "bison-native flex-native libxml2-native virtual/crypt"
32 31
33EXTRA_OECONF = "--includedir=${includedir}/security \ 32EXTRA_OEMESON = "-Ddocs=disabled -Dsecuredir=${base_libdir}/security"
34 --libdir=${base_libdir} \
35 --with-systemdunitdir=${systemd_system_unitdir} \
36 --disable-nis \
37 --disable-regenerate-docu \
38 --disable-doc \
39 --disable-prelude"
40 33
41CFLAGS:append = " -fPIC " 34S = "${UNPACKDIR}/Linux-PAM-${PV}"
42 35
43S = "${WORKDIR}/Linux-PAM-${PV}" 36inherit meson gettext pkgconfig systemd ptest github-releases
44
45inherit autotools gettext pkgconfig systemd ptest github-releases
46 37
47PACKAGECONFIG ??= "" 38PACKAGECONFIG ??= ""
48PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," 39PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit,"
49PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," 40PACKAGECONFIG[userdb] = "-Dpam_userdb=enabled -Ddb=gdbm,-Dpam_userdb=disabled,gdbm,"
41PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
50 42
51PACKAGES += "${PN}-runtime ${PN}-xtests" 43PACKAGES += "${PN}-runtime ${PN}-xtests"
52FILES:${PN} = " \ 44FILES:${PN} = " \
53 ${base_libdir}/lib*${SOLIBS} \ 45 ${libdir}/lib*${SOLIBS} \
54 ${nonarch_libdir}/tmpfiles.d/*.conf \ 46 ${nonarch_libdir}/tmpfiles.d/*.conf \
55" 47"
56FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" 48FILES:${PN}-dev += "${base_libdir}/security/*.la ${libdir}/*.la ${libdir}/lib*${SOLIBSDEV}"
57FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" 49FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${nonarch_libdir}/systemd/system"
58FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" 50FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests"
59 51
60# libpam installs /etc/environment for use with the pam_env plugin. Make sure it is 52# libpam installs /etc/environment for use with the pam_env plugin. Make sure it is
@@ -78,6 +70,7 @@ RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \
78 ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ 70 ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \
79 ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ 71 ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \
80 ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ 72 ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \
73 ${@bb.utils.contains('PACKAGECONFIG', 'selinux', '${MLPREFIX}pam-plugin-selinux-${libpam_suffix}', '', d)} \
81 " 74 "
82RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ 75RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \
83 ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ 76 ${MLPREFIX}pam-plugin-access-${libpam_suffix} \
@@ -122,16 +115,7 @@ python populate_packages:prepend () {
122 do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') 115 do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
123} 116}
124 117
125do_compile_ptest() { 118do_install:append() {
126 cd tests
127 sed -i -e 's/$(MAKE) $(AM_MAKEFLAGS) check-TESTS//' Makefile
128 oe_runmake check-am
129 cd -
130}
131
132do_install() {
133 autotools_do_install
134
135 # don't install /var/run when populating rootfs. Do it through volatile 119 # don't install /var/run when populating rootfs. Do it through volatile
136 rm -rf ${D}${localstatedir} 120 rm -rf ${D}${localstatedir}
137 121
@@ -139,16 +123,16 @@ do_install() {
139 rm -rf ${D}${sysconfdir}/init.d/ 123 rm -rf ${D}${sysconfdir}/init.d/
140 rm -rf ${D}${sysconfdir}/rc* 124 rm -rf ${D}${sysconfdir}/rc*
141 install -d ${D}${nonarch_libdir}/tmpfiles.d 125 install -d ${D}${nonarch_libdir}/tmpfiles.d
142 install -m 0644 ${WORKDIR}/pam-volatiles.conf \ 126 install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \
143 ${D}${nonarch_libdir}/tmpfiles.d/pam.conf 127 ${D}${nonarch_libdir}/tmpfiles.d/pam.conf
144 else 128 else
145 install -d ${D}${sysconfdir}/default/volatiles 129 install -d ${D}${sysconfdir}/default/volatiles
146 install -m 0644 ${WORKDIR}/99_pam \ 130 install -m 0644 ${UNPACKDIR}/99_pam \
147 ${D}${sysconfdir}/default/volatiles/ 131 ${D}${sysconfdir}/default/volatiles/
148 fi 132 fi
149 133
150 install -d ${D}${sysconfdir}/pam.d/ 134 install -d ${D}${sysconfdir}/pam.d/
151 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ 135 install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
152 136
153 # The lsb requires unix_chkpwd has setuid permission 137 # The lsb requires unix_chkpwd has setuid permission
154 chmod 4755 ${D}${sbindir}/unix_chkpwd 138 chmod 4755 ${D}${sbindir}/unix_chkpwd
@@ -156,15 +140,11 @@ do_install() {
156 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 140 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
157 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session 141 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
158 fi 142 fi
159 if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
160 install -d ${D}/${libdir}/
161 mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
162 fi
163} 143}
164 144
165do_install_ptest() { 145do_install_ptest() {
166 mkdir -p ${D}${PTEST_PATH}/tests 146 mkdir -p ${D}${PTEST_PATH}/tests
167 install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests 147 find ${B}/tests -maxdepth 1 -type f -exec cp {} ${D}${PTEST_PATH}/tests \;
168 install -m 0644 ${S}/tests/confdir ${D}${PTEST_PATH}/tests 148 install -m 0644 ${S}/tests/confdir ${D}${PTEST_PATH}/tests
169} 149}
170 150
diff --git a/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
new file mode 100644
index 0000000000..a8ea7ec4f7
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
@@ -0,0 +1,40 @@
1From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Wed, 20 Nov 2024 12:22:22 +0000
4Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration
5
6With gcc 15-20241117 compile fails with the below error, update the
7do_version declaration to match the header in command.h
8
9../../parted/parted.c: In function '_init_commands':
10../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
11 2469 | do_version,
12 | ^~~~~~~~~~
13 | |
14 | int (*)(void)
15In file included from ../../parted/parted.c:28:
16../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
17 35 | int (*method) (PedDevice** dev, PedDisk** diskp),
18 | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19
20Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271]
21Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
22Signed-off-by: Brian C. Lane <bcl@redhat.com>
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24---
25 parted/parted.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/parted/parted.c b/parted/parted.c
29index 3abb52f..fc2aeba 100644
30--- a/parted/parted.c
31+++ b/parted/parted.c
32@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp)
33 }
34
35 static int
36-do_version ()
37+do_version (PedDevice** dev, PedDisk** diskp)
38 {
39 printf ("\n%s\n%s",
40 prog_name,
diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb
index a537ef74db..6fc2cb3b3a 100644
--- a/meta/recipes-extended/parted/parted_3.6.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ 11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \
12 file://autoconf-2.73.patch \ 12 file://autoconf-2.73.patch \
13 file://0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch \
13 file://run-ptest \ 14 file://run-ptest \
14 " 15 "
15 16
@@ -35,13 +36,15 @@ do_install_ptest() {
35 cp ${B}/tests/Makefile $t/tests/ 36 cp ${B}/tests/Makefile $t/tests/
36 mkdir $t/lib 37 mkdir $t/lib
37 cp ${B}/lib/config.h $t/lib 38 cp ${B}/lib/config.h $t/lib
38 sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile 39 sed -e "s|^VERSION.*|VERSION = ${PV}|g" \
39 sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile 40 -e "s|^srcdir =.*|srcdir = \.|g" \
40 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile 41 -e "s|^abs_srcdir =.*|abs_srcdir = \.|g" \
41 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile 42 -e "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" \
42 sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile 43 -e "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" \
43 sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile 44 -e "/^SH_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
44 sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile 45 -e "s|^Makefile:.*|Makefile:|g" \
46 -e "/^BUILDINFO.*$/d" \
47 -i $t/tests/Makefile
45 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ 48 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \
46 do cp ${B}/tests/.libs/$i $t/tests/; \ 49 do cp ${B}/tests/.libs/$i $t/tests/; \
47 done 50 done
diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
index 3fa89dec9a..f95400998c 100644
--- a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
+++ b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
@@ -15,7 +15,6 @@ SRC_URI = "https://launchpad.net/${BPN}/1.1/${PV}/+download/${BP}.tar.gz \
15 file://0001-pbzip2-Fix-invalid-suffix-on-literal-C-11-warning.patch \ 15 file://0001-pbzip2-Fix-invalid-suffix-on-literal-C-11-warning.patch \
16 " 16 "
17 17
18SRC_URI[md5sum] = "4cb87da2dba05540afce162f34b3a9a6"
19SRC_URI[sha256sum] = "8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6" 18SRC_URI[sha256sum] = "8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6"
20 19
21UPSTREAM_CHECK_URI = "https://launchpad.net/pbzip2/+milestones" 20UPSTREAM_CHECK_URI = "https://launchpad.net/pbzip2/+milestones"
diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb
index 6e9f881773..7e167d6e67 100644
--- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb
+++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.34.bb
@@ -9,7 +9,7 @@ SRC_URI = "https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-${PV}
9 9
10SRC_URI[sha256sum] = "a628d7c9d390568fb76359975fa03f626ce57f10dc17980e8e3587d7713e4ee7" 10SRC_URI[sha256sum] = "a628d7c9d390568fb76359975fa03f626ce57f10dc17980e8e3587d7713e4ee7"
11 11
12S = "${WORKDIR}/Convert-ASN1-${PV}" 12S = "${UNPACKDIR}/Convert-ASN1-${PV}"
13 13
14inherit cpan ptest-perl 14inherit cpan ptest-perl
15 15
diff --git a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
index 3e0d216a03..7f9f40d996 100644
--- a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
+++ b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=21;md5=576b7cb41e5e821501a01ed66f0f9
8 8
9SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz" 9SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz"
10 10
11S = "${WORKDIR}/TimeDate-${PV}" 11S = "${UNPACKDIR}/TimeDate-${PV}"
12 12
13inherit cpan ptest-perl 13inherit cpan ptest-perl
14 14
@@ -17,5 +17,4 @@ BBCLASSEXTEND = "native"
17RDEPENDS:${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" 17RDEPENDS:${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local"
18RDEPENDS:${PN}-ptest += "perl-module-test-more perl-module-utf8" 18RDEPENDS:${PN}-ptest += "perl-module-test-more perl-module-utf8"
19 19
20SRC_URI[md5sum] = "b1d91153ac971347aee84292ed886c1c"
21SRC_URI[sha256sum] = "75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86" 20SRC_URI[sha256sum] = "75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86"
diff --git a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
index 568268d886..9653cb427b 100644
--- a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
+++ b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
@@ -12,16 +12,15 @@ SRCNAME = "XML-NamespaceSupport"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=c9d8a117e7620b5adf8d69c29613ceab" 12LIC_FILES_CHKSUM = "file://LICENSE;md5=c9d8a117e7620b5adf8d69c29613ceab"
13 13
14SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PERIGRIN/${SRCNAME}-${PV}.tar.gz" 14SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PERIGRIN/${SRCNAME}-${PV}.tar.gz"
15SRC_URI[md5sum] = "a8916c6d095bcf073e1108af02e78c97"
16SRC_URI[sha256sum] = "47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef" 15SRC_URI[sha256sum] = "47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef"
17 16
18UPSTREAM_CHECK_REGEX = "XML\-NamespaceSupport\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" 17UPSTREAM_CHECK_REGEX = "XML\-NamespaceSupport\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
19 18
20S = "${WORKDIR}/${SRCNAME}-${PV}" 19S = "${UNPACKDIR}/${SRCNAME}-${PV}"
21 20
22inherit cpan ptest-perl 21inherit cpan ptest-perl
23 22
24RDEPENDS:${PN}-ptest += "perl-module-test-more" 23RDEPENDS:${PN}-ptest += "perl-module-test-more"
25 24
26BBCLASSEXTEND="native nativesdk" 25BBCLASSEXTEND = "native nativesdk"
27 26
diff --git a/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb b/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
index ebec5f0462..8d97e95e83 100644
--- a/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
+++ b/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
@@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://dist.ini;endline=5;md5=8f9c9a55340aefaee6e9704c884664
14 14
15SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-Base-${PV}.tar.gz" 15SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-Base-${PV}.tar.gz"
16 16
17SRC_URI[md5sum] = "ec347a14065dd7aec7d9fb181b2d7946"
18SRC_URI[sha256sum] = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0" 17SRC_URI[sha256sum] = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0"
19 18
20S = "${WORKDIR}/XML-SAX-Base-${PV}" 19S = "${UNPACKDIR}/XML-SAX-Base-${PV}"
21 20
22inherit cpan ptest-perl 21inherit cpan ptest-perl
23 22
diff --git a/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb b/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb
index b5b111d227..67bdac981d 100644
--- a/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb
+++ b/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb
@@ -17,10 +17,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3"
17 17
18SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz" 18SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz"
19 19
20SRC_URI[md5sum] = "b62e3754523695c7f5bbcafa3676a38d"
21SRC_URI[sha256sum] = "4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a" 20SRC_URI[sha256sum] = "4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a"
22 21
23S = "${WORKDIR}/XML-SAX-${PV}" 22S = "${UNPACKDIR}/XML-SAX-${PV}"
24 23
25inherit cpan ptest-perl 24inherit cpan ptest-perl
26 25
diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.5.bb
index 800384f22f..d568cc831e 100644
--- a/meta/recipes-extended/procps/procps_4.0.4.bb
+++ b/meta/recipes-extended/procps/procps_4.0.5.bb
@@ -12,12 +12,10 @@ DEPENDS = "ncurses"
12 12
13inherit autotools gettext pkgconfig update-alternatives 13inherit autotools gettext pkgconfig update-alternatives
14 14
15SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ 15SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master;tag=v${PV} \
16 file://sysctl.conf \ 16 file://sysctl.conf \
17 " 17 "
18SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" 18SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
19
20S = "${WORKDIR}/git"
21 19
22# Upstream has a custom autogen.sh which invokes po/update-potfiles as they 20# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
23# don't ship a po/POTFILES.in (which is silly). Without that file gettext 21# don't ship a po/POTFILES.in (which is silly). Without that file gettext
@@ -41,7 +39,7 @@ do_install:append () {
41 fi 39 fi
42 40
43 install -d ${D}${sysconfdir} 41 install -d ${D}${sysconfdir}
44 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf 42 install -m 0644 ${UNPACKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
45 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 43 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
46 install -d ${D}${sysconfdir}/sysctl.d 44 install -d ${D}${sysconfdir}/sysctl.d
47 ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf 45 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 @@
1SUMMARY = "Utilities for managing processes on your system"
2HOMEPAGE = "http://psmisc.sf.net/"
3DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
4system: pstree, killall and fuser. The pstree command displays a tree \
5structure of all of the running processes on your system. The killall \
6command sends a specified signal (SIGTERM if nothing is specified) to \
7processes identified by name. The fuser command identifies the PIDs \
8of processes that are using specified files or filesystems."
9SECTION = "base"
10DEPENDS = "ncurses virtual/libintl"
11LICENSE = "GPL-2.0-only"
12
13SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
14
15S = "${WORKDIR}/psmisc-${PV}"
16
17inherit autotools gettext
18
19# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
20# don't ship a po/POTFILES.in (which is silly). Without that file gettext
21# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
22do_configure:prepend() {
23 ( cd ${S} && po/update-potfiles )
24}
25
26
27PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
28PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
29PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
30
31ALLOW_EMPTY:${PN} = "1"
32
33PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
34PACKAGES += "psmisc-extras"
35
36FILES:${PN} = ""
37RDEPENDS:${PN} = "fuser killall pstree"
38
39FILES:fuser = "${bindir}/fuser.${BPN}"
40FILES:fuser-doc = "${mandir}/man1/fuser*"
41
42FILES:killall = "${bindir}/killall.${BPN}"
43FILES:killall-doc = "${mandir}/man1/killall*"
44
45FILES:pstree = "${bindir}/pstree"
46FILES:pstree-doc = "${mandir}/man1/pstree*"
47
48FILES:psmisc-extras = "${bindir}"
49FILES:psmisc-extras-doc = "${mandir}"
50
51inherit update-alternatives
52
53ALTERNATIVE_PRIORITY = "90"
54
55ALTERNATIVE:killall = "killall"
56
57ALTERNATIVE:fuser = "fuser"
58
59ALTERNATIVE: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 @@
1From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 24 Mar 2016 15:46:14 +0000
4Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
5
6Do not include sys/user.h since it conflicts with
7pt_regs struct from kernel APIs in asm/ptrace.h
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Pending
11---
12 src/peekfd.c | 13 ++++++++-----
13 1 file changed, 8 insertions(+), 5 deletions(-)
14
15diff --git a/src/peekfd.c b/src/peekfd.c
16index 36dff04..2b4b1dc 100644
17--- a/src/peekfd.c
18+++ b/src/peekfd.c
19@@ -30,8 +30,11 @@
20 #include <asm/ptrace.h>
21 #include <byteswap.h>
22 #include <endian.h>
23+#ifdef __GLIBC__
24 #include <sys/user.h>
25+#endif
26 #include <stdlib.h>
27+#include <stdint.h>
28 #include <getopt.h>
29 #include <ctype.h>
30 #include <dirent.h>
31@@ -341,11 +344,11 @@ int main(int argc, char **argv)
32 if (WIFSTOPPED(status)) {
33 #ifdef PPC
34 struct pt_regs regs;
35- regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R0, 0);
36- regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R3, 0);
37- regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R4, 0);
38- regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R5, 0);
39- regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_ORIG_R3, 0);
40+ regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R0, 0);
41+ regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R3, 0);
42+ regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R4, 0);
43+ regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R5, 0);
44+ regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_ORIG_R3, 0);
45 #elif defined(ARM)
46 struct pt_regs regs;
47 ptrace(PTRACE_GETREGS, pid, 0, &regs);
diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb
index ea272cd92d..44f8530977 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.7.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb
@@ -1,9 +1,60 @@
1require psmisc.inc 1SUMMARY = "Utilities for managing processes on your system"
2HOMEPAGE = "http://psmisc.sf.net/"
3DESCRIPTION = "The psmisc package contains utilities for managing processes on your \
4system: pstree, killall and fuser. The pstree command displays a tree \
5structure of all of the running processes on your system. The killall \
6command sends a specified signal (SIGTERM if nothing is specified) to \
7processes identified by name. The fuser command identifies the PIDs \
8of processes that are using specified files or filesystems."
9SECTION = "base"
10DEPENDS = "ncurses virtual/libintl"
11
2LICENSE = "GPL-2.0-only" 12LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" 13LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4 14
5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ 15SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master;tag=v${PV} \
6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
7 " 16 "
8SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" 17SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
9S = "${WORKDIR}/git" 18
19inherit autotools gettext
20
21# Upstream has a custom autogen.sh which invokes po/update-potfiles as they
22# don't ship a po/POTFILES.in (which is silly). Without that file gettext
23# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
24do_configure:prepend() {
25 ( cd ${S} && po/update-potfiles )
26}
27
28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
29PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
30PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
31
32ALLOW_EMPTY:${PN} = "1"
33
34PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"
35PACKAGES += "psmisc-extras"
36
37FILES:${PN} = ""
38RDEPENDS:${PN} = "fuser killall pstree"
39
40FILES:fuser = "${bindir}/fuser.${BPN}"
41FILES:fuser-doc = "${mandir}/man1/fuser*"
42
43FILES:killall = "${bindir}/killall.${BPN}"
44FILES:killall-doc = "${mandir}/man1/killall*"
45
46FILES:pstree = "${bindir}/pstree"
47FILES:pstree-doc = "${mandir}/man1/pstree*"
48
49FILES:psmisc-extras = "${bindir}"
50FILES:psmisc-extras-doc = "${mandir}"
51
52inherit update-alternatives
53
54ALTERNATIVE_PRIORITY = "90"
55
56ALTERNATIVE:killall = "killall"
57
58ALTERNATIVE:fuser = "fuser"
59
60ALTERNATIVE: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 @@
1From e73c5b48e12c3f02e532864a1107cdc8a4feafc3 Mon Sep 17 00:00:00 2001
2From: Brahmajit Das <brahmajit.xyz@gmail.com>
3Date: Sun, 14 Jul 2024 07:58:50 +0000
4Subject: [PATCH] Fix building on musl
5
6basename(3) is defined in libgen.h in MUSL. Include libgen.h where
7basename(3) is used.
8
9Upstream-Status: Backport [https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/]
10Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
11Signed-off-by: Jan Kara <jack@suse.cz>
12---
13 convertquota.c | 1 +
14 edquota.c | 11 ++++++-----
15 quota.c | 1 +
16 quota_nld.c | 1 +
17 quotacheck.c | 1 +
18 quotaon.c | 1 +
19 quotastats.c | 1 +
20 quotasync.c | 1 +
21 repquota.c | 1 +
22 rquota_svc.c | 1 +
23 setquota.c | 1 +
24 warnquota.c | 1 +
25 xqmstats.c | 1 +
26 13 files changed, 18 insertions(+), 5 deletions(-)
27
28diff --git a/convertquota.c b/convertquota.c
29index 6c8a553..4eb05ed 100644
30--- a/convertquota.c
31+++ b/convertquota.c
32@@ -14,6 +14,7 @@
33 #include <fcntl.h>
34 #include <errno.h>
35 #include <getopt.h>
36+#include <libgen.h>
37
38 #include <endian.h>
39
40diff --git a/edquota.c b/edquota.c
41index 20ca306..c5b27cf 100644
42--- a/edquota.c
43+++ b/edquota.c
44@@ -20,6 +20,7 @@
45 #include <stdlib.h>
46 #include <fcntl.h>
47 #include <getopt.h>
48+#include <libgen.h>
49
50 #include "pot.h"
51 #include "quotaops.h"
52@@ -38,7 +39,7 @@ char *progname;
53 static int flags, quotatype;
54 static int fmt = -1;
55 static char *protoname;
56-static char *dirname;
57+static char *dir_name;
58
59 static void usage(void)
60 {
61@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv)
62 exit(1);
63 break;
64 case 'f':
65- dirname = optarg;
66+ dir_name = optarg;
67 break;
68 case 256:
69 flags |= FL_NUMNAMES;
70@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct quota_handle **handles)
71 protoprivs = getprivs(protoid, handles, 0);
72 while (argc-- > 0) {
73 id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
74- curprivs = getprivs(id, handles, !dirname);
75+ curprivs = getprivs(id, handles, !dir_name);
76 if (!curprivs)
77 die(1, _("Cannot get quota information for user %s\n"), *argv);
78 argv++;
79@@ -223,7 +224,7 @@ int main(int argc, char **argv)
80 argv += ret;
81
82 init_kernel_interface();
83- handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : NULL, quotatype, fmt,
84+ handles = create_handle_list(dir_name ? 1 : 0, dir_name ? &dir_name : NULL, quotatype, fmt,
85 (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS,
86 (flags & FL_REMOTE) ? 0 : MS_LOCALONLY);
87 if (!handles[0]) {
88@@ -296,7 +297,7 @@ int main(int argc, char **argv)
89 else {
90 for (; argc > 0; argc--, argv++) {
91 id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
92- curprivs = getprivs(id, handles, !dirname);
93+ curprivs = getprivs(id, handles, !dir_name);
94 if (!curprivs)
95 die(1, _("Cannot get quota information for user %s.\n"), *argv);
96 if (flags & FL_EDIT_TIMES) {
97diff --git a/quota.c b/quota.c
98index a60de12..66b0fa3 100644
99--- a/quota.c
100+++ b/quota.c
101@@ -20,6 +20,7 @@
102 #include <unistd.h>
103 #include <limits.h>
104 #include <ctype.h>
105+#include <libgen.h>
106 #ifdef RPC
107 #include <rpc/rpc.h>
108 #include "rquota.h"
109diff --git a/quota_nld.c b/quota_nld.c
110index 58a62af..710b556 100644
111--- a/quota_nld.c
112+++ b/quota_nld.c
113@@ -26,6 +26,7 @@
114 #include <fcntl.h>
115 #include <limits.h>
116 #include <signal.h>
117+#include <libgen.h>
118 #include <sys/stat.h>
119 #include <asm/types.h>
120
121diff --git a/quotacheck.c b/quotacheck.c
122index e2c3bbd..fa1d297 100644
123--- a/quotacheck.c
124+++ b/quotacheck.c
125@@ -19,6 +19,7 @@
126 #include <unistd.h>
127 #include <stdlib.h>
128 #include <errno.h>
129+#include <libgen.h>
130
131 #include <sys/stat.h>
132 #include <sys/types.h>
133diff --git a/quotaon.c b/quotaon.c
134index 351c851..17b6bcc 100644
135--- a/quotaon.c
136+++ b/quotaon.c
137@@ -13,6 +13,7 @@
138 #include <string.h>
139 #include <stdlib.h>
140 #include <stdarg.h>
141+#include <libgen.h>
142
143 #include "quotaon.h"
144 #include "quota.h"
145diff --git a/quotastats.c b/quotastats.c
146index a059812..4076a7d 100644
147--- a/quotastats.c
148+++ b/quotastats.c
149@@ -24,6 +24,7 @@
150 #include <errno.h>
151 #include <string.h>
152 #include <signal.h>
153+#include <libgen.h>
154
155 #include "pot.h"
156 #include "common.h"
157diff --git a/quotasync.c b/quotasync.c
158index cad2a20..e90b24a 100644
159--- a/quotasync.c
160+++ b/quotasync.c
161@@ -7,6 +7,7 @@
162 #include <string.h>
163 #include <errno.h>
164 #include <getopt.h>
165+#include <libgen.h>
166
167 #include "pot.h"
168 #include "common.h"
169diff --git a/repquota.c b/repquota.c
170index e79fc4d..8e509bd 100644
171--- a/repquota.c
172+++ b/repquota.c
173@@ -18,6 +18,7 @@
174 #include <pwd.h>
175 #include <grp.h>
176 #include <getopt.h>
177+#include <libgen.h>
178
179 #include "pot.h"
180 #include "common.h"
181diff --git a/rquota_svc.c b/rquota_svc.c
182index 6e856bb..c17df13 100644
183--- a/rquota_svc.c
184+++ b/rquota_svc.c
185@@ -34,6 +34,7 @@
186 #include <signal.h>
187 #include <errno.h>
188 #include <netconfig.h>
189+#include <libgen.h>
190 #ifdef HOSTS_ACCESS
191 #include <tcpd.h>
192 #include <netdb.h>
193diff --git a/setquota.c b/setquota.c
194index c517ab1..9e4b2fa 100644
195--- a/setquota.c
196+++ b/setquota.c
197@@ -18,6 +18,7 @@
198 #include <time.h>
199 #include <ctype.h>
200 #include <stdlib.h>
201+#include <libgen.h>
202
203 #if defined(RPC)
204 #include "rquota.h"
205diff --git a/warnquota.c b/warnquota.c
206index 2882fee..6f63ce7 100644
207--- a/warnquota.c
208+++ b/warnquota.c
209@@ -31,6 +31,7 @@
210 #include <time.h>
211 #include <getopt.h>
212 #include <locale.h>
213+#include <libgen.h>
214 #ifdef HAVE_NL_LANGINFO
215 #include <langinfo.h>
216 #endif
217diff --git a/xqmstats.c b/xqmstats.c
218index 59b1d66..345b060 100644
219--- a/xqmstats.c
220+++ b/xqmstats.c
221@@ -8,6 +8,7 @@
222 #include <stdio.h>
223 #include <unistd.h>
224 #include <string.h>
225+#include <libgen.h>
226 #include "common.h"
227 #include "pot.h"
228
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 @@
1From 00a456145531d194d3993c9f4cd404d5ca16c9df Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 17:36:44 +0000
4Subject: [PATCH] quota: Fix build with musl
5
6Include fcntl.h to pacify compiler errors on musl
7like
8
9error: unknown type name 'loff_t'
10Cover rpc headers under proper conditional
11Dont use __P its undefined
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
17---
18 quotacheck.c | 1 +
19 quotaio.c | 1 +
20 rquota_client.c | 4 ++++
21 3 files changed, 6 insertions(+)
22
23diff --git a/quotacheck.c b/quotacheck.c
24index bd62d9a..772a27d 100644
25--- a/quotacheck.c
26+++ b/quotacheck.c
27@@ -19,6 +19,7 @@
28 #include <unistd.h>
29 #include <stdlib.h>
30 #include <errno.h>
31+#include <fcntl.h>
32
33 #include <sys/stat.h>
34 #include <sys/types.h>
35diff --git a/quotaio.c b/quotaio.c
36index 94ae458..d57fc1a 100644
37--- a/quotaio.c
38+++ b/quotaio.c
39@@ -12,6 +12,7 @@
40 #include <string.h>
41 #include <unistd.h>
42 #include <stdlib.h>
43+#include <fcntl.h>
44 #include <sys/types.h>
45 #include <sys/stat.h>
46 #include <sys/file.h>
47diff --git a/rquota_client.c b/rquota_client.c
48index 7f8e821..d48505a 100644
49--- a/rquota_client.c
50+++ b/rquota_client.c
51@@ -19,7 +19,9 @@
52
53 #include "config.h"
54
55+#if defined(RPC)
56 #include <rpc/rpc.h>
57+#endif
58 #include <sys/types.h>
59 #include <sys/param.h>
60 #include <sys/stat.h>
61@@ -35,7 +37,9 @@
62 #include <stdint.h>
63
64 #include "mntopt.h"
65+#if defined(RPC)
66 #include "rquota.h"
67+#endif
68 #include "common.h"
69 #include "quotaio.h"
70 #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
8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" 8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
11 file://fcntl.patch \ 11 file://0001-Fix-building-on-musl.patch \
12 " 12 "
13SRC_URI[sha256sum] = "9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9" 13SRC_URI[sha256sum] = "9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9"
14 14
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]
9Signed-off-by: Stefan Agner <stefan.agner@toradex.com> 9Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
10--- 10---
11 configure.ac | 2 ++ 11 configure.ac | 2 ++
12 systemd/rpcbind.service.in | 2 +- 12 systemd/rpcbind.service.in | 1 +
13 2 files changed, 3 insertions(+), 1 deletion(-) 13 2 files changed, 3 insertions(+)
14 14
15diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
16index 2dd9471..47a46c0 100644 16index 8f4cef3..4705413 100644
17--- a/configure.ac 17--- a/configure.ac
18+++ b/configure.ac 18+++ b/configure.ac
19@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h]) 19@@ -86,5 +86,7 @@ AC_CHECK_HEADERS([nss.h])
20 # 2 "evals" needed to expand variable names 20 # 2 "evals" needed to expand variable names
21 AC_SUBST([_sbindir]) 21 AC_SUBST([_sbindir])
22 AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir]) 22 AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
23+AC_SUBST([_sysconfdir]) 23+AC_SUBST([_sysconfdir])
24+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) 24+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir])
25 25
26 AC_OUTPUT([Makefile systemd/rpcbind.service]) 26 AC_OUTPUT([Makefile systemd/rpcbind.service systemd/rpcbind.socket])
27diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in 27diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
28index 7b1c74b..f45ee1e 100644 28index c892ca8..e0511bd 100644
29--- a/systemd/rpcbind.service.in 29--- a/systemd/rpcbind.service.in
30+++ b/systemd/rpcbind.service.in 30+++ b/systemd/rpcbind.service.in
31@@ -11,7 +11,7 @@ Wants=rpcbind.target 31@@ -12,6 +12,7 @@ Wants=rpcbind.target
32
33 [Service] 32 [Service]
34 Type=notify 33 Type=notify
35-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. 34 # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
36+EnvironmentFile=-@_sysconfdir@/rpcbind.conf 35+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
37 ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f 36 ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
38 37
39 [Install] 38 [Install]
40-- 39--
412.23.0 402.34.1
42 41
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 @@
1[Unit]
2# Make sure the runtime directory exists
3After=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..e186bc35e1 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb
@@ -13,12 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
14 file://init.d \ 14 file://init.d \
15 file://rpcbind.conf \ 15 file://rpcbind.conf \
16 file://rpcbind.tmpfiles \
17 file://rpcbind.systemd \
16 file://rpcbind_add_option_to_fix_port_number.patch \ 18 file://rpcbind_add_option_to_fix_port_number.patch \
17 file://0001-systemd-use-EnvironmentFile.patch \ 19 file://0001-systemd-use-EnvironmentFile.patch \
18 " 20 "
19SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de" 21SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e"
20 22
21inherit autotools update-rc.d systemd pkgconfig update-alternatives 23inherit autotools update-rc.d systemd pkgconfig update-alternatives sourceforge-releases
22 24
23PACKAGECONFIG ??= "tcp-wrappers" 25PACKAGECONFIG ??= "tcp-wrappers"
24PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" 26PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -46,10 +48,18 @@ do_install:append () {
46 install -d ${D}${sysconfdir}/init.d 48 install -d ${D}${sysconfdir}/init.d
47 sed -e 's,/etc/,${sysconfdir}/,g' \ 49 sed -e 's,/etc/,${sysconfdir}/,g' \
48 -e 's,/sbin/,${sbindir}/,g' \ 50 -e 's,/sbin/,${sbindir}/,g' \
49 ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind 51 ${UNPACKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
50 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind 52 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
51 install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf 53 install -m 0644 ${UNPACKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf
54
55 install -d ${D}${sysconfdir}/tmpfiles.d
56 install -m 0644 ${UNPACKDIR}/rpcbind.tmpfiles ${D}${sysconfdir}/tmpfiles.d/rpcbind.conf
57
58 install -d ${D}${systemd_system_unitdir}/rpcbind.service.d
59 install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf
52} 60}
53 61
62FILES:${PN} += "${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf"
63
54ALTERNATIVE:${PN} = "rpcinfo" 64ALTERNATIVE:${PN} = "rpcinfo"
55ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo" 65ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo"
diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
index 20933153a3..4cb785aa90 100644
--- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
+++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
@@ -23,8 +23,6 @@ SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \
23 file://0001-Use-cross-compiled-rpcgen.patch \ 23 file://0001-Use-cross-compiled-rpcgen.patch \
24 " 24 "
25 25
26S = "${WORKDIR}/git"
27
28inherit autotools gettext 26inherit autotools gettext
29 27
30EXTRA_OEMAKE:class-native = " -C rpcgen" 28EXTRA_OEMAKE:class-native = " -C rpcgen"
diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
new file mode 100644
index 0000000000..631d06375b
--- /dev/null
+++ b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
@@ -0,0 +1,23 @@
1From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001
2From: Drew DeVault <sir@cmpwn.com>
3Date: Wed, 4 Sep 2024 10:07:46 +0200
4Subject: [PATCH] Makefile: drop -static
5
6Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a]
7Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
8---
9 Makefile | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/Makefile b/Makefile
13index 96ad48cd04a6..49f076aadd39 100644
14--- a/Makefile
15+++ b/Makefile
16@@ -1,7 +1,6 @@
17 VERSION=1.11.3
18 CFLAGS?=-g
19 MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
20-LDFLAGS+=-static
21 INCLUDE+=-Iinclude
22 PREFIX?=/usr/local
23 BINDIR?=$(PREFIX)/bin
diff --git a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
new file mode 100644
index 0000000000..5f571c64dd
--- /dev/null
+++ b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
@@ -0,0 +1,20 @@
1SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99."
2HOMEPAGE = "https://git.sr.ht/~sircmpwn/scdoc"
3SECTION = "base/doc"
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
6
7DEPENDS = "scdoc-native"
8
9SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
10 file://0001-Makefile-drop-static.patch "
11SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
12
13do_install() {
14 oe_runmake 'DESTDIR=${D}' install
15}
16
17EXTRA_OEMAKE = "PREFIX=${prefix}"
18EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
19
20BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch b/meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch
deleted file mode 100644
index 1413724d07..0000000000
--- a/meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1This fixes
2../screen-4.6.2/pty.c: In function 'OpenPTY':
3../screen-4.6.2/pty.c:328:7: warning: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration]
4 if (openpty(&f, &s, TtyName, NULL, NULL) != 0)
5 ^~~~~~~
6
7Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
8Signed-off-by: Adrian Bunk <bunk@stusta.de>
9Upstream-Status: Backport
10
11---
12 pty.c | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/pty.c b/pty.c
16index 1c0660e..502338f 100644
17--- a/pty.c
18+++ b/pty.c
19@@ -47,11 +47,7 @@
20 # include <sys/ttold.h>
21 #endif
22
23-#ifdef ISC
24-# include <sys/tty.h>
25-# include <sys/sioctl.h>
26-# include <sys/pty.h>
27-#endif
28+#include <pty.h>
29
30 #ifdef sgi
31 # include <sys/sysmacros.h>
diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
deleted file mode 100644
index fbdb0eb478..0000000000
--- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 26 Jul 2016 14:23:59 +0800
4Subject: [PATCH] fix for multijob build
5
6make sure that comm.sh script generates comm.h header before doing
7anything else
8
9Signed-off-by: Amadeusz Sawiski <amade@asmblr.net>
10
11Upstream-Status: Backport
12
13Backport patch to fix parallel build failure and update context to make patch
14coulde be applied.
15
16http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
17
18Signed-off-by: Kai Kang <kai.kang@windriver.com>
19Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
20---
21 Makefile.in | 8 ++++----
22 1 file changed, 4 insertions(+), 4 deletions(-)
23
24diff --git a/Makefile.in b/Makefile.in
25index aca7da3..3607711 100644
26--- a/Makefile.in
27+++ b/Makefile.in
28@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a
29 comm.h layer.h term.h image.h display.h window.h mark.h extern.h
30 tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
31 layer.h term.h image.h display.h window.h extern.h
32-term.o: layout.h viewport.h canvas.h term.c term.h
33+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
34 window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
35 comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
36 utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
37@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a
38 comm.h layer.h term.h image.h display.h window.h extern.h \
39 braille.h
40 comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
41-kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
42+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
43 acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
44 layer.h term.h image.h display.h window.h extern.h
45 braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
46@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
47 viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
48 comm.h layer.h term.h image.h display.h window.h extern.h \
49 braille.h
50-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
51-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
52+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
53+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
54 list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
55
56--
571.9.1
58
diff --git a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
deleted file mode 100644
index a01dc24751..0000000000
--- a/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport
2
3Backport from:
4
5http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
10From: Mike Gerwitz <mike@mikegerwitz.com>
11Date: Tue, 24 Dec 2013 22:16:31 -0500
12Subject: [PATCH] comm.h now depends on term.h
13
14---
15 src/Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: screen-4.6.1/Makefile.in
19===================================================================
20--- screen-4.6.1.orig/Makefile.in
21+++ screen-4.6.1/Makefile.in
22@@ -133,7 +133,7 @@ kmapdef.c: term.h
23 tty.c: tty.sh
24 sh $(srcdir)/tty.sh tty.c
25
26-comm.h: comm.c comm.sh config.h
27+comm.h: comm.c comm.sh config.h term.h
28 AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
29
30 osdef.h: osdef.sh config.h osdef.h.in
diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_5.0.0.bb
index 7b040e6b57..fec5663fc2 100644
--- a/meta/recipes-extended/screen/screen_4.9.1.bb
+++ b/meta/recipes-extended/screen/screen_5.0.0.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen"
8SECTION = "console/utils" 8SECTION = "console/utils"
9 9
10LICENSE = "GPL-3.0-or-later" 10LICENSE = "GPL-3.0-or-later"
11LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
12 file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ 12 file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \
13 " 13 "
14 14
@@ -18,25 +18,22 @@ RDEPENDS:${PN} = "base-files"
18 18
19SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ 19SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \
21 file://0002-comm.h-now-depends-on-term.h.patch \
22 file://0001-fix-for-multijob-build.patch \
23 file://0001-Remove-more-compatibility-stuff.patch \
24 " 21 "
25 22
26SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" 23SRC_URI[sha256sum] = "f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971"
27 24
28inherit autotools texinfo 25inherit autotools-brokensep texinfo
29 26
30PACKAGECONFIG ??= "" 27PACKAGECONFIG ??= ""
31PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," 28PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
32 29
33EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sysconfdir}/screenrc \ 30EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-system_screenrc=${sysconfdir}/screenrc \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 31 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
35 32
36do_install:append () { 33do_install:append () {
37 install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc 34 install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc
38 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 35 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
39 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen 36 install -D -m 644 ${UNPACKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
40 fi 37 fi
41} 38}
42 39
diff --git a/meta/recipes-extended/sed/sed_4.9.bb b/meta/recipes-extended/sed/sed_4.9.bb
index c4d89c34b2..b30ddc73ca 100644
--- a/meta/recipes-extended/sed/sed_4.9.bb
+++ b/meta/recipes-extended/sed/sed_4.9.bb
@@ -59,6 +59,7 @@ do_install_ptest() {
59 -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \ 59 -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \
60 -e 's:top_srcdir =.*:top_srcdir = ..:g' \ 60 -e 's:top_srcdir =.*:top_srcdir = ..:g' \
61 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ 61 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
62 -e "/^\(PL\|SH\)_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
62 -i ${D}${PTEST_PATH}/Makefile 63 -i ${D}${PTEST_PATH}/Makefile
63} 64}
64 65
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 @@
1From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001
2From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
3Date: Mon, 18 Mar 2024 12:14:21 +0100
4Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer
5
6There are no guarantees that fstatat() does not clobber the stat
7buffer on errors.
8
9Use a temporary buffer so that the following code sees correct
10attributes of the source entry.
11
12Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974]
13
14Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
15---
16 lib/copydir.c | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19--- a/lib/copydir.c
20+++ b/lib/copydir.c
21@@ -400,6 +400,7 @@ static int copy_entry (const struct path
22 {
23 int err = 0;
24 struct stat sb;
25+ struct stat tmp_sb;
26 struct link_name *lp;
27 struct timespec mt[2];
28
29@@ -423,7 +424,7 @@ static int copy_entry (const struct path
30 * If the destination already exists do nothing.
31 * This is after the copy_dir above to still iterate into subdirectories.
32 */
33- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) {
34+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) {
35 return err;
36 }
37
diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
index cd99aad135..699269ed64 100644
--- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
+++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
@@ -1,4 +1,4 @@
1From f512071dd3a4c29d4bf048c5a89c4ba9160e37b1 Mon Sep 17 00:00:00 2001 1From f7b765c022e4cad9140ac44712885c66e149abdc Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 17 Jul 2014 15:53:34 +0800 3Date: Thu, 17 Jul 2014 15:53:34 +0800
4Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env 4Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20 1 file changed, 12 insertions(+), 4 deletions(-) 20 1 file changed, 12 insertions(+), 4 deletions(-)
21 21
22diff --git a/lib/commonio.c b/lib/commonio.c 22diff --git a/lib/commonio.c b/lib/commonio.c
23index 01a26c9..82b2868 100644 23index 4d83e83..9ee0e13 100644
24--- a/lib/commonio.c 24--- a/lib/commonio.c
25+++ b/lib/commonio.c 25+++ b/lib/commonio.c
26@@ -601,10 +601,18 @@ int commonio_open (struct commonio_db *db, int mode) 26@@ -604,10 +604,18 @@ int commonio_open (struct commonio_db *db, int mode)
27 db->cursor = NULL; 27 db->cursor = NULL;
28 db->changed = false; 28 db->changed = false;
29 29
diff --git a/meta/recipes-extended/shadow/files/disable_syslog.patch b/meta/recipes-extended/shadow/files/disable_syslog.patch
new file mode 100644
index 0000000000..7299a8e61c
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/disable_syslog.patch
@@ -0,0 +1,22 @@
1When building images using shadow-native, we shouldn't be spamming the host's
2log with lots of syslog messages which aren't relavent. Disable syslog use
3in the native case.
4
5Upstream-Status: Inappropriate [Would upstream accept a configure option?]
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7
8Index: shadow-4.17.2/lib/defines.h
9===================================================================
10--- shadow-4.17.2.orig/lib/defines.h
11+++ shadow-4.17.2/lib/defines.h
12@@ -88,7 +88,9 @@
13
14 /* cleaner than lots of #ifdefs everywhere - use this as follows:
15 SYSLOG((LOG_CRIT, "user %s cracked root", user)); */
16-#ifdef ENABLE_NLS
17+#if 1
18+#define SYSLOG(x)
19+#elif ENABLE_NLS
20 /* Temporarily set LC_TIME to "C" to avoid strange dates in syslog.
21 This is a workaround for a more general syslog(d) design problem -
22 syslogd should log the current system time for each event, and not
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
index 1eacb8a53f..318e2665c2 100644
--- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
+++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
@@ -1,4 +1,4 @@
1From 38882ab288fd4d2cc2e45dff222ae3412c8fe357 Mon Sep 17 00:00:00 2001 1From eb17cd91d8e4d76ee95de9c0c9f4938ba2e3e82a Mon Sep 17 00:00:00 2001
2From: Kang Kai <kai.kang@windriver.com> 2From: Kang Kai <kai.kang@windriver.com>
3Date: Wed, 20 Jul 2011 19:18:14 +0800 3Date: Wed, 20 Jul 2011 19:18:14 +0800
4Subject: [PATCH] shadow: update pam related configure files 4Subject: [PATCH] shadow: update pam related configure files
@@ -15,7 +15,6 @@ Upstream-Status: Inappropriate [oe-core specific]
15 15
16Signed-off-by: Kang Kai <kai.kang@windriver.com> 16Signed-off-by: Kang Kai <kai.kang@windriver.com>
17--- 17---
18 etc/pam.d/chage | 2 +-
19 etc/pam.d/chgpasswd | 2 +- 18 etc/pam.d/chgpasswd | 2 +-
20 etc/pam.d/groupadd | 2 +- 19 etc/pam.d/groupadd | 2 +-
21 etc/pam.d/groupdel | 2 +- 20 etc/pam.d/groupdel | 2 +-
@@ -24,18 +23,8 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
24 etc/pam.d/useradd | 2 +- 23 etc/pam.d/useradd | 2 +-
25 etc/pam.d/userdel | 2 +- 24 etc/pam.d/userdel | 2 +-
26 etc/pam.d/usermod | 2 +- 25 etc/pam.d/usermod | 2 +-
27 9 files changed, 9 insertions(+), 9 deletions(-) 26 8 files changed, 8 insertions(+), 8 deletions(-)
28 27
29diff --git a/etc/pam.d/chage b/etc/pam.d/chage
30index 8f49f5c..b1f365d 100644
31--- a/etc/pam.d/chage
32+++ b/etc/pam.d/chage
33@@ -1,4 +1,4 @@
34 #%PAM-1.0
35 auth sufficient pam_rootok.so
36 account required pam_permit.so
37-password include system-auth
38+password include common-password
39diff --git a/etc/pam.d/chgpasswd b/etc/pam.d/chgpasswd 28diff --git a/etc/pam.d/chgpasswd b/etc/pam.d/chgpasswd
40index 8f49f5c..b1f365d 100644 29index 8f49f5c..b1f365d 100644
41--- a/etc/pam.d/chgpasswd 30--- a/etc/pam.d/chgpasswd
@@ -116,3 +105,6 @@ index 8f49f5c..b1f365d 100644
116 account required pam_permit.so 105 account required pam_permit.so
117-password include system-auth 106-password include system-auth
118+password include common-password 107+password include common-password
108--
1092.43.0
110
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
index fe51ea1874..e94e1caf22 100644
--- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
5 5
6INHIBIT_DEFAULT_DEPS = "1" 6INHIBIT_DEFAULT_DEPS = "1"
7 7
8
9SRC_URI = "file://securetty" 8SRC_URI = "file://securetty"
10 9
11S = "${WORKDIR}" 10S = "${UNPACKDIR}"
12 11
13# Since SERIAL_CONSOLES is likely to be set from the machine configuration 12# Since SERIAL_CONSOLES is likely to be set from the machine configuration
14PACKAGE_ARCH = "${MACHINE_ARCH}" 13PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -17,7 +16,7 @@ do_install () {
17 # Ensure we add a suitable securetty file to the package that has 16 # Ensure we add a suitable securetty file to the package that has
18 # most common embedded TTYs defined. 17 # most common embedded TTYs defined.
19 install -d ${D}${sysconfdir} 18 install -d ${D}${sysconfdir}
20 install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 19 install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty
21 if [ ! -z "${SERIAL_CONSOLES}" ]; then 20 if [ ! -z "${SERIAL_CONSOLES}" ]; then
22 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra 21 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra
23 # options as well. The following pearl :) takes that and converts 22 # 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..d66ef1e6a4 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
@@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;endline=1;md5=ceddfb61608e4
7 7
8DEPENDS = "base-passwd" 8DEPENDS = "base-passwd"
9 9
10
11# The sole purpose of this recipe is to provide the /etc/login.defs 10# The sole purpose of this recipe is to provide the /etc/login.defs
12# file for the target sysroot - needed so the shadow-native utilities 11# file for the target sysroot - needed so the shadow-native utilities
13# can add custom users/groups for recipes that use inherit useradd. 12# can add custom users/groups for recipes that use inherit useradd.
14SRC_URI = "file://login.defs_shadow-sysroot" 13SRC_URI = "file://login.defs_shadow-sysroot"
15 14
16S = "${WORKDIR}" 15S = "${UNPACKDIR}"
17 16
18do_install() { 17do_install() {
19 install -d ${D}${sysconfdir} 18 install -d ${D}${sysconfdir}
diff --git a/meta/recipes-extended/shadow/shadow_4.15.0.bb b/meta/recipes-extended/shadow/shadow_4.15.0.bb
deleted file mode 100644
index e57676c1da..0000000000
--- a/meta/recipes-extended/shadow/shadow_4.15.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require shadow.inc
2
3# Build falsely assumes that if --enable-libpam is set, we don't need to link against
4# libcrypt. This breaks chsh.
5BUILD_LDFLAGS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}"
6
7BBCLASSEXTEND = "native nativesdk"
8
9# https://bugzilla.redhat.com/show_bug.cgi?id=884658
10CVE_STATUS[CVE-2013-4235] = "upstream-wontfix: Severity is low and marked as closed and won't fix."
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow_4.17.4.bb
index 7b9763d6db..73942888b6 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow_4.17.4.bb
@@ -12,7 +12,6 @@ DEPENDS = "virtual/crypt"
12 12
13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" 13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ 14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
15 file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \
16 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ 15 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
17 file://useradd \ 16 file://useradd \
18 " 17 "
@@ -24,8 +23,10 @@ SRC_URI:append:class-target = " \
24 23
25SRC_URI:append:class-native = " \ 24SRC_URI:append:class-native = " \
26 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ 25 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
26 file://disable_syslog.patch \
27 " 27 "
28SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" 28SRC_URI[sha256sum] = "0a288c251f339846af6bdfd4447b196153204deba42407bce5b0917998322e9b"
29UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
29 30
30# Additional Policy files for PAM 31# Additional Policy files for PAM
31PAM_SRC_URI = "file://pam.d/chfn \ 32PAM_SRC_URI = "file://pam.d/chfn \
@@ -38,7 +39,7 @@ PAM_SRC_URI = "file://pam.d/chfn \
38 39
39inherit autotools gettext github-releases pkgconfig 40inherit autotools gettext github-releases pkgconfig
40 41
41export CONFIG_SHELL="/bin/sh" 42export CONFIG_SHELL = "/bin/sh"
42 43
43EXTRA_OECONF += " \ 44EXTRA_OECONF += " \
44 --with-group-name-max-length=24 \ 45 --with-group-name-max-length=24 \
@@ -111,7 +112,7 @@ do_install() {
111 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs 112 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs
112 113
113 install -d ${D}${sysconfdir}/default 114 install -d ${D}${sysconfdir}/default
114 install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default 115 install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default
115} 116}
116 117
117do_install:append() { 118do_install:append() {
@@ -121,11 +122,11 @@ do_install:append() {
121 install -m 0775 -d ${D}${localstatedir}/spool/mail 122 install -m 0775 -d ${D}${localstatedir}/spool/mail
122 chown root:mail ${D}${localstatedir}/spool/mail 123 chown root:mail ${D}${localstatedir}/spool/mail
123 124
124 if [ -e ${WORKDIR}/pam.d ]; then 125 if [ -e ${UNPACKDIR}/pam.d ]; then
125 install -d ${D}${sysconfdir}/pam.d/ 126 install -d ${D}${sysconfdir}/pam.d/
126 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ 127 install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
127 # Remove defaults that are not used when supporting PAM. 128 # Remove defaults that are not used when supporting PAM.
128 sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs 129 sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs
129 fi 130 fi
130 131
131 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 132 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
@@ -168,13 +169,20 @@ do_install:append:class-native() {
168SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" 169SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/"
169INSANE_SKIP:${PN}:class-native = "already-stripped" 170INSANE_SKIP:${PN}:class-native = "already-stripped"
170 171
172do_install:append:class-nativesdk() {
173 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
174}
175
176do_install:append:class-target() {
177 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
178}
179
171PACKAGES =+ "${PN}-base" 180PACKAGES =+ "${PN}-base"
172FILES:${PN}-base = "\ 181FILES:${PN}-base = "\
173 ${base_bindir}/login.shadow \ 182 ${base_bindir}/login.shadow \
174 ${base_bindir}/su.shadow \ 183 ${base_bindir}/su.shadow \
175 ${bindir}/sg \ 184 ${bindir}/sg \
176 ${bindir}/newgrp.shadow \ 185 ${bindir}/newgrp.shadow \
177 ${bindir}/groups.shadow \
178 ${sysconfdir}/pam.d/login \ 186 ${sysconfdir}/pam.d/login \
179 ${sysconfdir}/pam.d/su \ 187 ${sysconfdir}/pam.d/su \
180 ${sysconfdir}/login.defs \ 188 ${sysconfdir}/login.defs \
@@ -193,7 +201,13 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
193ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 201ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
194ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 202ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
195 203
196ALTERNATIVE:${PN}-base = "newgrp groups login su" 204ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 su.1 nologin.8"
205ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1"
206ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1"
207ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1"
208ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8"
209
210ALTERNATIVE:${PN}-base = "newgrp login su"
197ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 211ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
198ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" 212ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"
199 213
@@ -208,3 +222,12 @@ pkg_postinst:${PN}:class-target () {
208 pwconv $rootarg || exit 1 222 pwconv $rootarg || exit 1
209 grpconv $rootarg || exit 1 223 grpconv $rootarg || exit 1
210} 224}
225
226# Build falsely assumes that if --enable-libpam is set, we don't need to link against
227# libcrypt. This breaks chsh.
228BUILD_LDFLAGS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}"
229
230BBCLASSEXTEND = "native nativesdk"
231
232# https://bugzilla.redhat.com/show_bug.cgi?id=884658
233CVE_STATUS[CVE-2013-4235] = "upstream-wontfix: Severity is low and marked as closed and won't fix."
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.06.bb b/meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb
index a52b70d22f..85a0d6a709 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.17.06.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb
@@ -5,10 +5,9 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ 8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV} \
9 " 9 "
10SRCREV = "e6bda983cb48a201b6af173204372c7b37d6411f" 10SRCREV = "d4eef982dc98fe915aa82303c0a24070d0a51b00"
11S = "${WORKDIR}/git"
12 11
13DEPENDS = "coreutils-native libbsd" 12DEPENDS = "coreutils-native libbsd"
14 13
diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
index 041c717e00..1989c5abd7 100644
--- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
+++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
@@ -1,4 +1,4 @@
1From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 1From 8c69192754ba73dd6e3273728a21aa73988f4bfb Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 17 Nov 2020 11:13:40 +0800 3Date: Tue, 17 Nov 2020 11:13:40 +0800
4Subject: [PATCH] sudo.conf.in: fix conflict with multilib 4Subject: [PATCH] sudo.conf.in: fix conflict with multilib
@@ -15,13 +15,12 @@ Update the comments in sudo.conf.in to avoid the conflict.
15Signed-off-by: Kai Kang <kai.kang@windriver.com> 15Signed-off-by: Kai Kang <kai.kang@windriver.com>
16 16
17Upstream-Status: Inappropriate [OE configuration specific] 17Upstream-Status: Inappropriate [OE configuration specific]
18
19--- 18---
20 examples/sudo.conf.in | 8 ++++---- 19 examples/sudo.conf.in | 8 ++++----
21 1 file changed, 4 insertions(+), 4 deletions(-) 20 1 file changed, 4 insertions(+), 4 deletions(-)
22 21
23diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in 22diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
24index 2187457..0908d24 100644 23index bdd676c..094341c 100644
25--- a/examples/sudo.conf.in 24--- a/examples/sudo.conf.in
26+++ b/examples/sudo.conf.in 25+++ b/examples/sudo.conf.in
27@@ -4,7 +4,7 @@ 26@@ -4,7 +4,7 @@
@@ -53,7 +52,7 @@ index 2187457..0908d24 100644
53 # Sudo plugin directory: 52 # Sudo plugin directory:
54@@ -74,7 +74,7 @@ 53@@ -74,7 +74,7 @@
55 # The default directory to use when searching for plugins that are 54 # The default directory to use when searching for plugins that are
56 # specified without a fully qualified path name. 55 # specified without a fully-qualified path name.
57 # 56 #
58-#Path plugin_dir @plugindir@ 57-#Path plugin_dir @plugindir@
59+#Path plugin_dir $plugindir 58+#Path plugin_dir $plugindir
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index feb1cf35a7..a23de1fcf7 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
4BUGTRACKER = "http://www.sudo.ws/bugs/" 4BUGTRACKER = "http://www.sudo.ws/bugs/"
5SECTION = "admin" 5SECTION = "admin"
6LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" 6LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
7LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5100e20d35f9015f9eef6bdb27ba194f \ 7LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2841c822e587db145364ca95e9be2ffa \
8 file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ 8 file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
9 file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ 9 file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
10 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ 10 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.17.bb
index 8e542015ad..71d48f448d 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.17.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
7 7
8PAM_SRC_URI = "file://sudo.pam" 8PAM_SRC_URI = "file://sudo.pam"
9 9
10SRC_URI[sha256sum] = "558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558" 10SRC_URI[sha256sum] = "3f212c69d534d5822b492d099abb02a593f91ca99f5afde5cb9bd3e1dcdad069"
11 11
12DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
13RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 13RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -30,7 +30,7 @@ EXTRA_OECONF += " \
30 30
31do_install:append () { 31do_install:append () {
32 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 32 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
33 install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo 33 install -D -m 644 ${UNPACKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
34 if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then 34 if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then
35 echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo 35 echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo
36 sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers 36 sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/sysklogd/sysklogd
index 050772b59d..050772b59d 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/meta/recipes-extended/sysklogd/sysklogd/sysklogd
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb
index c9c9055142..c436153d1b 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb
@@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \
10 10
11inherit update-rc.d update-alternatives systemd autotools 11inherit update-rc.d update-alternatives systemd autotools
12 12
13SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https \ 13SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https;tag=v${PV} \
14 file://sysklogd \ 14 file://sysklogd \
15 " 15 "
16 16
17SRCREV = "3332c550f1a68393daec5d64cd81f3b7674c0af5" 17SRCREV = "5fb314cb9060afa3bd4eed2f0be3200f02f729e9"
18
19S = "${WORKDIR}/git"
20 18
21EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" 19EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger"
22 20
@@ -24,7 +22,7 @@ do_install:append () {
24 install -d ${D}${sysconfdir} 22 install -d ${D}${sysconfdir}
25 install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf 23 install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf
26 install -d ${D}${sysconfdir}/init.d 24 install -d ${D}${sysconfdir}/init.d
27 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog 25 install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog
28} 26}
29 27
30SYSTEMD_PACKAGES = "${PN}" 28SYSTEMD_PACKAGES = "${PN}"
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.7.bb
index 150f4932d8..0fa4a3c950 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.7.7.bb
@@ -12,8 +12,7 @@ SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \
12 12
13LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" 13LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
14 14
15SRCREV = "2d7682f26f42cef9127b123e319349b330c4ab8f" 15SRCREV = "dac10e13c70d1102aa3beea10135a3ed60520c36"
16S = "${WORKDIR}/git"
17 16
18DEPENDS += "base-passwd" 17DEPENDS += "base-passwd"
19 18
@@ -45,7 +44,7 @@ do_install() {
45 rm -rf ${D}/var 44 rm -rf ${D}/var
46 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 45 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
47 install -d ${D}/etc/default/volatiles 46 install -d ${D}/etc/default/volatiles
48 install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles 47 install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles
49 fi 48 fi
50 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 49 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
51 install -d ${D}${nonarch_libdir}/tmpfiles.d 50 install -d ${D}${nonarch_libdir}/tmpfiles.d
@@ -56,7 +55,7 @@ do_install() {
56 # systemd unit file. Otherwise the package will install one. 55 # systemd unit file. Otherwise the package will install one.
57 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then 56 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then
58 install -d ${D}${systemd_system_unitdir} 57 install -d ${D}${systemd_system_unitdir}
59 install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} 58 install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir}
60 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service 59 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service
61 fi 60 fi
62 fi 61 fi
diff --git a/meta/recipes-extended/tar/tar/run-ptest b/meta/recipes-extended/tar/tar/run-ptest
index 185b33d61a..b4ccbbcb46 100644
--- a/meta/recipes-extended/tar/tar/run-ptest
+++ b/meta/recipes-extended/tar/tar/run-ptest
@@ -1,14 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Define tar test work dir 3cd @PTEST_PATH@/tests/
4WORKDIR=@PTEST_PATH@/tests/
5 4
6# Run test 5# Clear old data
7cd ${WORKDIR} 6rm -rf testsuite.dir testsuite.log
8./atconfig ./atlocal ./testsuite
9
10# clear log
11rm -rf testsuite.dir
12rm -rf testsuite.log
13 7
14./testsuite --am-fmt 8./testsuite --am-fmt
diff --git a/meta/recipes-extended/tar/tar_1.35.bb b/meta/recipes-extended/tar/tar_1.35.bb
index c7bd1d195e..ea0993a909 100644
--- a/meta/recipes-extended/tar/tar_1.35.bb
+++ b/meta/recipes-extended/tar/tar_1.35.bb
@@ -22,12 +22,6 @@ EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
22 22
23CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" 23CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no"
24 24
25# Let aclocal use the relative path for the m4 file rather than the
26# absolute since tar has a lot of m4 files, otherwise there might
27# be an "Argument list too long" error when it is built in a long/deep
28# directory.
29acpaths = "-I ./m4"
30
31do_install () { 25do_install () {
32 autotools_do_install 26 autotools_do_install
33 ln -s tar ${D}${bindir}/gtar 27 ln -s tar ${D}${bindir}/gtar
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
6Fix "error: non-void function 'fix_options' should return a value". 6Fix "error: non-void function 'fix_options' should return a value".
7Add function prototype to tcpd.c and miscd.c. 7Add function prototype to tcpd.c and miscd.c.
8 8
9Upstream-Status: Pending 9Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
10 10
11Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> 11Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
12--- 12---
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
5 5
6These are seen with clang-15+ 6These are seen with clang-15+
7 7
8Upstream-Status: Inappropriate [upstream is dead] 8Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 hosts_access.c | 3 +++ 11 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
6These sources already include <stdio.h> which should bring the correct 6These sources already include <stdio.h> which should bring the correct
7declaration 7declaration
8 8
9Upstream-Status: Pending 9Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12 hosts_access.c | 1 - 12 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
4--- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 3diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3
4--- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847 3See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847
4 4
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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3* Mon Feb 5 2001 Preston Brown <pbrown@redhat.com> 3* Mon Feb 5 2001 Preston Brown <pbrown@redhat.com>
4- fix gethostbyname to work better with dot "." notation (#16949) 4- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c 3diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c
4--- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3Path: news.porcupine.org!news.porcupine.org!not-for-mail 3Path: news.porcupine.org!news.porcupine.org!not-for-mail
4From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl> 4From: 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c 3diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
4--- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3Index: tcp_wrappers_7.6/Makefile 3Index: tcp_wrappers_7.6/Makefile
4=================================================================== 4===================================================================
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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile 3diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
4--- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
4--- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 3diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
4--- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c 3diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c
4--- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100 4--- 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 @@
1Compile warning fixes from Debian 1Compile warning fixes from Debian
2 2
3Signed-off-by: Adrian Bunk <bunk@stusta.de> 3Signed-off-by: Adrian Bunk <bunk@stusta.de>
4Upstream-Status: Inappropriate [upstream is dead] 4Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
5 5
6--- a/options.c 6--- a/options.c
7+++ b/options.c 7+++ 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 @@
1Compile warning fixes from Debian 1Compile warning fixes from Debian
2 2
3Signed-off-by: Adrian Bunk <bunk@stusta.de> 3Signed-off-by: Adrian Bunk <bunk@stusta.de>
4Upstream-Status: Inappropriate [upstream is dead] 4Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
5 5
6--- a/clean_exit.c 6--- a/clean_exit.c
7+++ b/clean_exit.c 7+++ 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c 3diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c
4--- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3Index: tcp_wrappers_7.6.orig/Makefile 3Index: tcp_wrappers_7.6.orig/Makefile
4=================================================================== 4===================================================================
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.
12Also fixed: 12Also fixed:
13Fatal error: can't create shared/hosts_access.o: No such file or directory 13Fatal error: can't create shared/hosts_access.o: No such file or directory
14 14
15Upstream-Status: Pending 15Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
16 16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18--- 18---
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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 3diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3
4--- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200 4--- 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 @@
1__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl 1__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl
2glibc and uclibc had sys/cdefs.h doing it. 2glibc and uclibc had sys/cdefs.h doing it.
3 3
4Upstream-Status: Pending 4Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 6
7Index: tcp_wrappers_7.6/tcpd.h 7Index: 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 @@
1STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) 1STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings)
2 2
3Upstream-Status: Pending 3Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
4 4
5Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 5Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
6 6
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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c 3diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
4--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c 3diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c
4--- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 4--- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3--- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c 3--- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c
4+++ tcp-wrappers-7.6-ipv6.1/safe_finger.c 4+++ 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3* Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29 3* Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29
4- added security patch tcp_wrappers-7.6-sig.patch 4- 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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c 3diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
4--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 4--- 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
7 Added support for socklen_t type to len argument passed to socket related 7 Added support for socklen_t type to len argument passed to socket related
8 calls. This fixes a bug that causes tcp wrappers to fail when using sshd. 8 calls. This fixes a bug that causes tcp wrappers to fail when using sshd.
9 9
10Upstream-Status: Pending 10Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
11Signed-off-by: farrah rashid <farrah.rashid@windriver.com> 11Signed-off-by: farrah rashid <farrah.rashid@windriver.com>
12 12
13diff --git a/fix_options.c b/fix_options.c 13diff --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 @@
1Upstream-Status: Backport 1Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere]
2 2
3diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c 3diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c
4--- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200 4--- 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..da3ff90891 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -50,10 +50,11 @@ SRC_URI = "http://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
50 file://0001-Fix-implicit-function-declaration-warnings.patch \ 50 file://0001-Fix-implicit-function-declaration-warnings.patch \
51 " 51 "
52 52
53SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a"
54SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d" 53SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d"
55 54
56S = "${WORKDIR}/tcp_wrappers_${PV}" 55S = "${UNPACKDIR}/tcp_wrappers_${PV}"
56
57CFLAGS += "-std=gnu17"
57 58
58EXTRA_OEMAKE = "'CC=${CC}' \ 59EXTRA_OEMAKE = "'CC=${CC}' \
59 'AR=${AR}' \ 60 'AR=${AR}' \
@@ -120,8 +121,8 @@ do_install () {
120 install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 121 install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1
121 done 122 done
122 123
123 install -m 0644 ${WORKDIR}/try-from.8 ${D}${mandir}/man8/ 124 install -m 0644 ${UNPACKDIR}/try-from.8 ${D}${mandir}/man8/
124 install -m 0644 ${WORKDIR}/safe_finger.8 ${D}${mandir}/man8/ 125 install -m 0644 ${UNPACKDIR}/safe_finger.8 ${D}${mandir}/man8/
125 126
126 install -d ${D}${includedir} 127 install -d ${D}${includedir}
127 install -m 0644 tcpd.h ${D}${includedir}/ 128 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..9773d134cf 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,7 @@ PV = "1.0"
8 8
9SRC_URI = "file://template.py file://COPYING" 9SRC_URI = "file://template.py file://COPYING"
10 10
11S = "${WORKDIR}" 11S = "${UNPACKDIR}"
12 12
13inherit native 13inherit native
14 14
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
index 86c7c1811a..4de5bb8f41 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
+++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
@@ -28,8 +28,7 @@
28# of the executable from argv[0] and emulate the corresponding program, so 28# of the executable from argv[0] and emulate the corresponding program, so
29# multiple copies of this script will exist under different names. 29# multiple copies of this script will exist under different names.
30 30
31import sys, os, argparse 31import sys, argparse
32
33 32
34this_binary = sys.argv[0].split("/")[-1] 33this_binary = sys.argv[0].split("/")[-1]
35 34
@@ -38,7 +37,8 @@ stub_msg = """
38This stand-in version of %s is not yet fully capable of emulating 37This stand-in version of %s is not yet fully capable of emulating
39the real version from the GNU texinfo suite. If you see this message, file a 38the real version from the GNU texinfo suite. If you see this message, file a
40bug report with details on the recipe that failed. 39bug report with details on the recipe that failed.
41""" % this_binary 40Invoked as %s
41""" % (this_binary, sys.argv)
42 42
43# Autotools setups query the version, so this is actually necessary. Some of 43# Autotools setups query the version, so this is actually necessary. Some of
44# them (lookin' at you, glibc) actually look for the substring "GNU texinfo," 44# them (lookin' at you, glibc) actually look for the substring "GNU texinfo,"
diff --git a/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch b/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch
new file mode 100644
index 0000000000..cf0529db98
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch
@@ -0,0 +1,29 @@
1From f7572109b64db9ea5aa44078eaad25ad2a2283f8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 28 Nov 2024 13:16:15 +0100
4Subject: [PATCH] Makefile.am: do not build manpages
5
6This requires help2man.
7
8Upstream-Status: Inappropriate [oe-core doesn't provide help2man]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10---
11 Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index f733797..1013fcf 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -76,7 +76,7 @@
19 endif
20 endif
21 SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo \
22- texindex util doc man
23+ texindex util doc
24 SUBDIRS += js
25 endif
26
27--
282.39.5
29
diff --git a/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
index b43a115b23..8ddf50261d 100644
--- a/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
+++ b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
@@ -1,8 +1,7 @@
1From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001 1From db2c41668d62c234fa69c71db18c162500dd403f Mon Sep 17 00:00:00 2001
2From: Joshua Lock <josh@linux.intel.com> 2From: Joshua Lock <josh@linux.intel.com>
3Date: Fri, 16 Sep 2011 15:35:48 -0700 3Date: Fri, 16 Sep 2011 15:35:48 -0700
4Subject: [PATCH 1/3] texinfo: several changes to build without zlib and 4Subject: [PATCH] texinfo: several changes to build without zlib and ncurses
5 ncurses
6 5
7We already DEPEND on the native texinfo being present before building so 6We already DEPEND on the native texinfo being present before building so
8there isn't any need to try and build the required native texinfo binaries 7there isn't any need to try and build the required native texinfo binaries
@@ -16,10 +15,10 @@ Signed-off-by: Joshua Lock <josh@linux.intel.com>
16 1 file changed, 1 insertion(+), 23 deletions(-) 15 1 file changed, 1 insertion(+), 23 deletions(-)
17 16
18diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
19index 8094498..5b72fc1 100644 18index 00626a3..5b725fe 100644
20--- a/configure.ac 19--- a/configure.ac
21+++ b/configure.ac 20+++ b/configure.ac
22@@ -247,29 +247,7 @@ AC_CANONICAL_BUILD 21@@ -267,29 +267,7 @@ AC_CANONICAL_BUILD
23 # $native_tools is also added to SUBDIRS in the main Makefile.am, 22 # $native_tools is also added to SUBDIRS in the main Makefile.am,
24 # so that make compiles the native tools first. 23 # so that make compiles the native tools first.
25 # 24 #
@@ -50,6 +49,3 @@ index 8094498..5b72fc1 100644
50 AC_SUBST(native_tools) 49 AC_SUBST(native_tools)
51 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) 50 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
52 51
53--
542.39.2
55
diff --git a/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch
deleted file mode 100644
index f3b6827d58..0000000000
--- a/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From e02be81fa68ddc7f939abd99de4e42759a0d5d8c Mon Sep 17 00:00:00 2001
2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
3Date: Tue, 29 Nov 2016 13:43:24 -0600
4Subject: [PATCH 2/3] dont-depend-on-help2man
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
10---
11 doc/Makefile.am | 2 +-
12 man/Makefile.am | 12 ++++++------
13 2 files changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/doc/Makefile.am b/doc/Makefile.am
16index e9e6298..f1b9895 100644
17--- a/doc/Makefile.am
18+++ b/doc/Makefile.am
19@@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex
20 # Include our texinfo.tex, not Automake's.
21 EXTRA_DIST = epsf.tex texinfo.tex \
22 fdl.texi \
23- $(man_MANS) $(TXI_XLATE) \
24+ $(TXI_XLATE) \
25 $(refcard_files) \
26 texinfo-tex-test.texi texinfo-tex-test.WIDOWs \
27 texinfo-ja.tex short-sample-ja.texi \
28diff --git a/man/Makefile.am b/man/Makefile.am
29index f2c703f..61caeeb 100644
30--- a/man/Makefile.am
31+++ b/man/Makefile.am
32@@ -11,27 +11,27 @@
33 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
34
35 # These are generated using help2man.
36-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
37+#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
38
39 # These require the build in info/, thus can't do if we failed to find a
40 # terminal library.
41 if HAVE_TERMLIBS
42-man_MANS += info.1
43+#man_MANS += info.1
44 endif
45
46 # These are hand-written.
47-man_MANS += info.5 texinfo.5
48+#man_MANS += info.5 texinfo.5
49
50-man_MANS += pod2texi.1
51+#man_MANS += pod2texi.1
52
53 pod2texi.1: $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
54 $(POD2MAN) $(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl >"$@"
55
56
57 # These are just .so's to the common program.
58-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
59+#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
60
61-EXTRA_DIST = $(man_MANS) ginfo.h2m
62+EXTRA_DIST = ginfo.h2m
63
64 # Maintainers should be able to regenerate.
65 MAINTAINERCLEANFILES = $(man_MANS)
66--
672.39.2
68
diff --git a/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
index f99f8b87d5..4985d30503 100644
--- a/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
+++ b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
@@ -1,7 +1,7 @@
1From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001 1From 0131013100bf0baabfc0f9a44341e0d9d7cca794 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Mon, 29 Jul 2013 15:02:34 -0700 3Date: Mon, 29 Jul 2013 15:02:34 -0700
4Subject: [PATCH 3/3] texinfo: Update to 5.1 4Subject: [PATCH] texinfo: Update to 5.1
5 5
6Upstream-Status: Inappropriate [cross build specific] 6Upstream-Status: Inappropriate [cross build specific]
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/info/Makefile.am b/info/Makefile.am 13diff --git a/info/Makefile.am b/info/Makefile.am
14index f57b341..a019aa7 100644 14index 660d7f5..bed840a 100644
15--- a/info/Makefile.am 15--- a/info/Makefile.am
16+++ b/info/Makefile.am 16+++ b/info/Makefile.am
17@@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ 17@@ -81,7 +81,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
18 # more than once. 18 # more than once.
19 funs.h: makedoc$(EXEEXT) $(cmd_sources) 19 funs.h: makedoc$(EXEEXT) $(cmd_sources)
20 rm -f $(generated_sources) 20 rm -f $(generated_sources)
@@ -23,6 +23,3 @@ index f57b341..a019aa7 100644
23 23
24 # The following hack is necessary to hint make before the automatic 24 # The following hack is necessary to hint make before the automatic
25 # dependencies are built. 25 # dependencies are built.
26--
272.39.2
28
diff --git a/meta/recipes-extended/texinfo/texinfo_7.1.bb b/meta/recipes-extended/texinfo/texinfo_7.2.bb
index 65d8252fb9..784f67f65b 100644
--- a/meta/recipes-extended/texinfo/texinfo_7.1.bb
+++ b/meta/recipes-extended/texinfo/texinfo_7.2.bb
@@ -30,11 +30,11 @@ TARGET_PATCH:class-native = ""
30 30
31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ 31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
32 file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \ 32 file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \
33 file://0002-dont-depend-on-help2man.patch \ 33 file://0001-Makefile.am-do-not-build-manpages.patch \
34 ${TARGET_PATCH} \ 34 ${TARGET_PATCH} \
35 " 35 "
36 36
37SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0" 37SRC_URI[sha256sum] = "e86de7dfef6b352aa1bf647de3a6213d1567c70129eccbf8977706d9c91919c8"
38 38
39tex_texinfo = "texmf/tex/texinfo" 39tex_texinfo = "texmf/tex/texinfo"
40 40
@@ -75,7 +75,7 @@ FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \
75 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ 75 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \
76 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" 76 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*"
77 77
78FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" 78FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo ${datadir}/texi2any"
79RDEPENDS:${PN} = "perl" 79RDEPENDS:${PN} = "perl"
80FILES:${PN}-doc = "${infodir}/texi* \ 80FILES:${PN}-doc = "${infodir}/texi* \
81 ${datadir}/${tex_texinfo} \ 81 ${datadir}/${tex_texinfo} \
diff --git a/meta/recipes-extended/time/time/0001-Fix-the-type-for-sighandler_t.patch b/meta/recipes-extended/time/time/0001-Fix-the-type-for-sighandler_t.patch
new file mode 100644
index 0000000000..0f8bf6e03e
--- /dev/null
+++ b/meta/recipes-extended/time/time/0001-Fix-the-type-for-sighandler_t.patch
@@ -0,0 +1,27 @@
1From cfef684e2c2c93c4a871d6c2a7af8f4c1b7c6741 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 18 Mar 2025 09:29:58 -0700
4Subject: [PATCH] Fix the type for sighandler_t
5
6__sighandler_t is private interface in glibc so its
7better to not use it, as an aside fixes build with musl
8
9Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2025-03/msg00000.html]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/time.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/time.c b/src/time.c
16index 7ff29a4..82eb66a 100644
17--- a/src/time.c
18+++ b/src/time.c
19@@ -728,7 +728,7 @@ run_command (cmd, resp)
20 RESUSE *resp;
21 {
22 pid_t pid; /* Pid of child. */
23- __sighandler_t interrupt_signal, quit_signal;
24+ sighandler_t interrupt_signal, quit_signal;
25 int saved_errno;
26
27 resuse_start (resp);
diff --git a/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch b/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch
new file mode 100644
index 0000000000..76141aec18
--- /dev/null
+++ b/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch
@@ -0,0 +1,33 @@
1From 831194f0be7733c99c7a2c69d9e9695b82e05010 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
3Date: Thu, 30 Jan 2025 08:48:47 +0100
4Subject: [PATCH] time: fix compiling with GCC15
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9GCC15 complains about incompatible pointer type in run_command()
10Initialize interrupt_signal and quit_signal with correct type
11
12Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2025-01/msg00000.html]
13Signed-off-by: Ondřej Pohořelský <opohorel@redhat.com>
14---
15 src/time.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/time.c b/src/time.c
19index 7b401bc..c8d7ab0 100644
20--- a/src/time.c
21+++ b/src/time.c
22@@ -803,7 +803,7 @@ run_command (cmd, resp)
23 RESUSE *resp;
24 {
25 pid_t pid; /* Pid of child. */
26- sighandler interrupt_signal, quit_signal;
27+ __sighandler_t interrupt_signal, quit_signal;
28 int saved_errno;
29
30 resuse_start (resp);
31--
322.48.1
33
diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.9.bb
index 8364210e61..d6d8aa6e1e 100644
--- a/meta/recipes-extended/time/time_1.9.bb
+++ b/meta/recipes-extended/time/time_1.9.bb
@@ -15,9 +15,15 @@ BBCLASSEXTEND = "native nativesdk"
15 15
16SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ 16SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
17 file://0001-include-string.h-for-memset.patch \ 17 file://0001-include-string.h-for-memset.patch \
18 file://time-1.9-Fix-compiling-with-GCC15.patch \
19 file://0001-Fix-the-type-for-sighandler_t.patch \
18 " 20 "
19 21
20SRC_URI[md5sum] = "d2356e0fe1c0b85285d83c6b2ad51b5f"
21SRC_URI[sha256sum] = "fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e" 22SRC_URI[sha256sum] = "fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e"
22 23
23inherit autotools 24inherit autotools
25
26# Submitted fix: https://lists.gnu.org/archive/html/bug-time/2021-01/msg00000.html
27do_configure:prepend () {
28 [ ! -e ${S}/.tarball-version ] && echo ${PV} > ${S}/.tarball-version
29}
diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc
index 4734adcc08..9a5105ffd7 100644
--- a/meta/recipes-extended/timezone/timezone.inc
+++ b/meta/recipes-extended/timezone/timezone.inc
@@ -6,15 +6,15 @@ SECTION = "base"
6LICENSE = "PD & BSD-3-Clause" 6LICENSE = "PD & BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
8 8
9PV = "2024a" 9PV = "2025b"
10 10
11SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ 11SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \
12 http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ 12 http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \
13 " 13 "
14 14
15S = "${WORKDIR}/tz" 15S = "${UNPACKDIR}/tz"
16 16
17UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" 17UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
18 18
19SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" 19SRC_URI[tzcode.sha256sum] = "05f8fedb3525ee70d49c87d3fae78a8a0dbae4fe87aa565c65cda9948ae135ec"
20SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" 20SRC_URI[tzdata.sha256sum] = "11810413345fc7805017e27ea9fa4885fd74cd61b2911711ad038f5d28d71474"
diff --git a/meta/recipes-extended/timezone/tzcode-native.bb b/meta/recipes-extended/timezone/tzcode-native.bb
index d0b23a9d80..dc9f076377 100644
--- a/meta/recipes-extended/timezone/tzcode-native.bb
+++ b/meta/recipes-extended/timezone/tzcode-native.bb
@@ -4,7 +4,7 @@ SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
4 4
5inherit native 5inherit native
6 6
7EXTRA_OEMAKE += "cc='${CC}'" 7EXTRA_OEMAKE += "CC='${CC}'"
8 8
9do_install () { 9do_install () {
10 install -d ${D}${bindir}/ 10 install -d ${D}${bindir}/
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}"
20B = "${WORKDIR}/build" 20B = "${WORKDIR}/build"
21 21
22do_compile() { 22do_compile() {
23 oe_runmake -C ${S} tzdata.zi
23 for zone in ${TZONES}; do 24 for zone in ${TZONES}; do
24 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} 25 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone}
25 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} 26 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone}
@@ -37,6 +38,7 @@ do_install() {
37 cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo 38 cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
38 cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo 39 cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
39 cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo 40 cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
41 cp -pP "${S}/tzdata.zi" ${D}${datadir}/zoneinfo
40 42
41 # Install default timezone 43 # Install default timezone
42 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then 44 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
@@ -141,6 +143,7 @@ FILES:tzdata-core += " \
141 ${sysconfdir}/timezone \ 143 ${sysconfdir}/timezone \
142 ${datadir}/zoneinfo/leapseconds \ 144 ${datadir}/zoneinfo/leapseconds \
143 ${datadir}/zoneinfo/leap-seconds.list \ 145 ${datadir}/zoneinfo/leap-seconds.list \
146 ${datadir}/zoneinfo/tzdata.zi \
144 ${datadir}/zoneinfo/Pacific/Honolulu \ 147 ${datadir}/zoneinfo/Pacific/Honolulu \
145 ${datadir}/zoneinfo/America/Anchorage \ 148 ${datadir}/zoneinfo/America/Anchorage \
146 ${datadir}/zoneinfo/America/Los_Angeles \ 149 ${datadir}/zoneinfo/America/Los_Angeles \
diff --git a/meta/recipes-extended/unzip/unzip/gcc15.patch b/meta/recipes-extended/unzip/unzip/gcc15.patch
new file mode 100644
index 0000000000..42a2f81681
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/gcc15.patch
@@ -0,0 +1,17 @@
1Do not redefine gmtime(), localtime()
2
3They are already provided by system time.h header
4
5Upstream-Status: Inactive-Upstream [need a new release]
6
7Sign-off-by: Khem Raj <raj.khem@gmail.com>
8--- a/unix/unxcfg.h
9+++ b/unix/unxcfg.h
10@@ -117,7 +117,6 @@ typedef struct stat z_stat;
11 # endif
12 #else
13 # include <time.h>
14- struct tm *gmtime(), *localtime();
15 #endif
16
17 #if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN)))
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index 27076d5d9b..d6289deff7 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"
2HOMEPAGE = "http://www.info-zip.org" 2HOMEPAGE = "http://www.info-zip.org"
3DESCRIPTION = "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." 3DESCRIPTION = "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."
4SECTION = "console/utils" 4SECTION = "console/utils"
5LICENSE = "BSD-3-Clause" 5LICENSE = "Info-ZIP"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29"
7PE = "1" 7PE = "1"
8 8
@@ -32,10 +32,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/
32 file://CVE-2022-0530.patch \ 32 file://CVE-2022-0530.patch \
33 file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ 33 file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \
34 file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ 34 file://0001-unix-configure-fix-detection-for-cross-compilation.patch \
35 file://gcc15.patch \
35" 36"
36UPSTREAM_VERSION_UNKNOWN = "1" 37UPSTREAM_VERSION_UNKNOWN = "1"
37 38
38SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
39SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" 39SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
40 40
41CVE_STATUS[CVE-2008-0888] = "fixed-version: Patch from https://bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source" 41CVE_STATUS[CVE-2008-0888] = "fixed-version: Patch from https://bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source"
@@ -43,7 +43,7 @@ CVE_STATUS[CVE-2008-0888] = "fixed-version: Patch from https://bugzilla.redhat.c
43# exclude version 5.5.2 which triggers a false positive 43# exclude version 5.5.2 which triggers a false positive
44UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz" 44UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz"
45 45
46S = "${WORKDIR}/unzip60" 46S = "${UNPACKDIR}/unzip60"
47 47
48# Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from 48# Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from
49# Makefile and add CFLAGS. Optimization will be overriden by unzip 49# Makefile and add CFLAGS. Optimization will be overriden by unzip
diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb
index f138952128..58c565bd30 100644
--- a/meta/recipes-extended/watchdog/watchdog-config.bb
+++ b/meta/recipes-extended/watchdog/watchdog-config.bb
@@ -13,12 +13,14 @@ SRC_URI = " \
13 file://watchdog.conf \ 13 file://watchdog.conf \
14" 14"
15 15
16S = "${UNPACKDIR}"
17
16# The default value is 60 seconds when null. 18# The default value is 60 seconds when null.
17WATCHDOG_TIMEOUT ??= "" 19WATCHDOG_TIMEOUT ??= ""
18 20
19do_install() { 21do_install() {
20 install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog 22 install -Dm 0644 ${UNPACKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog
21 install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf 23 install -Dm 0644 ${UNPACKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf
22 24
23 if [ -n "${WATCHDOG_TIMEOUT}" ]; then 25 if [ -n "${WATCHDOG_TIMEOUT}" ]; then
24 echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf 26 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 @@
1# Start watchdog at boot time? 0 or 1 1# Start watchdog at boot time? 0 or 1
2run_watchdog=1 2run_watchdog=1
3watchdog_module=none
diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb
index 5325ccafda..c166ace665 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.16.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb
@@ -16,7 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
16 file://0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch \ 16 file://0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch \
17" 17"
18 18
19SRC_URI[md5sum] = "1b4f51cabc64d1bee2fce7cdd626831f"
20SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d" 19SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d"
21 20
22# Can be dropped when the output next changes, avoids failures after 21# Can be dropped when the output next changes, avoids failures after
@@ -50,8 +49,8 @@ do_install:append() {
50 install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} 49 install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir}
51 install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} 50 install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir}
52 51
53 install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog 52 install -Dm 0755 ${UNPACKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog
54 install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive 53 install -Dm 0755 ${UNPACKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
55 54
56 # watchdog.conf is provided by the watchdog-config recipe 55 # watchdog.conf is provided by the watchdog-config recipe
57 rm ${D}${sysconfdir}/watchdog.conf 56 rm ${D}${sysconfdir}/watchdog.conf
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 51926e7296..13cf879067 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -27,7 +27,7 @@ RRECOMMENDS:${PN} += "ca-certificates"
27 27
28BBCLASSEXTEND = "nativesdk" 28BBCLASSEXTEND = "nativesdk"
29 29
30PACKAGECONFIG ??= "gnutls pcre zlib \ 30PACKAGECONFIG ??= "gnutls pcre2 zlib \
31 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 31 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
32PACKAGECONFIG[ares] = "--with-cares,--without-cares,c-ares" 32PACKAGECONFIG[ares] = "--with-cares,--without-cares,c-ares"
33PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" 33PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
@@ -37,9 +37,5 @@ PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl"
37PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux" 37PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
38PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" 38PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
39PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" 39PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
40PACKAGECONFIG[pcre2] = "--enable-pcre2,--disable-pcre2,libpcre2"
40PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" 41PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
41
42# Let aclocal use the relative path for the m4 file rather than
43# absolute, otherwise there might be an "Argument list too long" error
44# when it is built in a long/deep directory.
45acpaths = "-I ./m4"
diff --git a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
index 5438bafdcb..6ecb9ef289 100644
--- a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
+++ b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
@@ -1,4 +1,4 @@
1From b86e57b68363d108fe77c6fd588a275d2696cabe Mon Sep 17 00:00:00 2001 1From 304f55a3e2689154d829938d29e43d808ca6298a Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 10 Jan 2018 14:43:20 +0800 3Date: Wed, 10 Jan 2018 14:43:20 +0800
4Subject: [PATCH] src/Makefile.am: improve reproducibility 4Subject: [PATCH] src/Makefile.am: improve reproducibility
@@ -44,10 +44,10 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
44 1 file changed, 4 insertions(+) 44 1 file changed, 4 insertions(+)
45 45
46diff --git a/src/Makefile.am b/src/Makefile.am 46diff --git a/src/Makefile.am b/src/Makefile.am
47index 18ec622..38d252d 100644 47index 86be533..721a401 100644
48--- a/src/Makefile.am 48--- a/src/Makefile.am
49+++ b/src/Makefile.am 49+++ b/src/Makefile.am
50@@ -108,9 +108,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a 50@@ -126,9 +126,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a
51 echo '#include "version.h"' >> $@ 51 echo '#include "version.h"' >> $@
52 echo 'const char *version_string = "@VERSION@";' >> $@ 52 echo 'const char *version_string = "@VERSION@";' >> $@
53 echo 'const char *compilation_string = "'$(COMPILE)'";' \ 53 echo 'const char *compilation_string = "'$(COMPILE)'";' \
diff --git a/meta/recipes-extended/wget/wget_1.24.5.bb b/meta/recipes-extended/wget/wget_1.25.0.bb
index 64e6ee80af..93fefc9092 100644
--- a/meta/recipes-extended/wget/wget_1.24.5.bb
+++ b/meta/recipes-extended/wget/wget_1.25.0.bb
@@ -1,7 +1,7 @@
1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ 1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
2 file://0002-improve-reproducibility.patch \ 2 file://0002-improve-reproducibility.patch \
3 " 3 "
4 4
5SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" 5SRC_URI[sha256sum] = "766e48423e79359ea31e41db9e5c289675947a7fcf2efdcedb726ac9d0da3784"
6 6
7require wget.inc 7require wget.inc
diff --git a/meta/recipes-extended/which/which-2.21/0001-getopt-Fix-signature-of-getenv-function.patch b/meta/recipes-extended/which/which-2.21/0001-getopt-Fix-signature-of-getenv-function.patch
new file mode 100644
index 0000000000..e006d797d3
--- /dev/null
+++ b/meta/recipes-extended/which/which-2.21/0001-getopt-Fix-signature-of-getenv-function.patch
@@ -0,0 +1,39 @@
1From 16a1647fc26953fab659de5f55d4c0defdfb894f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 22 Mar 2025 17:56:19 -0700
4Subject: [PATCH] getopt: Fix signature of getenv function
5
6This happens on musl systems using GCC 15
7
8../which-2.21/getopt.h:106:12: error: conflicting types for 'getopt'; have 'int(void)'
9 106 | extern int getopt ();
10 | ^~~~~~
11
12Upstream-Status: Submitted [https://lists.gnu.org/archive/html/which-bugs/2025-03/msg00000.html]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 getopt.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18--- a/getopt.c
19+++ b/getopt.c
20@@ -209,7 +209,7 @@ static char *posixly_correct;
21 /* Avoid depending on library functions or files
22 whose names are inconsistent. */
23
24-char *getenv ();
25+char *getenv (const char*);
26
27 static char *
28 my_index (str, chr)
29--- a/getopt.h
30+++ b/getopt.h
31@@ -103,7 +103,7 @@ struct option
32 errors, only prototype getopt for the GNU C library. */
33 extern int getopt (int argc, char *const *argv, const char *shortopts);
34 #else /* not __GNU_LIBRARY__ */
35-extern int getopt ();
36+extern int getopt (int, char * const [], const char *);
37 #endif /* __GNU_LIBRARY__ */
38 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
39 const struct option *longopts, int *longind);
diff --git a/meta/recipes-extended/which/which_2.21.bb b/meta/recipes-extended/which/which_2.21.bb
index 77861370e5..7279a04737 100644
--- a/meta/recipes-extended/which/which_2.21.bb
+++ b/meta/recipes-extended/which/which_2.21.bb
@@ -13,14 +13,13 @@ DEPENDS = "cwautomacros-native"
13 13
14inherit autotools texinfo update-alternatives 14inherit autotools texinfo update-alternatives
15 15
16
17EXTRA_OECONF = "--disable-iberty" 16EXTRA_OECONF = "--disable-iberty"
18 17
19SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \ 18SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \
20 file://automake.patch \ 19 file://automake.patch \
20 file://0001-getopt-Fix-signature-of-getenv-function.patch \
21 " 21 "
22 22
23SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a"
24SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad" 23SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad"
25 24
26do_configure:prepend() { 25do_configure:prepend() {
diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
index 4d93180535..3ee320da5a 100644
--- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb
@@ -24,7 +24,6 @@ SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \
24 file://CVE-2022-4055.patch \ 24 file://CVE-2022-4055.patch \
25 " 25 "
26 26
27SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff"
28SRC_URI[sha256sum] = "d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9" 27SRC_URI[sha256sum] = "d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9"
29 28
30UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" 29UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)"
diff --git a/meta/recipes-extended/xinetd/xinetd/0001-Use-monotonic-time.patch b/meta/recipes-extended/xinetd/xinetd/0001-Use-monotonic-time.patch
new file mode 100644
index 0000000000..ee997fd28f
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/0001-Use-monotonic-time.patch
@@ -0,0 +1,325 @@
1From 753aa53e817d29e979c2a2fca7da40a3d115f93c Mon Sep 17 00:00:00 2001
2From: Li Wang <li.wang@windriver.com>
3Date: Tue, 3 Sep 2024 15:21:52 +0800
4Subject: [PATCH] Use monotonic time
5
6When using xinet.d to limit rsync connections, it can't handle changes
7in system time. When time is set back, the connection limit is reached
8very quickly and rsync gets deactivated, if time is changed again, rsync
9is never reactivated.
10
11The current timer of xinet.d is based on the time() and is affected by
12the system time. Use clock_gettime() with CLOCK_MONOTONIC as the new
13timer because CLOCK_MONOTONIC clock is not affected by discontinuous
14jumps in the system time.
15
16Upstream-Status: Submitted [https://github.com/openSUSE/xinetd/pull/48]
17
18Signed-off-by: Li Wang <li.wang@windriver.com>
19---
20 src/access.c | 6 +++---
21 src/builtins.c | 5 +++--
22 src/internals.c | 2 +-
23 src/log.c | 3 ++-
24 src/sensor.c | 6 +++---
25 src/server.c | 3 ++-
26 src/service.c | 5 +++--
27 src/signals.c | 2 +-
28 src/time.c | 3 ++-
29 src/xlog/filelog.c | 3 ++-
30 src/xtimer.c | 15 ++++++++++++---
31 src/xtimer.h | 1 +
32 12 files changed, 35 insertions(+), 19 deletions(-)
33
34diff --git a/src/access.c b/src/access.c
35index e942db7..eb9da6e 100644
36--- a/src/access.c
37+++ b/src/access.c
38@@ -70,7 +70,7 @@ static void cps_service_restart(void)
39 time_t nowtime;
40 const char *func = "cps_service_restart";
41
42- nowtime = time(NULL);
43+ nowtime = _time(NULL);
44 for( i=0; i < pset_count( SERVICES(ps) ); i++ ) {
45 struct service *sp;
46 struct service_config *scp;
47@@ -104,7 +104,7 @@ void cps_service_stop(struct service *sp, const char *reason)
48 msg(LOG_ERR, "service_stop",
49 "Deactivating service %s due to %s. Restarting in %d seconds.",
50 SC_NAME(scp), reason, (int)SC_TIME_WAIT(scp));
51- nowtime = time(NULL);
52+ nowtime = _time(NULL);
53 SC_TIME_REENABLE(scp) = nowtime + SC_TIME_WAIT(scp);
54 xtimer_add(cps_service_restart, SC_TIME_WAIT(scp));
55 }
56@@ -284,7 +284,7 @@ access_e parent_access_control( struct service *sp, const connection_s *cp )
57 /* CPS handler */
58 if( SC_TIME_CONN_MAX(scp) != 0 ) {
59 int time_diff;
60- nowtime = time(NULL);
61+ nowtime = _time(NULL);
62 time_diff = nowtime - SC_TIME_LIMIT(scp) ;
63
64 if( SC_TIME_CONN(scp) == 0 ) {
65diff --git a/src/builtins.c b/src/builtins.c
66index 042e5dc..c285a02 100644
67--- a/src/builtins.c
68+++ b/src/builtins.c
69@@ -36,6 +36,7 @@
70 #include "nvlists.h"
71 #include "child.h"
72 #include "access.h"
73+#include "xtimer.h"
74
75 #define BUFFER_SIZE 1024
76
77@@ -237,7 +238,7 @@ static void daytime_protocol( char *buf, unsigned int *buflen )
78 int size = *buflen ;
79 int cc ;
80
81- (void) time( &now ) ;
82+ (void) _time( &now ) ;
83 tmp = localtime( &now ) ;
84 cc = strx_nprint( buf, size,
85 "%02d %s %d %02d:%02d:%02d",
86@@ -308,7 +309,7 @@ static void time_protocol( unsigned char *timep )
87 time_t now ;
88 unsigned long base1900;
89
90- (void) time( &now ) ;
91+ (void) _time( &now ) ;
92 base1900 = (unsigned long)now + TIME_OFFSET ;
93 timep[0] = base1900 >> 24;
94 timep[1] = base1900 >> 16;
95diff --git a/src/internals.c b/src/internals.c
96index c5ed4f8..6a19207 100644
97--- a/src/internals.c
98+++ b/src/internals.c
99@@ -85,7 +85,7 @@ void dump_internal_state(void)
100 * Print the program name, version, and timestamp.
101 * Note that the program_version variable contains the program name.
102 */
103- (void) time( &current_time ) ;
104+ (void) _time( &current_time ) ;
105 Sprint( dump_fd, "INTERNAL STATE DUMP: %s\n", program_version ) ;
106 Sprint( dump_fd, "Current time: %s\n", ctime( &current_time ) ) ;
107
108diff --git a/src/log.c b/src/log.c
109index b66ab24..7aba30d 100644
110--- a/src/log.c
111+++ b/src/log.c
112@@ -21,6 +21,7 @@
113 #include "sconf.h"
114 #include "sconst.h"
115 #include "msg.h"
116+#include "xtimer.h"
117
118
119 #define LOGBUF_SIZE 1024
120@@ -202,7 +203,7 @@ void svc_log_exit( struct service *sp, const struct server *serp )
121 {
122 time_t current_time ;
123
124- (void) time( &current_time ) ;
125+ (void) _time( &current_time ) ;
126 cc = strx_nprint( &buf[ len ], bufsize, " duration=%ld(sec)",
127 (long)(current_time - SERVER_STARTTIME( serp )) ) ;
128 len += cc ;
129diff --git a/src/sensor.c b/src/sensor.c
130index cd85806..24bd816 100644
131--- a/src/sensor.c
132+++ b/src/sensor.c
133@@ -68,7 +68,7 @@ void process_sensor( const struct service *sp, const union xsockaddr *addr)
134 time_t nowtime;
135 char time_buf[40], *tmp;
136
137- nowtime = time(NULL);
138+ nowtime = _time(NULL);
139 msg(LOG_CRIT, func,
140 "Adding %s to the global_no_access list for %d minutes",
141 dup_addr, SC_DENY_TIME(SVC_CONF(sp)));
142@@ -113,7 +113,7 @@ void process_sensor( const struct service *sp, const union xsockaddr *addr)
143 {
144 time_t nowtime, new_time;
145
146- nowtime = time(NULL);
147+ nowtime = _time(NULL);
148 new_time = (time_t)nowtime+(60*SC_DENY_TIME(SVC_CONF(sp))); if (difftime(new_time, (time_t)stored_time) > 0.0)
149 { /* new_time is longer save it */
150 char time_buf[40], *new_exp_time;
151@@ -163,7 +163,7 @@ static void scrub_global_access_list( void )
152 {
153 int found_one = 0;
154 unsigned u;
155- time_t nowtime = time(NULL);
156+ time_t nowtime = _time(NULL);
157
158 for (u=0; u < count; u++)
159 {
160diff --git a/src/server.c b/src/server.c
161index 4c4a2b8..e201a57 100644
162--- a/src/server.c
163+++ b/src/server.c
164@@ -30,6 +30,7 @@
165 #include "retry.h"
166 #include "child.h"
167 #include "signals.h"
168+#include "xtimer.h"
169
170
171 #define NEW_SERVER() NEW( struct server )
172@@ -228,7 +229,7 @@ status_e server_start( struct server *serp )
173 return( FAILED ) ;
174
175 default:
176- (void) time( &SERVER_STARTTIME(serp) ) ;
177+ (void) _time( &SERVER_STARTTIME(serp) ) ;
178 SVC_INC_RUNNING_SERVERS( sp ) ;
179
180 /*
181diff --git a/src/service.c b/src/service.c
182index 93c2162..04422c3 100644
183--- a/src/service.c
184+++ b/src/service.c
185@@ -43,6 +43,7 @@
186 #include "logctl.h"
187 #include "xconfig.h"
188 #include "special.h"
189+#include "xtimer.h"
190
191
192 #define NEW_SVC() NEW( struct service )
193@@ -840,7 +841,7 @@ static status_e failed_service(struct service *sp,
194 SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
195 }
196
197- (void) time( &current_time ) ;
198+ (void) _time( &current_time ) ;
199 if ( sinp->sin_addr.s_addr == last->sin_addr.s_addr &&
200 sinp->sin_port == last->sin_port )
201 {
202@@ -867,7 +868,7 @@ static status_e failed_service(struct service *sp,
203 SVC_LAST_DGRAM_ADDR( sp ) = (union xsockaddr *)last;
204 }
205
206- (void) time( &current_time ) ;
207+ (void) _time( &current_time ) ;
208 if ( IN6_ARE_ADDR_EQUAL(&(sinp->sin6_addr), &(last->sin6_addr)) &&
209 sinp->sin6_port == last->sin6_port )
210 {
211diff --git a/src/signals.c b/src/signals.c
212index 3c42db3..4160e6d 100644
213--- a/src/signals.c
214+++ b/src/signals.c
215@@ -301,7 +301,7 @@ static void bad_signal(void)
216 else if ( total_signal_count > MAX_SIGNAL_COUNT )
217 _exit( 1 ) ; /* in case of a problem in exit(3) */
218
219- (void) time( &current_time ) ;
220+ (void) _time( &current_time ) ;
221
222 if ( interval_signal_count > 0 &&
223 current_time - interval_start <= SIGNAL_INTERVAL )
224diff --git a/src/time.c b/src/time.c
225index a4d63fb..68142b0 100644
226--- a/src/time.c
227+++ b/src/time.c
228@@ -16,6 +16,7 @@
229 #include "timex.h"
230 #include "msg.h"
231 #include "util.h"
232+#include "xtimer.h"
233
234
235 #define IN_RANGE( val, low, high ) ( (low) <= (val) && (val) <= (high) )
236@@ -41,7 +42,7 @@ bool_int ti_current_time_check( const pset_h intervals )
237 int16_t min_current ;
238 struct tm *tmp ;
239
240- (void) time( &current_time ) ;
241+ (void) _time( &current_time ) ;
242 tmp = localtime( &current_time ) ;
243 min_current = tmp->tm_hour * 60 + tmp->tm_min ;
244
245diff --git a/src/xlog/filelog.c b/src/xlog/filelog.c
246index ee688e5..46cf1e2 100644
247--- a/src/xlog/filelog.c
248+++ b/src/xlog/filelog.c
249@@ -25,6 +25,7 @@
250 #include "str.h"
251 #include "xlog.h"
252 #include "filelog.h"
253+#include "xtimer.h"
254
255 static int filelog_init(xlog_s *, va_list) ;
256 static void filelog_fini(xlog_s *) ;
257@@ -190,7 +191,7 @@ static int filelog_write( xlog_s *xp, const char buf[], int len, int flags,
258 if ( flp->fl_state != FL_OPEN )
259 return( flp->fl_error ) ;
260
261- (void) time( &current_time ) ;
262+ (void) _time( &current_time ) ;
263 tmp = localtime( &current_time ) ;
264 cc = Sprint( flp->fl_fd, "%02d/%d/%d@%02d:%02d:%02d",
265 tmp->tm_year%100, tmp->tm_mon+1, tmp->tm_mday,
266diff --git a/src/xtimer.c b/src/xtimer.c
267index 2053ef4..7a125d8 100644
268--- a/src/xtimer.c
269+++ b/src/xtimer.c
270@@ -11,6 +11,15 @@
271 #include "pset.h"
272 #include "msg.h"
273
274+time_t _time(time_t *t)
275+{
276+ struct timespec ts;
277+ clock_gettime(CLOCK_MONOTONIC, &ts);
278+ if(t)
279+ *t = ts.tv_sec;
280+ return ts.tv_sec;
281+}
282+
283 /* A note on the usage of timers in these functions:
284 * The timers are composed of 3 elements, a pointer to a callback function,
285 * the expire time of the timer, and a unique (pseudo-monotomically increasing)
286@@ -68,7 +77,7 @@ int xtimer_add( void (*func)(void), time_t secs )
287 return -1;
288 }
289
290- tmptime = time(NULL);
291+ tmptime = _time(NULL);
292 if( tmptime == -1 ) {
293 free( new_xtimer );
294 return -1;
295@@ -107,7 +116,7 @@ int xtimer_poll(void)
296
297 for( i = 0; i < pset_count( xtimer_list ); i++ ) {
298 xtime_h *cur_timer = pset_pointer( xtimer_list, i );
299- time_t cur_time = time(NULL);
300+ time_t cur_time = _time(NULL);
301
302 /* The list is sorted, low to high. If there's no
303 * timers left, return.
304@@ -163,7 +172,7 @@ time_t xtimer_nexttime(void)
305 if( pset_count(xtimer_list) == 0 )
306 return -1;
307
308- ret = ((xtime_h *)pset_pointer(xtimer_list, 0))->when - time(NULL) ;
309+ ret = ((xtime_h *)pset_pointer(xtimer_list, 0))->when - _time(NULL) ;
310 if( ret < 0 )
311 ret = 0;
312 return( ret );
313diff --git a/src/xtimer.h b/src/xtimer.h
314index b0f8451..3ba0d0a 100644
315--- a/src/xtimer.h
316+++ b/src/xtimer.h
317@@ -22,4 +22,5 @@ int xtimer_poll(void);
318 int xtimer_remove(int);
319 time_t xtimer_nexttime(void);
320
321+time_t _time(time_t *t);
322 #endif /* _X_TIMER_H */
323--
3242.34.1
325
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..2f727128a5 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55c5fdf02cfcca3fc9621b6f2ceae10f"
8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
9 9
10SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \ 10SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \
11 file://0001-Use-monotonic-time.patch \
11 file://xinetd.init \ 12 file://xinetd.init \
12 file://xinetd.default \ 13 file://xinetd.default \
13 file://xinetd.service \ 14 file://xinetd.service \
@@ -15,8 +16,6 @@ SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \
15 16
16SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4" 17SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4"
17 18
18S = "${WORKDIR}/git"
19
20# https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision 19# https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision
21CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision" 20CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision"
22 21
@@ -30,19 +29,19 @@ INITSCRIPT_PARAMS = "defaults"
30PACKAGECONFIG ??= "tcp-wrappers" 29PACKAGECONFIG ??= "tcp-wrappers"
31PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers" 30PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers"
32 31
33CFLAGS += "-D_GNU_SOURCE" 32CFLAGS += "-D_GNU_SOURCE -std=gnu17"
34 33
35CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" 34CONFFILES:${PN} = "${sysconfdir}/xinetd.conf"
36 35
37do_install:append() { 36do_install:append() {
38 install -d "${D}${sysconfdir}/init.d" 37 install -d "${D}${sysconfdir}/init.d"
39 install -d "${D}${sysconfdir}/default" 38 install -d "${D}${sysconfdir}/default"
40 install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" 39 install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd"
41 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" 40 install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd"
42 41
43 # Install systemd unit files 42 # Install systemd unit files
44 install -d ${D}${systemd_system_unitdir} 43 install -d ${D}${systemd_system_unitdir}
45 install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} 44 install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir}
46 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 45 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
47 -e 's,@SBINDIR@,${sbindir},g' \ 46 -e 's,@SBINDIR@,${sbindir},g' \
48 ${D}${systemd_system_unitdir}/xinetd.service 47 ${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.8.1.bb
index da3b75a10b..406ecbbec4 100644
--- a/meta/recipes-extended/xz/xz_5.4.6.bb
+++ b/meta/recipes-extended/xz/xz_5.8.1.bb
@@ -3,31 +3,32 @@ HOMEPAGE = "https://tukaani.org/xz/"
3DESCRIPTION = "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." 3DESCRIPTION = "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."
4SECTION = "base" 4SECTION = "base"
5 5
6# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the 6# The source includes bits of 0BSD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the
7# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our 7# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our
8# packages, and the LGPL bits are under lib/, which appears to be used for 8# packages, and the LGPL bits are under lib/, which appears to be used for
9# libgnu, which appears to be used for DOS builds. So we're left with 9# libgnu, which appears to be used for DOS builds. So we're left with
10# GPL-2.0-or-later and PD. 10# GPL-2.0-or-later and 0BSD.
11LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" 11LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & 0BSD"
12LICENSE:${PN} = "GPL-2.0-or-later" 12LICENSE:${PN} = "0BSD & GPL-2.0-or-later"
13LICENSE:${PN}-dev = "GPL-2.0-or-later" 13LICENSE:${PN}-dev = "0BSD & GPL-2.0-or-later"
14LICENSE:${PN}-staticdev = "GPL-2.0-or-later" 14LICENSE:${PN}-staticdev = "GPL-2.0-or-later"
15LICENSE:${PN}-doc = "GPL-2.0-or-later" 15LICENSE:${PN}-doc = "0BSD & GPL-2.0-or-later"
16LICENSE:${PN}-dbg = "GPL-2.0-or-later" 16LICENSE:${PN}-dbg = "GPL-2.0-or-later"
17LICENSE:${PN}-locale = "GPL-2.0-or-later" 17LICENSE:${PN}-locale = "GPL-2.0-or-later"
18LICENSE:liblzma = "PD" 18LICENSE:liblzma = "0BSD"
19 19
20LIC_FILES_CHKSUM = "file://COPYING;md5=d4378ea9d5d1fc9ab0ae10d7948827d9 \ 20LIC_FILES_CHKSUM = "file://COPYING;md5=d38d562f6112174de93a9677682231b2 \
21 file://COPYING.0BSD;md5=0672c210ce80c83444339b9aa31fee2f \
21 file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 22 file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
22 file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ 23 file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \
23 file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ 24 file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
24 file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ 25 file://lib/getopt.c;endline=23;md5=3f33e207287bf72834f3ae8c247dfb6a \
25 " 26 "
26 27
27SRC_URI = "https://github.com/tukaani-project/xz/releases/download/v${PV}/xz-${PV}.tar.gz \ 28SRC_URI = "https://github.com/tukaani-project/xz/releases/download/v${PV}/xz-${PV}.tar.gz \
28 file://run-ptest \ 29 file://run-ptest \
29 " 30 "
30SRC_URI[sha256sum] = "aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c" 31SRC_URI[sha256sum] = "507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543"
31UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" 32UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
32UPSTREAM_CHECK_URI = "https://github.com/tukaani-project/xz/releases/" 33UPSTREAM_CHECK_URI = "https://github.com/tukaani-project/xz/releases/"
33 34
@@ -35,6 +36,8 @@ CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh"
35 36
36inherit autotools gettext ptest 37inherit autotools gettext ptest
37 38
39PACKAGECONFIG[landlock] = "--enable-sandbox=landlock,--enable-sandbox=no"
40
38PACKAGES =+ "liblzma" 41PACKAGES =+ "liblzma"
39 42
40FILES:liblzma = "${libdir}/liblzma*${SOLIBS}" 43FILES: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 @@
1From 9db2f8cdbbc0dfb359d3b4e5dfe48c18652ce531 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 8 May 2024 19:02:46 -0700
4Subject: [PATCH] configure: Include dirent.h for closedir/opendir APIs
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9GCC-14 is strict about function prototypes and since the
10testcase tries to compile/link opendir/closedir functions
11without including signatures, it fails to build the test
12due to missing signatures which come from dirent.h
13
14Therefore include the needed system header and make it more
15robust.
16
17Fixes
18a.c:2:21: error: implicit declaration of function ‘closedir’ [-Wimplicit-function-declaration]
19 2 | int main() { return closedir(opendir(".")); }
20 | ^~~~~~~~
21a.c:2:30: error: implicit declaration of function ‘opendir’ [-Wimplicit-function-declaration]
22 2 | int main() { return closedir(opendir(".")); }
23 | ^~~~~~~
24
25Upstream-Status: Inactive-Upstream
26Signed-off-by: Khem Raj <raj.khem@gmail.com>
27---
28 unix/configure | 1 +
29 1 file changed, 1 insertion(+)
30
31diff --git a/unix/configure b/unix/configure
32index f917086..1dd98c6 100644
33--- a/unix/configure
34+++ b/unix/configure
35@@ -591,6 +591,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
36
37 echo Check for directory libraries
38 cat > conftest.c << _EOF_
39+#include <dirent.h>
40 int main() { return closedir(opendir(".")); }
41 _EOF_
42
43--
442.45.0
45
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-fileio.c-fix-a-buffer-overflow-detected-issue.patch b/meta/recipes-extended/zip/zip-3.0/0001-fileio.c-fix-a-buffer-overflow-detected-issue.patch
new file mode 100644
index 0000000000..d760dfcec5
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-fileio.c-fix-a-buffer-overflow-detected-issue.patch
@@ -0,0 +1,38 @@
1From 23b4ed82bff20c737fe2e95d5b035e92a9522ca2 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Thu, 15 May 2025 13:58:45 +0200
4Subject: [PATCH] fileio.c: fix a buffer overflow detected issue
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Fix a following issue:
10| *** buffer overflow detected ***: terminated
11|
12| zip error: Interrupted (aborting)
13
14Reference: https://bugzilla.redhat.com/show_bug.cgi?id=2165653
15
16Upstream-Status: Inactive-Upstream [the fix is from Redhat but not the official project]
17
18Signed-off-by: Ming Liu <liu.ming50@gmail.com>
19---
20 fileio.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/fileio.c b/fileio.c
24index 1847e62..5a2959d 100644
25--- a/fileio.c
26+++ b/fileio.c
27@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_string)
28 if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
29 ZIPERR(ZE_MEM, "local_to_wide_string");
30 }
31- wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1);
32+ wsize = mbstowcs(wc_string, local_string, wsize + 1);
33 wc_string[wsize] = (wchar_t) 0;
34
35 /* in case wchar_t is not zwchar */
36--
372.43.0
38
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 @@
1From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 17:19:38 -0700
4Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE
5
6DIR is already provided on Linux via
7/usr/include/dirent.h system header
8
9Upstream-Status: Inactive-Upstream
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 unix/unix.c | 2 --
13 1 file changed, 2 deletions(-)
14
15diff --git a/unix/unix.c b/unix/unix.c
16index ba87614..6e6f4d2 100644
17--- a/unix/unix.c
18+++ b/unix/unix.c
19@@ -61,13 +61,11 @@ local time_t label_utim = 0;
20 /* Local functions */
21 local char *readd OF((DIR *));
22
23-
24 #ifdef NO_DIR /* for AT&T 3B1 */
25 #include <sys/dir.h>
26 #ifndef dirent
27 # define dirent direct
28 #endif
29-typedef FILE DIR;
30 /*
31 ** Apparently originally by Rich Salz.
32 ** Cleaned up and modified by James W. Birdsall.
33--
342.37.1
35
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index 70df5ab872..d1092551f7 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -3,11 +3,10 @@ HOMEPAGE = "http://www.info-zip.org"
3DESCRIPTION = "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." 3DESCRIPTION = "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."
4SECTION = "console/utils" 4SECTION = "console/utils"
5 5
6LICENSE = "BSD-3-Clause" 6LICENSE = "Info-ZIP"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
8 8
9 9S = "${UNPACKDIR}/zip30"
10S = "${WORKDIR}/zip30"
11 10
12SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \
13 file://fix-security-format.patch \ 12 file://fix-security-format.patch \
@@ -17,12 +16,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.
17 file://0002-configure-support-PIC-code-build.patch \ 16 file://0002-configure-support-PIC-code-build.patch \
18 file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ 17 file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \
19 file://0001-configure-Specify-correct-function-signatures-and-de.patch \ 18 file://0001-configure-Specify-correct-function-signatures-and-de.patch \
20 file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \
21 file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ 19 file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \
20 file://0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch \
21 file://0001-fileio.c-fix-a-buffer-overflow-detected-issue.patch \
22 " 22 "
23UPSTREAM_VERSION_UNKNOWN = "1" 23UPSTREAM_VERSION_UNKNOWN = "1"
24 24
25SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37"
26SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" 25SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
27 26
28CVE_STATUS[CVE-2018-13410] = "disputed: Disputed and also Debian doesn't consider a vulnerability" 27CVE_STATUS[CVE-2018-13410] = "disputed: Disputed and also Debian doesn't consider a vulnerability"
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 @@
1From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 19 Jun 2023 17:10:09 +0200
4Subject: [PATCH] pzstd: use c++14 without conditions
5
6Doing this check with a direct c++ snippet is prone to portability problems:
7
8- \043 is not portable between shells: dash expands it to #,
9bash does not;
10
11- using # directly works with make 4.3 but does not with make 4.2.
12
13Let's just use the c++ version that covers both the code and the gtest.
14
15Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682]
16Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17
18---
19 contrib/pzstd/Makefile | 7 ++-----
20 1 file changed, 2 insertions(+), 5 deletions(-)
21
22diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
23index e62f8e87..58fb82a1 100644
24--- a/contrib/pzstd/Makefile
25+++ b/contrib/pzstd/Makefile
26@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations
27 PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
28 GTEST_INC = -isystem googletest/googletest/include
29
30-# If default C++ version is older than C++11, explicitly set C++11, which is the
31-# minimum required by the code.
32-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)
33-PZSTD_CXX_STD := -std=c++11
34-endif
35+# Set the minimum required by gtest
36+PZSTD_CXX_STD := -std=c++14
37
38 PZSTD_CPPFLAGS = $(PZSTD_INC)
39 PZSTD_CCXXFLAGS =
diff --git a/meta/recipes-extended/zstd/zstd_1.5.5.bb b/meta/recipes-extended/zstd/zstd_1.5.7.bb
index 2d72af50a4..0e872b95aa 100644
--- a/meta/recipes-extended/zstd/zstd_1.5.5.bb
+++ b/meta/recipes-extended/zstd/zstd_1.5.7.bb
@@ -10,16 +10,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
10 file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ 10 file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \
11 " 11 "
12 12
13SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ 13SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
14 file://0001-pzstd-use-directly-for-the-test-c-snippet.patch"
15 14
16SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" 15SRCREV = "f8745da6ff1ad1e7bab384bd1f9d742439278e99"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
18 17
19CVE_PRODUCT = "zstandard" 18CVE_PRODUCT = "zstandard"
20 19
21S = "${WORKDIR}/git"
22
23PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
24PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" 21PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4"
25PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" 22PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz"