summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ptxdist11
-rw-r--r--config/busybox/Config.in38
-rw-r--r--config/busybox/archival/Config.in16
-rw-r--r--config/busybox/console-tools/Config.in13
-rw-r--r--config/busybox/coreutils/Config.in124
-rw-r--r--config/busybox/e2fsprogs/Config.in1
-rw-r--r--config/busybox/editors/Config.in16
-rw-r--r--config/busybox/findutils/Config.in51
-rw-r--r--config/busybox/klibc-utils/Config.in3
-rw-r--r--config/busybox/libbb/Config.in176
-rw-r--r--config/busybox/mailutils/Config.in14
-rw-r--r--config/busybox/miscutils/Config.in57
-rw-r--r--config/busybox/modutils/Config.in6
-rw-r--r--config/busybox/networking/Config.in114
-rw-r--r--config/busybox/networking/udhcp/Config.in10
-rw-r--r--config/busybox/procps/Config.in26
-rw-r--r--config/busybox/shell/Config.in134
-rw-r--r--config/busybox/sysklogd/Config.in10
-rw-r--r--config/busybox/util-linux/Config.in62
-rw-r--r--config/busybox/util-linux/volume_id/Config.in6
-rw-r--r--config/hostapd/defconfig47
-rw-r--r--config/wpasupplicant/defconfig22
-rw-r--r--doc/ref_make_macros.rst27
-rw-r--r--doc/ref_parameter.rst26
-rw-r--r--patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch (renamed from patches/Python-3.7.10/0001-python3-don-t-leak-host-path-into-target-binaries.patch)2
-rw-r--r--patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch (renamed from patches/Python-3.7.10/0002-python3-prevent-host-path-leakage.patch)13
-rw-r--r--patches/Python-3.10.4/series (renamed from patches/Python-3.7.10/series)0
-rw-r--r--patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch (renamed from patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch)22
-rwxr-xr-xpatches/SDL2_ttf-2.0.18/autogen.sh (renamed from patches/SDL2_ttf-2.0.15/autogen.sh)0
-rw-r--r--patches/SDL2_ttf-2.0.18/series (renamed from patches/SDL2_ttf-2.0.15/series)0
-rw-r--r--patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch37
-rw-r--r--patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch (renamed from patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch)0
l---------patches/alsa-lib-1.2.6.1/autogen.sh (renamed from patches/alsa-lib-1.2.5.1/autogen.sh)0
-rw-r--r--patches/alsa-lib-1.2.6.1/series (renamed from patches/alsa-lib-1.2.5.1/series)1
-rw-r--r--patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch262
-rw-r--r--patches/bash-5.1.8/series1
-rw-r--r--patches/boost_1_67_0/0001-Fix-compatibility-with-Python-3.10.0a4-fopen.patch24
-rw-r--r--patches/boost_1_67_0/series4
-rw-r--r--patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch89
-rw-r--r--patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch30
-rw-r--r--patches/busybox-1.31.1/series11
-rw-r--r--patches/busybox-1.35.0/0200-reactivate-check-for-tty.patch (renamed from patches/busybox-1.31.1/0200-reactivate-check-for-tty.patch)4
-rw-r--r--patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (renamed from patches/busybox-1.31.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch)4
-rw-r--r--patches/busybox-1.35.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (renamed from patches/busybox-1.31.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch)8
-rw-r--r--patches/busybox-1.35.0/series9
-rw-r--r--patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch (renamed from patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch)0
-rw-r--r--patches/chrony-4.2/series (renamed from patches/chrony-4.1/series)0
-rw-r--r--patches/crda-4.14/0001-fix-linking-libreg.patch (renamed from patches/crda-3.18/0001-fix-linking-libreg.patch)0
-rw-r--r--patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch (renamed from patches/crda-3.18/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch)0
-rw-r--r--patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch (renamed from patches/crda-3.18/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch)0
-rw-r--r--patches/crda-4.14/0004-udev-Fix-rule-for-initial-setup.patch (renamed from patches/crda-3.18/0004-udev-Fix-rule-for-initial-setup.patch)0
-rw-r--r--patches/crda-4.14/series (renamed from patches/crda-3.18/series)0
-rw-r--r--patches/dropwatch-1.5.3/0001-Fix-build-issue-when-compiling-with-Wcast-align.patch47
-rw-r--r--patches/dropwatch-1.5.3/0002-Fix-configure-for-libnl3-genl.patch43
-rw-r--r--patches/dropwatch-1.5.3/series5
l---------patches/dropwatch-1.5.4/autogen.sh (renamed from patches/dropwatch-1.5.3/autogen.sh)0
-rw-r--r--patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch30
-rw-r--r--patches/dtc-v1.6.0/series4
-rw-r--r--patches/dump1090fa-6.1/fix_cpufeatures_arch.patch61
-rw-r--r--patches/dump1090fa-6.1/series2
-rw-r--r--patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch55
-rw-r--r--patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch167
-rw-r--r--patches/efivar-37/series5
-rw-r--r--patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch34
-rw-r--r--patches/efivar-38/0002-docs-Remove-docs-building.patch25
-rw-r--r--patches/efivar-38/0003-fix-building-with-binutils-2.36.patch26
-rw-r--r--patches/efivar-38/series6
-rw-r--r--patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (renamed from patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch)30
-rwxr-xr-xpatches/freetype-2.12.1/autogen.sh (renamed from patches/freetype-2.10.4/autogen.sh)0
-rw-r--r--patches/freetype-2.12.1/series (renamed from patches/freetype-2.10.4/series)0
-rw-r--r--patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch27
-rw-r--r--patches/glib-networking-2.68.1/series4
-rw-r--r--patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch23
-rw-r--r--patches/glib-networking-2.72.0/series4
-rw-r--r--patches/gnutls-3.6.16/0001-don-t-try-ru-build-run-code-generator.patch31
-rw-r--r--patches/gnutls-3.6.16/series4
-rw-r--r--patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch36
-rw-r--r--patches/igt-gpu-tools-1.26/series1
-rw-r--r--patches/libgudev-237/0001-Prepare-to-check-for-an-older-UDEV.patch (renamed from patches/libgudev-236/0001-Prepare-to-check-for-an-older-UDEV.patch)0
-rw-r--r--patches/libgudev-237/series (renamed from patches/libgudev-236/series)0
-rw-r--r--patches/libseccomp-2.5.4/0001-run-time-use-a-broadly-supported-shell-interpreter.patch (renamed from patches/libseccomp-2.5.3/0001-run-time-use-a-broadly-supported-shell-interpreter.patch)0
-rw-r--r--patches/libseccomp-2.5.4/series (renamed from patches/libseccomp-2.5.3/series)0
-rw-r--r--patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch22
-rwxr-xr-xpatches/libsndfile-1.0.25/autogen.sh19
-rw-r--r--patches/libsndfile-1.0.25/series4
-rw-r--r--patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch68
-rw-r--r--patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch124
-rw-r--r--patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch33
-rw-r--r--patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch33
-rw-r--r--patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch32
-rw-r--r--patches/libtool-2.4.6/series8
-rw-r--r--patches/libtremor-2018-03-19-g7c30a6634619/0001-HACK-configure.in-remove-extended-OGG-check.patch (renamed from patches/libtremor-1.0.3/0001-HACK-configure.in-remove-extended-OGG-check.patch)2
-rw-r--r--patches/libtremor-2018-03-19-g7c30a6634619/0002-Only-enable-ARM-assember-on-armel.patch30
l---------patches/libtremor-2018-03-19-g7c30a6634619/autogen.sh (renamed from patches/gnutls-3.6.16/autogen.sh)0
-rw-r--r--patches/libtremor-2018-03-19-g7c30a6634619/series (renamed from patches/libtremor-1.0.3/series)3
-rwxr-xr-xpatches/libuv-v1.42.0/autogen.sh (renamed from patches/libuv-v1.34.0/autogen.sh)0
-rw-r--r--patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch (renamed from patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch)2
-rw-r--r--patches/libxml2-2.9.14/series (renamed from patches/libxml2-2.9.12/series)0
-rw-r--r--patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch23
l---------patches/libxslt-1.1.34/autogen.sh1
-rw-r--r--patches/libxslt-1.1.34/series7
-rw-r--r--patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch (renamed from patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch)0
-rw-r--r--patches/libxslt-1.1.35/series5
-rw-r--r--patches/lxml-4.4.2/series1
-rw-r--r--patches/lxml-4.8.0/0001-do-not-use-libdirs-from-xslt-config.patch (renamed from patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch)8
-rw-r--r--patches/lxml-4.8.0/series4
-rw-r--r--patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch26
-rw-r--r--patches/meson-0.56.0/series7
-rw-r--r--patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (renamed from patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch)14
-rw-r--r--patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch (renamed from patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch)4
-rw-r--r--patches/meson-0.60.3/series5
-rw-r--r--patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch (renamed from patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch)0
-rw-r--r--patches/ncurses-6.3/series (renamed from patches/ncurses-6.2/series)0
-rw-r--r--patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch32
l---------patches/nftables-0.8.3/autogen.sh1
-rw-r--r--patches/nftables-0.8.3/series4
-rw-r--r--patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch42
-rw-r--r--patches/node-v12.16.1/series3
-rw-r--r--patches/nss-3.75/0001-nss-fix-nsinstall-build.patch (renamed from patches/nss-3.73/0001-nss-fix-nsinstall-build.patch)0
-rw-r--r--patches/nss-3.75/0002-add-nss.pc.in.patch (renamed from patches/nss-3.73/0002-add-nss.pc.in.patch)0
-rw-r--r--patches/nss-3.75/0003-HACK-don-t-build-commands-that-need-zlib.patch (renamed from patches/nss-3.73/0003-HACK-don-t-build-commands-that-need-zlib.patch)0
-rw-r--r--patches/nss-3.75/0004-HACK-fix-parallel-building-issue.patch (renamed from patches/nss-3.73/0004-HACK-fix-parallel-building-issue.patch)0
-rw-r--r--patches/nss-3.75/0005-fix-dependency-generation.patch (renamed from patches/nss-3.73/0005-fix-dependency-generation.patch)0
-rw-r--r--patches/nss-3.75/series (renamed from patches/nss-3.73/series)0
-rw-r--r--patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch26
-rw-r--r--patches/ntp-4.2.8p12/series4
-rw-r--r--patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch29
-rw-r--r--patches/ntp-4.2.8p15/series4
-rw-r--r--patches/numpy-1.17.4/0001-remove-sse2-flag.patch27
-rw-r--r--patches/numpy-1.17.4/series1
-rw-r--r--patches/openssl-1.1.1o/0001-debian-targets.patch (renamed from patches/openssl-1.1.1l/0001-debian-targets.patch)13
-rw-r--r--patches/openssl-1.1.1o/0002-pic.patch (renamed from patches/openssl-1.1.1l/0002-pic.patch)2
-rw-r--r--patches/openssl-1.1.1o/0003-Set-systemwide-default-settings-for-libssl-users.patch (renamed from patches/openssl-1.1.1l/0003-Set-systemwide-default-settings-for-libssl-users.patch)2
-rw-r--r--patches/openssl-1.1.1o/series (renamed from patches/openssl-1.1.1l/series)0
-rw-r--r--patches/pciutils-3.8.0/0001-work-around-build-issue-with-gcc-9.x.patch47
-rw-r--r--patches/pciutils-3.8.0/series4
-rw-r--r--patches/polkit-0.105/0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch2
-rw-r--r--patches/polkit-0.105/0002-0.107-Try-harder-to-look-up-the-right-localization.patch57
-rw-r--r--patches/polkit-0.105/0003-0.108-build-Fix-.gir-generation-for-parallel-make.patch (renamed from patches/polkit-0.105/0002-0.108-build-Fix-.gir-generation-for-parallel-make.patch)2
-rw-r--r--patches/polkit-0.105/0004-0.108-PolkitAgent-Avoid-crashing-if-initializing-the.patch38
-rw-r--r--patches/polkit-0.105/0005-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch (renamed from patches/polkit-0.105/0003-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch)2
-rw-r--r--patches/polkit-0.105/0006-0.110-Fix-build-on-GNU-Hurd.patch (renamed from patches/polkit-0.105/0004-0.110-Fix-build-on-GNU-Hurd.patch)2
-rw-r--r--patches/polkit-0.105/0007-0.111-pkexec-Set-process-environment-from-pam_getenv.patch (renamed from patches/polkit-0.105/0005-0.111-pkexec-Set-process-environment-from-pam_getenv.patch)2
-rw-r--r--patches/polkit-0.105/0008-0.111-Fix-a-memory-leak.patch (renamed from patches/polkit-0.105/0006-0.111-Fix-a-memory-leak.patch)2
-rw-r--r--patches/polkit-0.105/0009-0.112-Use-GOnce-for-interface-type-registration.patch (renamed from patches/polkit-0.105/0007-0.112-Use-GOnce-for-interface-type-registration.patch)2
-rw-r--r--patches/polkit-0.105/0010-0.112-polkitunixprocess-Deprecate-racy-APIs.patch (renamed from patches/polkit-0.105/0008-0.112-polkitunixprocess-Deprecate-racy-APIs.patch)2
-rw-r--r--patches/polkit-0.105/0011-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch (renamed from patches/polkit-0.105/0009-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch)2
-rw-r--r--patches/polkit-0.105/0012-0.114-polkitpermission-Fix-a-memory-leak-on-authorit.patch29
-rw-r--r--patches/polkit-0.105/0013-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch (renamed from patches/polkit-0.105/0010-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch)4
-rw-r--r--patches/polkit-0.105/0014-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch (renamed from patches/polkit-0.105/0011-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch)2
-rw-r--r--patches/polkit-0.105/0015-0.113-PolkitAgentSession-fix-race-between-child-and-.patch (renamed from patches/polkit-0.105/0012-0.113-PolkitAgentSession-fix-race-between-child-and-.patch)2
-rw-r--r--patches/polkit-0.105/0016-0.113-polkitd-Fix-problem-with-removing-non-existent.patch (renamed from patches/polkit-0.105/0013-0.113-polkitd-Fix-problem-with-removing-non-existent.patch)2
-rw-r--r--patches/polkit-0.105/0017-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch (renamed from patches/polkit-0.105/0014-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch)2
-rw-r--r--patches/polkit-0.105/0018-0.113-Fixed-compilation-problem-in-the-backend.patch (renamed from patches/polkit-0.105/0015-0.113-Fixed-compilation-problem-in-the-backend.patch)2
-rw-r--r--patches/polkit-0.105/0019-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch (renamed from patches/polkit-0.105/0016-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch)2
-rw-r--r--patches/polkit-0.105/0020-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch (renamed from patches/polkit-0.105/0017-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch)2
-rw-r--r--patches/polkit-0.105/0021-0.113-PolkitSystemBusName-Retrieve-both-pid-and-uid.patch239
-rw-r--r--patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch (renamed from patches/polkit-0.105/0018-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch)2
-rw-r--r--patches/polkit-0.105/0023-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch (renamed from patches/polkit-0.105/0019-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch)2
-rw-r--r--patches/polkit-0.105/0024-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch (renamed from patches/polkit-0.105/0020-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch)2
-rw-r--r--patches/polkit-0.105/0025-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch (renamed from patches/polkit-0.105/0021-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch)2
-rw-r--r--patches/polkit-0.105/0026-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch (renamed from patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch)2
-rw-r--r--patches/polkit-0.105/0027-0.113-Fix-a-possible-NULL-dereference.patch (renamed from patches/polkit-0.105/0023-0.113-Fix-a-possible-NULL-dereference.patch)2
-rw-r--r--patches/polkit-0.105/0028-0.113-Remove-a-redundant-assignment.patch (renamed from patches/polkit-0.105/0024-0.113-Remove-a-redundant-assignment.patch)2
-rw-r--r--patches/polkit-0.105/0029-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch (renamed from patches/polkit-0.105/0025-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch)2
-rw-r--r--patches/polkit-0.105/0030-0.113-Fix-a-crash-when-two-authentication-requests-a.patch (renamed from patches/polkit-0.105/0026-0.113-Fix-a-crash-when-two-authentication-requests-a.patch)2
-rw-r--r--patches/polkit-0.105/0031-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch (renamed from patches/polkit-0.105/0027-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch)2
-rw-r--r--patches/polkit-0.105/0032-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch (renamed from patches/polkit-0.105/0028-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch)2
-rw-r--r--patches/polkit-0.105/0033-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch (renamed from patches/polkit-0.105/0029-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch)4
-rw-r--r--patches/polkit-0.105/0034-0.113-Fix-a-per-authorization-memory-leak.patch (renamed from patches/polkit-0.105/0030-0.113-Fix-a-per-authorization-memory-leak.patch)2
-rw-r--r--patches/polkit-0.105/0035-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch (renamed from patches/polkit-0.105/0031-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch)2
-rw-r--r--patches/polkit-0.105/0036-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch (renamed from patches/polkit-0.105/0032-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch)4
-rw-r--r--patches/polkit-0.105/0037-0.113-Fix-use-after-free-in-polkitagentsession.c.patch (renamed from patches/polkit-0.105/0033-0.113-Fix-use-after-free-in-polkitagentsession.c.patch)2
-rw-r--r--patches/polkit-0.105/0038-0.114-Fix-multi-line-pam-text-info.patch (renamed from patches/polkit-0.105/0034-0.114-Fix-multi-line-pam-text-info.patch)2
-rw-r--r--patches/polkit-0.105/0039-0.114-Refactor-send_to_helper-usage.patch (renamed from patches/polkit-0.105/0035-0.114-Refactor-send_to_helper-usage.patch)2
-rw-r--r--patches/polkit-0.105/0040-0.114-Support-polkit-session-agent-running-outside-u.patch (renamed from patches/polkit-0.105/0036-0.114-Support-polkit-session-agent-running-outside-u.patch)2
-rw-r--r--patches/polkit-0.105/0041-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch (renamed from patches/polkit-0.105/0037-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch)2
-rw-r--r--patches/polkit-0.105/0042-0.116-Possible-resource-leak-found-by-static-analyze.patch25
-rw-r--r--patches/polkit-0.105/0043-0.116-Fix-a-critical-warning-on-calling-polkit_permi.patch36
-rw-r--r--patches/polkit-0.105/0044-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch (renamed from patches/polkit-0.105/0038-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch)2
-rw-r--r--patches/polkit-0.105/0045-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch (renamed from patches/polkit-0.105/0043-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch)8
-rw-r--r--patches/polkit-0.105/0046-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch (renamed from patches/polkit-0.105/0039-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch)6
-rw-r--r--patches/polkit-0.105/0047-0.116-pkttyagent-PolkitAgentTextListener-leaves-echo.patch105
-rw-r--r--patches/polkit-0.105/0048-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch (renamed from patches/polkit-0.105/0040-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch)2
-rw-r--r--patches/polkit-0.105/0049-Build-against-libsystemd.patch (renamed from patches/polkit-0.105/0041-Build-against-libsystemd.patch)2
-rw-r--r--patches/polkit-0.105/0050-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch (renamed from patches/polkit-0.105/0042-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch)2
-rw-r--r--patches/polkit-0.105/0051-CVE-2021-3560.patch25
-rw-r--r--patches/polkit-0.105/0052-Local-Privilege-Escalation-in-polkit-s-pkexec-CVE-20.patch75
-rw-r--r--patches/polkit-0.105/series95
-rw-r--r--patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch40
-rw-r--r--patches/pps-tools-1.0.2/series4
-rw-r--r--patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch29
-rw-r--r--patches/pps-tools-1.0.3/series4
-rw-r--r--patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch21
-rw-r--r--patches/pulseaudio-15.0/series4
-rw-r--r--patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (renamed from patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch)0
-rw-r--r--patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch (renamed from patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch)4
-rw-r--r--patches/qemu-6.2.0/series (renamed from patches/qemu-6.1.0/series)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch (renamed from patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch (renamed from patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0003-qt3d-link-with-latomic-if-necessary.patch (renamed from patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0004-eglfs_kms-device-ordering-robustness.patch (renamed from patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch (renamed from patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch (renamed from patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch (renamed from patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0008-qtbase-include-limits-where-necessary.patch42
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch (renamed from patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch)0
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/0010-qtwebengine-include-limits-where-necessary.patch (renamed from patches/qt-everywhere-src-5.15.2/0010-qtwebengine-include-limits-where-necessary.patch)15
-rw-r--r--patches/qt-everywhere-opensource-src-5.15.3/series (renamed from patches/qt-everywhere-src-5.15.2/series)0
-rw-r--r--patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch83
-rw-r--r--patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch37
-rw-r--r--patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch37
-rw-r--r--patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch24
-rw-r--r--patches/screen-4.8.0/0104-CVE-2021-26937.patch69
-rwxr-xr-xpatches/screen-4.8.0/autogen.sh9
-rw-r--r--patches/screen-4.8.0/series12
-rw-r--r--patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch (renamed from patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch)0
-rw-r--r--patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch (renamed from patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch)0
-rw-r--r--patches/screen-4.9.0/0003-suppress_remap.patch (renamed from patches/screen-4.8.0/0100-suppress_remap.patch)2
l---------patches/screen-4.9.0/autogen.sh (renamed from patches/libtremor-1.0.3/autogen.sh)0
-rw-r--r--patches/screen-4.9.0/series6
-rw-r--r--patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch45
-rw-r--r--patches/waffle-1.7.0/series4
-rw-r--r--patches/xkeyboard-config-2.33/0001-rules-merge.py-make-it-compatible-with-Python-3.5.patch43
-rw-r--r--patches/xkeyboard-config-2.33/series4
-rw-r--r--patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch23
-rw-r--r--patches/zlib-1.2.12/series4
-rw-r--r--platforms/Kconfig4
-rw-r--r--platforms/barebox.firmware.in7
-rw-r--r--platforms/barebox.in15
-rw-r--r--platforms/image-root-cpio-gz.in10
-rw-r--r--platforms/image-root-cpio.in88
-rw-r--r--platforms/kernel.in1
-rw-r--r--platforms/non_free_firmware.in7
-rw-r--r--platforms/optee.in5
-rw-r--r--platforms/u-boot.in25
-rw-r--r--projectroot/etc/group2
-rw-r--r--projectroot/usr/lib/systemd/system/seatd.service2
-rw-r--r--rules/alsa-lib.make4
-rw-r--r--rules/alsa-utils.make4
-rw-r--r--rules/aml.in8
-rw-r--r--rules/aml.make57
-rw-r--r--rules/atkmm.in7
-rw-r--r--rules/aumix.in7
-rw-r--r--rules/barebox.make26
-rw-r--r--rules/barebox_mlo.make9
-rw-r--r--rules/bash.make4
-rw-r--r--rules/bonniexx.in7
-rw-r--r--rules/boost.make4
-rw-r--r--rules/busybox.in1
-rw-r--r--rules/busybox.make4
-rw-r--r--rules/cbmbasic.in6
-rw-r--r--rules/chrony.make4
-rw-r--r--rules/classpath.in8
-rw-r--r--rules/cog.make15
-rw-r--r--rules/crda.in18
-rw-r--r--rules/crda.make15
-rw-r--r--rules/cross-nasm.make4
-rw-r--r--rules/cups-filters.in1
-rw-r--r--rules/dbus.make10
-rw-r--r--rules/dropwatch.make4
-rw-r--r--rules/dump1090fa.make4
-rw-r--r--rules/e2fsprogs.make4
-rw-r--r--rules/efibootmgr.make4
-rw-r--r--rules/efivar.make10
-rw-r--r--rules/ethtool.make4
-rw-r--r--rules/expat.make4
-rw-r--r--rules/freeglut.in7
-rw-r--r--rules/freetype.make15
-rw-r--r--rules/gdb-menu.in4
-rw-r--r--rules/gdb.make18
-rw-r--r--rules/glib-networking.make4
-rw-r--r--rules/glib.make4
-rw-r--r--rules/glibmm.in7
-rw-r--r--rules/glslang.make10
-rw-r--r--rules/gnupg.make4
-rw-r--r--rules/gnutls.in11
-rw-r--r--rules/gnutls.make26
-rw-r--r--rules/gpgme.make8
-rw-r--r--rules/graphene.make8
-rw-r--r--rules/graphics_and_multimedia.in8
-rw-r--r--rules/gst-devtools1.make7
-rw-r--r--rules/gst-libav1.make7
-rw-r--r--rules/gst-plugins-bad1.in34
-rw-r--r--rules/gst-plugins-bad1.make24
-rw-r--r--rules/gst-plugins-base1.make10
-rw-r--r--rules/gst-plugins-good1.in6
-rw-r--r--rules/gst-plugins-good1.make9
-rw-r--r--rules/gst-plugins-ugly1.make12
-rw-r--r--rules/gst-python1.make8
-rw-r--r--rules/gst-rtsp-server1.in1
-rw-r--r--rules/gst-rtsp-server1.make13
-rw-r--r--rules/gstreamer-vaapi1.make4
-rw-r--r--rules/gstreamer1.make9
-rw-r--r--rules/hiredis.in8
-rw-r--r--rules/hiredis.make61
-rw-r--r--rules/host-autotools-autoconf-archive.make6
-rw-r--r--rules/host-autotools-automake.make4
-rw-r--r--rules/host-autotools-libtool.make4
-rw-r--r--rules/host-cython3.make4
-rw-r--r--rules/host-dtc.make1
-rw-r--r--rules/host-freetype.make2
-rw-r--r--rules/host-libcurl.make1
-rw-r--r--rules/host-makedepend.make4
-rw-r--r--rules/host-mesalib.make5
-rw-r--r--rules/host-meson.make4
-rw-r--r--rules/host-mtools.make4
-rw-r--r--rules/host-python3-babel.in8
-rw-r--r--rules/host-python3-babel.make73
-rw-r--r--rules/host-python3-pip.in6
-rw-r--r--rules/host-python3-pip.make23
-rw-r--r--rules/host-python3-tz.in6
-rw-r--r--rules/host-python3-tz.make33
-rw-r--r--rules/host-qemu.make147
-rw-r--r--rules/host-shaderc.make41
-rw-r--r--rules/host-system-python3.in6
-rw-r--r--rules/host-system-python3.make12
-rw-r--r--rules/host-tz-database.make6
-rw-r--r--rules/host-xorg-app-xkbcomp.make13
-rw-r--r--rules/host-yasm.make11
-rw-r--r--rules/hostapd.make8
-rw-r--r--rules/hping.in6
-rw-r--r--rules/hwdata.make4
-rw-r--r--rules/image-root-cpio-gz.make38
-rw-r--r--rules/image-root-cpio.make4
-rw-r--r--rules/intel-gmmlib.make4
-rw-r--r--rules/intel-media-driver.make4
-rw-r--r--rules/iproute2.in20
-rw-r--r--rules/iproute2.make12
-rw-r--r--rules/json-c.make6
-rw-r--r--rules/json-glib.in1
-rw-r--r--rules/json-glib.make28
-rw-r--r--rules/kernel.make4
-rw-r--r--rules/kexec-tools.make4
-rw-r--r--rules/libarchive.make4
-rw-r--r--rules/libcap-ng.make4
-rw-r--r--rules/libcap.make4
-rw-r--r--rules/libcurl.make10
-rw-r--r--rules/libdrm.make4
-rw-r--r--rules/libevdev.in1
-rw-r--r--rules/libevdev.make4
-rw-r--r--rules/libfsl-vpu.in8
-rw-r--r--rules/libgudev.make6
-rw-r--r--rules/libid3tag.make2
-rw-r--r--rules/libiio.make20
-rw-r--r--rules/libinput.make8
-rw-r--r--rules/libjpeg.in7
-rw-r--r--rules/libjpeg.make11
-rw-r--r--rules/libksba.make4
-rw-r--r--rules/libmad.make2
-rw-r--r--rules/libmbim.make4
-rw-r--r--rules/libmicrohttpd.make6
-rw-r--r--rules/libmnl.make4
-rw-r--r--rules/libnetpbm.in8
-rw-r--r--rules/libnice.in4
-rw-r--r--rules/libnice.make29
-rw-r--r--rules/libnl3.make4
-rw-r--r--rules/libpthread-stubs.make7
-rw-r--r--rules/libqmi.make4
-rw-r--r--rules/libseccomp.make4
-rw-r--r--rules/libsndfile.in1
-rw-r--r--rules/libsndfile.make24
-rw-r--r--rules/libtasn1.make4
-rw-r--r--rules/libtremor.make6
-rw-r--r--rules/libusb.make4
-rw-r--r--rules/libuv.make4
-rw-r--r--rules/libva.in10
-rw-r--r--rules/libva.make7
-rw-r--r--rules/libwpe.make4
-rw-r--r--rules/libxkbcommon.make5
-rw-r--r--rules/libxml2.make12
-rw-r--r--rules/libxslt.make15
-rw-r--r--rules/lighttpd.in28
-rw-r--r--rules/lighttpd.make17
-rw-r--r--rules/linux-firmware.in32
-rw-r--r--rules/linux-firmware.make144
-rw-r--r--rules/lldpd.make4
-rw-r--r--rules/lsh.in8
-rw-r--r--rules/luaexpat.make4
-rw-r--r--rules/madplay.make2
-rw-r--r--rules/media-session.in2
-rw-r--r--rules/media-session.make8
-rw-r--r--rules/memtest86p.make2
-rw-r--r--rules/mesalib.in30
-rw-r--r--rules/mesalib.make53
-rw-r--r--rules/microcom.make2
-rw-r--r--rules/mosquitto.make8
-rw-r--r--rules/mtr.in8
-rw-r--r--rules/nanocom.in7
-rw-r--r--rules/ncftp.in7
-rw-r--r--rules/ncurses.make6
-rw-r--r--rules/neatvnc.in22
-rw-r--r--rules/neatvnc.make61
-rw-r--r--rules/nftables.make10
-rw-r--r--rules/npth.make4
-rw-r--r--rules/nss.make4
-rw-r--r--rules/ntp.make6
-rw-r--r--rules/opencv.make2
-rw-r--r--rules/opennhrp.in7
-rw-r--r--rules/openssh.make14
-rw-r--r--rules/openssl.make4
-rw-r--r--rules/optee-client.make7
-rw-r--r--rules/optee-test.in7
-rw-r--r--rules/optee-test.make4
-rw-r--r--rules/optee.make4
-rw-r--r--rules/pam.make4
-rw-r--r--rules/pangomm.in7
-rw-r--r--rules/pciutils.make5
-rw-r--r--rules/piglit.make4
-rw-r--r--rules/pipewire.in2
-rw-r--r--rules/pipewire.make22
-rw-r--r--rules/poppler.in8
-rw-r--r--rules/post/ptxd_make_report.make38
-rw-r--r--rules/post/ptxd_make_world_clean.make7
-rw-r--r--rules/post/ptxd_make_world_dtbo.make3
-rw-r--r--rules/post/ptxd_make_world_inject.make19
-rw-r--r--rules/post/ptxd_make_world_license.make24
-rw-r--r--rules/post/ptxd_make_world_prepare.make4
-rw-r--r--rules/post/ptxd_make_world_targetinstall.make12
-rw-r--r--rules/pps-tools.make4
-rw-r--r--rules/pre/Rules.make2
-rw-r--r--rules/pulseaudio.in11
-rw-r--r--rules/pulseaudio.make16
-rw-r--r--rules/python3-cffi.make4
-rw-r--r--rules/python3-gi.in1
-rw-r--r--rules/python3-gi.make21
-rw-r--r--rules/python3-ifaddr.in9
-rw-r--r--rules/python3-ifaddr.make53
-rw-r--r--rules/python3-lxml.make4
-rw-r--r--rules/python3-numpy.in1
-rw-r--r--rules/python3-numpy.make18
-rw-r--r--rules/python3-pip.make2
-rw-r--r--rules/python3-pluggy.in1
-rw-r--r--rules/python3-py.in1
-rw-r--r--rules/python3-uvloop.in10
-rw-r--r--rules/python3-uvloop.make57
-rw-r--r--rules/python3-zeroconf.in9
-rw-r--r--rules/python3-zeroconf.make53
-rw-r--r--rules/python3.make12
-rw-r--r--rules/qemu.in30
-rw-r--r--rules/qemu.make174
-rw-r--r--rules/qt5.in1
-rw-r--r--rules/qt5.make6
-rw-r--r--rules/quagga.in7
-rw-r--r--rules/rrdtool.make2
-rw-r--r--rules/screen.make4
-rw-r--r--rules/sdl2-ttf.make15
-rw-r--r--rules/sdl2.make5
-rw-r--r--rules/shaderc.make45
-rw-r--r--rules/spirv-headers.in8
-rw-r--r--rules/spirv-headers.make35
-rw-r--r--rules/spirv-tools.make39
-rw-r--r--rules/strace.make6
-rw-r--r--rules/sysklogd.make4
-rw-r--r--rules/syslinux.make3
-rw-r--r--rules/syslogng.make3
-rw-r--r--rules/systemd.in7
-rw-r--r--rules/systemd.make6
-rw-r--r--rules/templates/template-kernel-in1
-rw-r--r--rules/templates/template-kernel-make2
-rw-r--r--rules/templates/template-src-linux-driver-make8
-rw-r--r--rules/tf-a.make5
-rw-r--r--rules/tpm2-tools.in14
-rw-r--r--rules/tpm2-tools.make34
-rw-r--r--rules/tpm2-tss.in2
-rw-r--r--rules/tpm2-tss.make14
-rw-r--r--rules/trace-cmd.make7
-rw-r--r--rules/u-boot.make49
-rw-r--r--rules/util-linux-ng.make4
-rw-r--r--rules/vim.make2
-rw-r--r--rules/vulkan-loader.make9
-rw-r--r--rules/vulkan-tools.make4
-rw-r--r--rules/vulkan-validationlayers.in1
-rw-r--r--rules/vulkan-validationlayers.make7
-rw-r--r--rules/wayland-protocols.make4
-rw-r--r--rules/wayland.make7
-rw-r--r--rules/wayvnc.in24
-rw-r--r--rules/wayvnc.make60
-rw-r--r--rules/weston.in36
-rw-r--r--rules/weston.make37
-rw-r--r--rules/wireplumber.in29
-rw-r--r--rules/wireplumber.make107
-rw-r--r--rules/wlroots.make12
-rw-r--r--rules/wpa_supplicant.make4
-rw-r--r--rules/wpebackend-fdo.make4
-rw-r--r--rules/wpewebkit.make5
-rw-r--r--rules/x-load.make8
-rw-r--r--rules/xkeyboard-config.in3
-rw-r--r--rules/xkeyboard-config.make18
-rw-r--r--rules/xorg-driver-video-ati.in6
-rw-r--r--rules/xorgproto.in1
-rw-r--r--rules/xorgproto.make16
-rw-r--r--rules/xxhash.in7
-rw-r--r--rules/xxhash.make56
-rw-r--r--rules/zlib.make6
-rw-r--r--rules/zstd.make4
-rw-r--r--scripts/bsp-report-schema.yaml284
-rwxr-xr-xscripts/configure_helper.py2
-rwxr-xr-xscripts/git-ptx-patches3
-rw-r--r--scripts/kconfig/confdata.c5
-rw-r--r--scripts/lib/ptxd_lib_dgen.awk8
-rw-r--r--scripts/lib/ptxd_make_install_image.sh48
-rw-r--r--scripts/lib/ptxd_make_license_report.sh8
-rwxr-xr-xscripts/lib/ptxd_make_pkghash.awk4
-rw-r--r--scripts/lib/ptxd_make_report.sh146
-rw-r--r--scripts/lib/ptxd_make_world_clean.sh22
-rw-r--r--scripts/lib/ptxd_make_world_common.sh21
-rw-r--r--scripts/lib/ptxd_make_world_compile.sh20
-rw-r--r--scripts/lib/ptxd_make_world_compile_commands.sh44
-rw-r--r--scripts/lib/ptxd_make_world_dtb.sh5
-rw-r--r--scripts/lib/ptxd_make_world_inject.sh42
-rw-r--r--scripts/lib/ptxd_make_world_install.sh2
-rw-r--r--scripts/lib/ptxd_make_world_license.sh90
-rw-r--r--scripts/lib/ptxd_make_world_prepare.sh7
-rw-r--r--scripts/lib/ptxd_make_world_report.sh110
-rwxr-xr-xscripts/migrate/migrate_platform8
-rw-r--r--scripts/ptx-modifications/0009-confdata.c-Re-add-warning-about-unassigned-symbols.patch43
-rw-r--r--scripts/ptx-modifications/series1
-rwxr-xr-xscripts/validate-bsp-report-schema.py18
519 files changed, 5397 insertions, 3461 deletions
diff --git a/bin/ptxdist b/bin/ptxdist
index 29c9a956c..15e93a739 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -771,6 +771,12 @@ Misc:
with cgdb as frontend
bsp-info print some basic information about the BSP
package-info <package> print some basic information about the package
+ fast-bsp-report generate a yaml file that describes the BSP and
+ all packages. Less data but works without
+ building packages.
+ full-bsp-report generate a yaml file that describes the BSP and
+ all packages. More data but will build all
+ packages if necessary.
print <var> print the contents of a variable, in the way
it is known by "make"
printnext <var> assumes that the contents of <var> is another
@@ -1794,6 +1800,11 @@ EOF
ptxd_make_log export_src EXPORTDIR="${1}"
exit
;;
+ fast-bsp-report|full-bsp-report)
+ check_premake_compiler &&
+ ptxd_make_log "${cmd}"
+ exit
+ ;;
gdb|cgdb)
local -a prefix
if [ "${cmd}" = "cgdb" ]; then
diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index e822221c9..199cc6ab2 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -156,12 +156,13 @@ config BUSYBOX_FEATURE_PIDFILE
config BUSYBOX_PID_FILE_PATH
string "Directory for pidfiles"
default "/var/run"
- depends on BUSYBOX_FEATURE_PIDFILE
+ depends on BUSYBOX_FEATURE_PIDFILE || BUSYBOX_FEATURE_CROND_SPECIAL_TIMES
help
This is the default path where pidfiles are created. Applets which
allow you to set the pidfile path on the command line will override
this value. The option has no effect on applets that require you to
- specify a pidfile path.
+ specify a pidfile path. When crond has the 'Support special times'
+ option enabled, the 'crond.reboot' file is also stored here.
config BUSYBOX_BUSYBOX
bool "Include busybox applet"
@@ -311,7 +312,6 @@ config BUSYBOX_BUSYBOX_EXEC_PATH
config BUSYBOX_SELINUX
bool "Support NSA Security Enhanced Linux"
default n
- select BUSYBOX_PLATFORM_LINUX
help
Enable support for SELinux in applets ls, ps, and id. Also provide
the option of compiling in SELinux applets.
@@ -357,17 +357,6 @@ config BUSYBOX_FEATURE_SYSLOG
#This option is auto-selected when you select any applet which may
#send its output to syslog. You do not need to select it manually.
-config BUSYBOX_PLATFORM_LINUX
- bool #No description makes it a hidden option
- default n
- #help
- #For the most part, busybox requires only POSIX compatibility
- #from the target system, but some applets and features use
- #Linux-specific interfaces.
- #
- #This is automatically selected if any applet or feature requires
- #Linux-specific interfaces. You do not need to select it manually.
-
comment 'Build Options'
config BUSYBOX_STATIC
@@ -540,6 +529,14 @@ config BUSYBOX_STACK_OPTIMIZATION_386
do not work with it (they use SSE instructions without
ensuring stack alignment).
+config BUSYBOX_STATIC_LIBGCC
+ bool "Use -static-libgcc"
+ default y
+ help
+ This option instructs gcc to link in a static version of its
+ support library, libgcc. This means that the binary will require
+ one fewer dynamic library at run time.
+
comment 'Installation Options ("make install" behavior)'
choice
@@ -661,6 +658,19 @@ config BUSYBOX_WERROR
Most people should answer N.
+config BUSYBOX_WARN_SIMPLE_MSG
+ bool "Warn about single parameter bb_xx_msg calls"
+ default n
+ help
+ This will cause warnings to be shown for any instances of
+ bb_error_msg(), bb_error_msg_and_die(), bb_perror_msg(),
+ bb_perror_msg_and_die(), bb_herror_msg() or bb_herror_msg_and_die()
+ being called with a single parameter. In these cases the equivalent
+ bb_simple_xx_msg function should be used instead.
+ Note that use of STRERROR_FMT may give false positives.
+
+ If you aren't developing busybox, say N here.
+
choice
prompt "Additional debugging library"
default BUSYBOX_NO_DEBUG_LIB
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 32024bc6a..ca0499a75 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -204,6 +204,20 @@ config BUSYBOX_FEATURE_CPIO_P
depends on BUSYBOX_FEATURE_CPIO_O
help
Passthrough mode. Rarely used.
+
+config BUSYBOX_FEATURE_CPIO_IGNORE_DEVNO
+ bool "Support --ignore-devno like GNU cpio"
+ default y
+ depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+ help
+ Optionally ignore device numbers when creating archives.
+
+config BUSYBOX_FEATURE_CPIO_RENUMBER_INODES
+ bool "Support --renumber-inodes like GNU cpio"
+ default y
+ depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+ help
+ Optionally renumber inodes when creating archives.
config BUSYBOX_DPKG
bool "dpkg (43 kb)"
default y
@@ -256,7 +270,7 @@ config BUSYBOX_FEATURE_GZIP_LEVELS
help
Enable support for compression levels 4-9. The default level
is 6. If levels 1-3 are specified, 4 is used.
- If this option is not selected, -N options are ignored and -9
+ If this option is not selected, -N options are ignored and -6
is used.
config BUSYBOX_FEATURE_GZIP_DECOMPRESS
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index e67bb61ed..d0e43ca43 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -9,7 +9,6 @@ menu "Console Utilities"
config BUSYBOX_CHVT
bool "chvt (2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program is used to change to another terminal.
Example: chvt 4 (change to terminal /dev/tty4)
@@ -21,39 +20,33 @@ config BUSYBOX_CLEAR
config BUSYBOX_DEALLOCVT
bool "deallocvt (1.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program deallocates unused virtual consoles.
config BUSYBOX_DUMPKMAP
bool "dumpkmap (1.6 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program dumps the kernel's keyboard translation table to
stdout, in binary format. You can then use loadkmap to load it.
config BUSYBOX_FGCONSOLE
bool "fgconsole (1.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program prints active (foreground) console number.
config BUSYBOX_KBD_MODE
bool "kbd_mode (4.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program reports and sets keyboard mode.
config BUSYBOX_LOADFONT
bool "loadfont (5.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program loads a console font from standard input.
config BUSYBOX_SETFONT
bool "setfont (24 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Allows to load console screen map. Useful for i18n.
@@ -87,14 +80,12 @@ config BUSYBOX_FEATURE_LOADFONT_RAW
config BUSYBOX_LOADKMAP
bool "loadkmap (1.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program loads a keyboard translation table from
standard input.
config BUSYBOX_OPENVT
bool "openvt (7.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program is used to start a command on an unused
virtual terminal.
@@ -123,7 +114,6 @@ config BUSYBOX_FEATURE_RESIZE_PRINT
config BUSYBOX_SETCONSOLE
bool "setconsole (3.6 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Redirect writes to /dev/console to another device,
like the current tty while logged in via telnet.
@@ -137,20 +127,17 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
config BUSYBOX_SETKEYCODES
bool "setkeycodes (2.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program loads entries into the kernel's scancode-to-keycode
map, allowing unusual keyboards to generate usable keycodes.
config BUSYBOX_SETLOGCONS
bool "setlogcons (1.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
This program redirects the output console of kernel messages.
config BUSYBOX_SHOWKEY
bool "showkey (4.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Shows keys pressed.
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 5b322885a..8c9e66e17 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -6,6 +6,47 @@
menu "Coreutils"
+config BUSYBOX_FEATURE_VERBOSE
+ bool "Support verbose options (usually -v) for various applets"
+ default y
+ help
+ Enable cp -v, rm -v and similar messages.
+ Also enables long option (--verbose) if it exists.
+ Without this option, -v is accepted but ignored.
+
+comment "Common options for date and touch"
+
+config BUSYBOX_FEATURE_TIMEZONE
+ bool "Allow timezone in dates"
+ default y
+ depends on BUSYBOX_DESKTOP
+ help
+ Permit the use of timezones when parsing user-provided data
+ strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+ This requires support for the '%z' extension to strptime() which
+ may not be available in all implementations.
+
+comment "Common options for cp and mv"
+ depends on BUSYBOX_CP || BUSYBOX_MV
+
+config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
+ bool "Preserve hard links"
+ default y
+ depends on BUSYBOX_CP || BUSYBOX_MV
+ help
+ Allow cp and mv to preserve hard links.
+
+comment "Common options for df, du, ls"
+ depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+
+config BUSYBOX_FEATURE_HUMAN_READABLE
+ bool "Support human readable output (example 13k, 23M, 235G)"
+ default y
+ depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+ help
+ Allow df, du, and ls to have human readable output.
+
config BUSYBOX_BASENAME
bool "basename (438 bytes)"
default y
@@ -63,8 +104,10 @@ config BUSYBOX_CHROOT
config BUSYBOX_CKSUM
bool "cksum (4.1 kb)"
default y
- help
- cksum is used to calculate the CRC32 checksum of a file.
+
+config BUSYBOX_CRC32
+ bool "crc32 (4.1 kb)"
+ default y
config BUSYBOX_COMM
bool "comm (4.2 kb)"
default y
@@ -95,6 +138,13 @@ config BUSYBOX_CUT
help
cut is used to print selected parts of lines from
each file to stdout.
+
+config BUSYBOX_FEATURE_CUT_REGEX
+ bool "cut -F"
+ default y
+ depends on BUSYBOX_CUT
+ help
+ Allow regex based delimiters.
config BUSYBOX_DATE
bool "date (7 kb)"
default y
@@ -110,12 +160,10 @@ config BUSYBOX_FEATURE_DATE_ISOFMT
Enable option (-I) to output an ISO-8601 compliant
date/time string.
-# defaults to "no": stat's nanosecond field is a bit non-portable
config BUSYBOX_FEATURE_DATE_NANO
bool "Support %[num]N nanosecond format specifier"
- default n # syscall(__NR_clock_gettime)
+ default n # stat's nanosecond field is a bit non-portable
depends on BUSYBOX_DATE
- select BUSYBOX_PLATFORM_LINUX
help
Support %[num]N format specifier. Adds ~250 bytes of code.
@@ -193,6 +241,26 @@ config BUSYBOX_FEATURE_DF_FANCY
-a Show all filesystems
-i Inodes
-B <SIZE> Blocksize
+
+config BUSYBOX_FEATURE_SKIP_ROOTFS
+ bool "Skip rootfs in mount table"
+ default y
+ depends on BUSYBOX_DF
+ help
+ Ignore rootfs entry in mount table.
+
+ In Linux, kernel has a special filesystem, rootfs, which is initially
+ mounted on /. It contains initramfs data, if kernel is configured
+ to have one. Usually, another file system is mounted over / early
+ in boot process, and therefore most tools which manipulate
+ mount table, such as df, will skip rootfs entry.
+
+ However, some systems do not mount anything on /.
+ If you need to configure busybox for one of these systems,
+ you may find it useful to turn this option off to make df show
+ initramfs statistics.
+
+ Otherwise, choose Y.
config BUSYBOX_DIRNAME
bool "dirname (329 bytes)"
default y
@@ -636,7 +704,6 @@ config BUSYBOX_FEATURE_STAT_FILESYSTEM
bool "Enable display of filesystem status (-f)"
default y
depends on BUSYBOX_STAT
- select BUSYBOX_PLATFORM_LINUX # statfs()
help
Without this, stat will not support the '-f' option to display
information about filesystem status.
@@ -742,16 +809,8 @@ config BUSYBOX_TOUCH
touch is used to create or change the access and/or
modification timestamp of specified files.
-config BUSYBOX_FEATURE_TOUCH_NODEREF
- bool "Add support for -h"
- default y
- depends on BUSYBOX_TOUCH
- help
- Enable touch to have the -h option.
- This requires libc support for lutimes() function.
-
config BUSYBOX_FEATURE_TOUCH_SUSV3
- bool "Add support for SUSV3 features (-d -t -r)"
+ bool "Add support for SUSV3 features (-a -d -m -t -r)"
default y
depends on BUSYBOX_TOUCH
help
@@ -837,6 +896,11 @@ config BUSYBOX_UUDECODE
default y
help
uudecode is used to decode a uuencoded file.
+config BUSYBOX_BASE32
+ bool "base32 (4.9 kb)"
+ default y
+ help
+ Base32 encode and decode
config BUSYBOX_BASE64
bool "base64 (4.9 kb)"
default y
@@ -893,34 +957,4 @@ config BUSYBOX_YES
yes is used to repeatedly output a specific string, or
the default string 'y'.
-comment "Common options"
-
-config BUSYBOX_FEATURE_VERBOSE
- bool "Support verbose options (usually -v) for various applets"
- default y
- help
- Enable cp -v, rm -v and similar messages.
- Also enables long option (--verbose) if it exists.
- Without this option, -v is accepted but ignored.
-
-comment "Common options for cp and mv"
- depends on BUSYBOX_CP || BUSYBOX_MV
-
-config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
- bool "Preserve hard links"
- default y
- depends on BUSYBOX_CP || BUSYBOX_MV
- help
- Allow cp and mv to preserve hard links.
-
-comment "Common options for df, du, ls"
- depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
-
-config BUSYBOX_FEATURE_HUMAN_READABLE
- bool "Support human readable output (example 13k, 23M, 235G)"
- default y
- depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
- help
- Allow df, du, and ls to have human readable output.
-
endmenu
diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index fc660f486..2abc80f96 100644
--- a/config/busybox/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -21,7 +21,6 @@ config BUSYBOX_FSCK
config BUSYBOX_LSATTR
bool "lsattr (5.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
lsattr lists the file attributes on a second extended file system.
config BUSYBOX_TUNE2FS
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 3e48e371d..2858f60d1 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -110,6 +110,14 @@ config BUSYBOX_FEATURE_VI_COLON
Enable a limited set of colon commands. This does not
provide an "ex" mode.
+config BUSYBOX_FEATURE_VI_COLON_EXPAND
+ bool "Expand \"%\" and \"#\" in colon commands"
+ default y
+ depends on BUSYBOX_FEATURE_VI_COLON
+ help
+ Expand the special characters \"%\" (current filename)
+ and \"#\" (alternate filename) in colon commands.
+
config BUSYBOX_FEATURE_VI_YANKMARK
bool "Enable yank/put commands and mark cmds"
default y
@@ -217,6 +225,14 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
Unless you want more (or less) frequent "undo points" while typing,
you should probably leave this unchanged.
+config BUSYBOX_FEATURE_VI_VERBOSE_STATUS
+ bool "Enable verbose status reporting"
+ default y
+ depends on BUSYBOX_VI
+ help
+ Enable more verbose reporting of the results of yank, change,
+ delete, undo and substitution commands.
+
config BUSYBOX_FEATURE_ALLOW_EXEC
bool "Allow vi and awk to execute shell commands"
default y
diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in
index 92e676670..d4aa403a5 100644
--- a/config/busybox/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -23,21 +23,53 @@ config BUSYBOX_FEATURE_FIND_PRINT0
interpreted by other programs.
config BUSYBOX_FEATURE_FIND_MTIME
- bool "Enable -mtime: modified time matching"
+ bool "Enable -mtime: modification time matching"
default y
depends on BUSYBOX_FIND
help
Allow searching based on the modification time of
files, in days.
+config BUSYBOX_FEATURE_FIND_ATIME
+ bool "Enable -atime: access time matching"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_MTIME
+ help
+ Allow searching based on the access time of
+ files, in days.
+
+config BUSYBOX_FEATURE_FIND_CTIME
+ bool "Enable -ctime: status change timestamp matching"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_MTIME
+ help
+ Allow searching based on the status change timestamp of
+ files, in days.
+
config BUSYBOX_FEATURE_FIND_MMIN
- bool "Enable -mmin: modified time matching by minutes"
+ bool "Enable -mmin: modification time matching by minutes"
default y
depends on BUSYBOX_FIND
help
Allow searching based on the modification time of
files, in minutes.
+config BUSYBOX_FEATURE_FIND_AMIN
+ bool "Enable -amin: access time matching by minutes"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_MMIN
+ help
+ Allow searching based on the access time of
+ files, in minutes.
+
+config BUSYBOX_FEATURE_FIND_CMIN
+ bool "Enable -cmin: status change timestamp matching by minutes"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_MMIN
+ help
+ Allow searching based on the status change timestamp of
+ files, in minutes.
+
config BUSYBOX_FEATURE_FIND_PERM
bool "Enable -perm: permissions matching"
default y
@@ -79,6 +111,13 @@ config BUSYBOX_FEATURE_FIND_INUM
default y
depends on BUSYBOX_FIND
+config BUSYBOX_FEATURE_FIND_SAMEFILE
+ bool "Enable -samefile: reference file matching"
+ default y
+ depends on BUSYBOX_FIND
+ help
+ Support the 'find -samefile' option for searching by a reference file.
+
config BUSYBOX_FEATURE_FIND_EXEC
bool "Enable -exec: execute commands"
default y
@@ -159,6 +198,14 @@ config BUSYBOX_FEATURE_FIND_DELETE
WARNING: This option can do much harm if used wrong. Busybox will not
try to protect the user from doing stupid things. Use with care.
+config BUSYBOX_FEATURE_FIND_EMPTY
+ bool "Enable -empty: match empty files or directories"
+ default y
+ depends on BUSYBOX_FIND
+ help
+ Support the 'find -empty' option to find empty regular files
+ or directories.
+
config BUSYBOX_FEATURE_FIND_PATH
bool "Enable -path: match pathname with shell pattern"
default y
diff --git a/config/busybox/klibc-utils/Config.in b/config/busybox/klibc-utils/Config.in
index 8121e605f..f2ff057fb 100644
--- a/config/busybox/klibc-utils/Config.in
+++ b/config/busybox/klibc-utils/Config.in
@@ -13,7 +13,7 @@ config BUSYBOX_MINIPS
Alias to "ps".
config BUSYBOX_NUKE
bool "nuke (2.9 kb)"
- default y
+ default n # off by default: too "accidentally destructive"
help
Alias to "rm -rf".
config BUSYBOX_RESUME
@@ -24,7 +24,6 @@ config BUSYBOX_RESUME
config BUSYBOX_RUN_INIT
bool "run-init (7.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The run-init utility is used from initramfs to select a new
root device. Under initramfs, you have to use this instead of
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 84bed23ea..8e4fe855e 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -117,32 +117,73 @@ config BUSYBOX_SHA3_SMALL
64-bit x86: +270 bytes of code, 45% faster
32-bit x86: +450 bytes of code, 75% faster
-config BUSYBOX_FEATURE_FAST_TOP
- bool "Faster /proc scanning code (+100 bytes)"
- default n # all "fast or small" options default to small
+config BUSYBOX_FEATURE_NON_POSIX_CP
+ bool "Non-POSIX, but safer, copying to special nodes"
+ default y
help
- This option makes top and ps ~20% faster (or 20% less CPU hungry),
- but code size is slightly bigger.
+ With this option, "cp file symlink" will delete symlink
+ and create a regular file. This does not conform to POSIX,
+ but prevents a symlink attack.
+ Similarly, "cp file device" will not send file's data
+ to the device. (To do that, use "cat file >device")
-config BUSYBOX_FEATURE_ETC_NETWORKS
- bool "Support /etc/networks"
+config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
+ bool "Give more precise messages when copy fails (cp, mv etc)"
default n
help
- Enable support for network names in /etc/networks. This is
- a rarely used feature which allows you to use names
- instead of IP/mask pairs in route command.
+ Error messages with this feature enabled:
-config BUSYBOX_FEATURE_ETC_SERVICES
- bool "Consult /etc/services even for well-known ports"
- default n
+ $ cp file /does_not_exist/file
+ cp: cannot create '/does_not_exist/file': Path does not exist
+ $ cp file /vmlinuz/file
+ cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
+ If this feature is not enabled, they will be, respectively:
+
+ cp: cannot create '/does_not_exist/file': No such file or directory
+ cp: cannot stat '/vmlinuz/file': Not a directory
+
+ This will cost you ~60 bytes.
+
+config BUSYBOX_FEATURE_USE_SENDFILE
+ bool "Use sendfile system call"
+ default y
+ help
+ When enabled, busybox will use the kernel sendfile() function
+ instead of read/write loops to copy data between file descriptors
+ (for example, cp command does this a lot).
+ If sendfile() doesn't work, copying code falls back to read/write
+ loop. sendfile() was originally implemented for faster I/O
+ from files to sockets, but since Linux 2.6.33 it was extended
+ to work for many more file types.
+
+config BUSYBOX_FEATURE_COPYBUF_KB
+ int "Copy buffer size, in kilobytes"
+ range 1 1024
+ default 4
help
- Look up e.g. "telnet" and "http" in /etc/services file
- instead of assuming ports 23 and 80.
- This is almost never necessary (everybody uses standard ports),
- and it makes sense to avoid reading this file.
- If you disable this option, in the cases where port is explicitly
- specified as a service name (e.g. "telnet HOST PORTNAME"),
- it will still be looked up in /etc/services.
+ Size of buffer used by cp, mv, install, wget etc.
+ Buffers which are 4 kb or less will be allocated on stack.
+ Bigger buffers will be allocated with mmap, with fallback to 4 kb
+ stack buffer if mmap fails.
+
+config BUSYBOX_MONOTONIC_SYSCALL
+ bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
+ default y
+ help
+ Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+ time intervals (time, ping, traceroute etc need this).
+ Probably requires Linux 2.6+. If not selected, gettimeofday
+ will be used instead (which gives wrong results if date/time
+ is reset).
+
+config BUSYBOX_IOCTL_HEX2STR_ERROR
+ bool "Use ioctl names rather than hex values in error messages"
+ default y
+ help
+ Use ioctl names rather than hex values in error messages
+ (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+ saves about 1400 bytes.
config BUSYBOX_FEATURE_EDITING
bool "Command line editing"
@@ -358,98 +399,3 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
at shell prompt will list file named 0xff (single char name
with char value 255), not file named '?'.
-
-config BUSYBOX_FEATURE_NON_POSIX_CP
- bool "Non-POSIX, but safer, copying to special nodes"
- default y
- help
- With this option, "cp file symlink" will delete symlink
- and create a regular file. This does not conform to POSIX,
- but prevents a symlink attack.
- Similarly, "cp file device" will not send file's data
- to the device. (To do that, use "cat file >device")
-
-config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
- bool "Give more precise messages when copy fails (cp, mv etc)"
- default n
- help
- Error messages with this feature enabled:
-
- $ cp file /does_not_exist/file
- cp: cannot create '/does_not_exist/file': Path does not exist
- $ cp file /vmlinuz/file
- cp: cannot stat '/vmlinuz/file': Path has non-directory component
-
- If this feature is not enabled, they will be, respectively:
-
- cp: cannot create '/does_not_exist/file': No such file or directory
- cp: cannot stat '/vmlinuz/file': Not a directory
-
- This will cost you ~60 bytes.
-
-config BUSYBOX_FEATURE_USE_SENDFILE
- bool "Use sendfile system call"
- default y
- select BUSYBOX_PLATFORM_LINUX
- help
- When enabled, busybox will use the kernel sendfile() function
- instead of read/write loops to copy data between file descriptors
- (for example, cp command does this a lot).
- If sendfile() doesn't work, copying code falls back to read/write
- loop. sendfile() was originally implemented for faster I/O
- from files to sockets, but since Linux 2.6.33 it was extended
- to work for many more file types.
-
-config BUSYBOX_FEATURE_COPYBUF_KB
- int "Copy buffer size, in kilobytes"
- range 1 1024
- default 4
- help
- Size of buffer used by cp, mv, install, wget etc.
- Buffers which are 4 kb or less will be allocated on stack.
- Bigger buffers will be allocated with mmap, with fallback to 4 kb
- stack buffer if mmap fails.
-
-config BUSYBOX_FEATURE_SKIP_ROOTFS
- bool "Skip rootfs in mount table"
- default y
- help
- Ignore rootfs entry in mount table.
-
- In Linux, kernel has a special filesystem, rootfs, which is initially
- mounted on /. It contains initramfs data, if kernel is configured
- to have one. Usually, another file system is mounted over / early
- in boot process, and therefore most tools which manipulate
- mount table, such as df, will skip rootfs entry.
-
- However, some systems do not mount anything on /.
- If you need to configure busybox for one of these systems,
- you may find it useful to turn this option off to make df show
- initramfs statistics.
-
- Otherwise, choose Y.
-
-config BUSYBOX_MONOTONIC_SYSCALL
- bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
- default y
- select BUSYBOX_PLATFORM_LINUX
- help
- Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
- time intervals (time, ping, traceroute etc need this).
- Probably requires Linux 2.6+. If not selected, gettimeofday
- will be used instead (which gives wrong results if date/time
- is reset).
-
-config BUSYBOX_IOCTL_HEX2STR_ERROR
- bool "Use ioctl names rather than hex values in error messages"
- default y
- help
- Use ioctl names rather than hex values in error messages
- (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
- saves about 1400 bytes.
-
-config BUSYBOX_FEATURE_HWIB
- bool "Support infiniband HW"
- default y
- help
- Support for printing infiniband addresses in network applets.
diff --git a/config/busybox/mailutils/Config.in b/config/busybox/mailutils/Config.in
index 1b793ef7c..29890dcbd 100644
--- a/config/busybox/mailutils/Config.in
+++ b/config/busybox/mailutils/Config.in
@@ -1,6 +1,13 @@
# DO NOT EDIT. This file is generated from Config.src
menu "Mail Utilities"
+config BUSYBOX_FEATURE_MIME_CHARSET
+ string "Default charset"
+ default "us-ascii"
+ depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
+ help
+ Default charset of the message.
+
config BUSYBOX_MAKEMIME
bool "makemime (5.4 kb)"
default y
@@ -41,11 +48,4 @@ config BUSYBOX_SENDMAIL
help
Barebones sendmail.
-config BUSYBOX_FEATURE_MIME_CHARSET
- string "Default charset"
- default "us-ascii"
- depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
- help
- Default charset of the message.
-
endmenu
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index c322e8393..a236373ae 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -9,10 +9,15 @@ menu "Miscellaneous Utilities"
config BUSYBOX_ADJTIMEX
bool "adjtimex (4.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Adjtimex reads and optionally sets adjustment parameters for
the Linux clock adjustment algorithm.
+config BUSYBOX_ASCII
+ bool "ascii"
+ default y
+ help
+ Print ascii table.
+
config BUSYBOX_BBCONFIG
bool "bbconfig (9.7 kb)"
default n
@@ -122,7 +127,6 @@ endif
config BUSYBOX_BEEP
bool "beep (2.4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The beep applets beeps in a given freq/Hz.
@@ -210,7 +214,6 @@ config BUSYBOX_FEATURE_CHAT_CLR_ABORT
config BUSYBOX_CONSPY
bool "conspy (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
A text-mode VNC like program for Linux virtual terminals.
example: conspy NUM shared access to console num
@@ -276,7 +279,6 @@ config BUSYBOX_CRONTAB
config BUSYBOX_DEVFSD
bool "devfsd (obsolete)"
default n
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_FEATURE_SYSLOG
help
This is deprecated and should NOT be used anymore.
@@ -319,7 +321,6 @@ config BUSYBOX_DEVFSD_VERBOSE
config BUSYBOX_FEATURE_DEVFS
bool "Use devfs names for all devices (obsolete)"
default n
- select BUSYBOX_PLATFORM_LINUX
help
This is obsolete and should NOT be used anymore.
Use linux >= 2.6 (optionally with hotplug) and mdev instead!
@@ -337,7 +338,6 @@ config BUSYBOX_DEVMEM
config BUSYBOX_FBSPLASH
bool "fbsplash (26 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Shows splash image and progress bar on framebuffer device.
Can be used during boot phase of an embedded device.
@@ -383,7 +383,6 @@ config BUSYBOX_FLASHCP
config BUSYBOX_HDPARM
bool "hdparm (25 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Get/Set hard drive parameters. Primarily intended for ATA
drives.
@@ -445,35 +444,30 @@ config BUSYBOX_HEXEDIT
config BUSYBOX_I2CGET
bool "i2cget (5.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Read from I2C/SMBus chip registers.
config BUSYBOX_I2CSET
bool "i2cset (6.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Set I2C registers.
config BUSYBOX_I2CDUMP
bool "i2cdump (7.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Examine I2C registers.
config BUSYBOX_I2CDETECT
bool "i2cdetect (7.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Detect I2C chips.
config BUSYBOX_I2CTRANSFER
bool "i2ctransfer (4.0 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Send user-defined I2C messages in one transfer.
@@ -582,7 +576,6 @@ config BUSYBOX_FEATURE_LESS_ENV
config BUSYBOX_LSSCSI
bool "lsscsi (2.5 kb)"
default y
- #select PLATFORM_LINUX
help
lsscsi is a utility for displaying information about SCSI buses in the
system and devices connected to them.
@@ -629,6 +622,13 @@ config BUSYBOX_MICROCOM
default y
help
The poor man's minicom utility for chatting with serial port devices.
+config BUSYBOX_MIM
+ bool "mim (0.5 kb)"
+ default y
+ depends on BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
+ help
+ Run a script from a Makefile-like specification file.
+ Unlike 'make' dependencies aren't supported.
config BUSYBOX_MT
bool "mt (2.5 kb)"
default y
@@ -639,26 +639,22 @@ config BUSYBOX_MT
config BUSYBOX_NANDWRITE
bool "nandwrite (4.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Write to the specified MTD device, with bad blocks awareness
config BUSYBOX_NANDDUMP
bool "nanddump (5.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Dump the content of raw NAND chip
config BUSYBOX_PARTPROBE
bool "partprobe (3.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Ask kernel to rescan partition table.
config BUSYBOX_RAIDAUTORUN
bool "raidautorun (1.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
raidautorun tells the kernel md driver to
search and start RAID arrays.
@@ -666,7 +662,6 @@ config BUSYBOX_READAHEAD
bool "readahead (1.5 kb)"
default y
depends on BUSYBOX_LFS
- select BUSYBOX_PLATFORM_LINUX
help
Preload the files listed on the command line into RAM cache so that
subsequent reads on these files will not block on disk I/O.
@@ -682,7 +677,6 @@ config BUSYBOX_READAHEAD
config BUSYBOX_RFKILL
bool "rfkill (4.4 kb)"
default n # doesn't build on Ubuntu 9.04
- select BUSYBOX_PLATFORM_LINUX
help
Enable/disable wireless devices.
@@ -703,7 +697,6 @@ config BUSYBOX_RUNLEVEL
config BUSYBOX_RX
bool "rx (2.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Receive files using the Xmodem protocol.
config BUSYBOX_SETFATTR
@@ -714,7 +707,6 @@ config BUSYBOX_SETFATTR
config BUSYBOX_SETSERIAL
bool "setserial (6.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Retrieve or set Linux serial port.
config BUSYBOX_STRINGS
@@ -744,48 +736,41 @@ config BUSYBOX_TTYSIZE
config BUSYBOX_UBIATTACH
bool "ubiattach (4.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Attach MTD device to an UBI device.
config BUSYBOX_UBIDETACH
bool "ubidetach (4.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Detach MTD device from an UBI device.
config BUSYBOX_UBIMKVOL
bool "ubimkvol (5.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Create a UBI volume.
config BUSYBOX_UBIRMVOL
bool "ubirmvol (4.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Delete a UBI volume.
config BUSYBOX_UBIRSVOL
bool "ubirsvol (4.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Resize a UBI volume.
config BUSYBOX_UBIUPDATEVOL
bool "ubiupdatevol (5.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Update a UBI volume.
config BUSYBOX_UBIRENAME
bool "ubirename (2.4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Utility to rename UBI volumes
config BUSYBOX_VOLNAME
@@ -796,7 +781,6 @@ config BUSYBOX_VOLNAME
config BUSYBOX_WATCHDOG
bool "watchdog (5.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The watchdog utility is used with hardware or software watchdog
device drivers. It opens the specified watchdog device special file
@@ -805,4 +789,19 @@ config BUSYBOX_WATCHDOG
certain amount of time, the watchdog device assumes the system has
hung, and will cause the hardware to reboot.
+config BUSYBOX_FEATURE_WATCHDOG_OPEN_TWICE
+ bool "Open watchdog device twice, closing it gracefully in between"
+ depends on BUSYBOX_WATCHDOG
+ default n # this behavior was essentially a hack for a broken driver
+ help
+ When enabled, the watchdog device is opened and then immediately
+ magic-closed, before being opened a second time. This may be necessary
+ for some watchdog devices, but can cause spurious warnings in the
+ kernel log if the nowayout feature is enabled. If this workaround
+ is really needed for you machine to work properly, consider whether
+ it should be fixed in the kernel driver instead. Even when disabled,
+ the behaviour is easily emulated with a "printf 'V' > /dev/watchdog"
+ immediately before starting the busybox watchdog daemon. Say n unless
+ you know that you absolutely need this.
+
endmenu
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index 40d224bc3..609d76a09 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -37,7 +37,6 @@ config BUSYBOX_MODPROBE_SMALL
config BUSYBOX_DEPMOD
bool "depmod (27 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
depmod generates modules.dep (and potentially modules.alias
and modules.symbols) that contain dependency information
@@ -45,13 +44,11 @@ config BUSYBOX_DEPMOD
config BUSYBOX_INSMOD
bool "insmod (22 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
insmod is used to load specified modules in the running kernel.
config BUSYBOX_LSMOD
bool "lsmod (1.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
lsmod is used to display a list of loaded modules.
@@ -66,13 +63,11 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
config BUSYBOX_MODINFO
bool "modinfo (24 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Show information about a Linux Kernel module
config BUSYBOX_MODPROBE
bool "modprobe (28 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Handle the loading of modules, and their dependencies on a high
level.
@@ -90,7 +85,6 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST
config BUSYBOX_RMMOD
bool "rmmod (3.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
rmmod is used to unload specified modules from the kernel.
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index 188f25051..3a3ad56d9 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -47,6 +47,32 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
"can't resolve 'hostname.com'" and want to know more.
This may increase size of your executable a bit.
+config BUSYBOX_FEATURE_ETC_NETWORKS
+ bool "Support /etc/networks"
+ default n
+ help
+ Enable support for network names in /etc/networks. This is
+ a rarely used feature which allows you to use names
+ instead of IP/mask pairs in route command.
+
+config BUSYBOX_FEATURE_ETC_SERVICES
+ bool "Consult /etc/services even for well-known ports"
+ default n
+ help
+ Look up e.g. "telnet" and "http" in /etc/services file
+ instead of assuming ports 23 and 80.
+ This is almost never necessary (everybody uses standard ports),
+ and it makes sense to avoid reading this file.
+ If you disable this option, in the cases where port is explicitly
+ specified as a service name (e.g. "telnet HOST PORTNAME"),
+ it will still be looked up in /etc/services.
+
+config BUSYBOX_FEATURE_HWIB
+ bool "Support infiniband HW"
+ default y
+ help
+ Support for printing infiniband addresses in network applets.
+
config BUSYBOX_FEATURE_TLS_SHA1
bool "In TLS code, support ciphers which use deprecated SHA1"
depends on BUSYBOX_TLS
@@ -61,19 +87,16 @@ config BUSYBOX_FEATURE_TLS_SHA1
config BUSYBOX_ARP
bool "arp (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Manipulate the system ARP cache.
config BUSYBOX_ARPING
bool "arping (9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Ping hosts by ARP packets.
config BUSYBOX_BRCTL
bool "brctl (4.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Manage ethernet bridges.
Supports addbr/delbr and addif/delif.
@@ -104,7 +127,6 @@ config BUSYBOX_DNSD
config BUSYBOX_ETHER_WAKE
bool "ether-wake (4.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Send a magic packet to wake up sleeping machines.
config BUSYBOX_FTPD
@@ -177,6 +199,12 @@ config BUSYBOX_HTTPD
help
HTTP server.
+config BUSYBOX_FEATURE_HTTPD_PORT_DEFAULT
+ int "Default port"
+ default 80
+ range 1 65535
+ depends on BUSYBOX_HTTPD
+
config BUSYBOX_FEATURE_HTTPD_RANGES
bool "Support 'Ranges:' header"
default y
@@ -289,10 +317,47 @@ config BUSYBOX_FEATURE_HTTPD_GZIP
help
Makes httpd send files using GZIP content encoding if the
client supports it and a pre-compressed <file>.gz exists.
+
+config BUSYBOX_FEATURE_HTTPD_ETAG
+ bool "Support caching via ETag header"
+ default y
+ depends on BUSYBOX_HTTPD
+ help
+ If server responds with ETag then next time client (browser)
+ resend it via If-None-Match header.
+ Then httpd will check if file wasn't modified and if not,
+ return 304 Not Modified status code.
+ The ETag value is constructed from last modification date
+ in unix epoch, and size: "hex(last_mod)-hex(file_size)".
+ It's not completely reliable as hash functions but fair enough.
+
+config BUSYBOX_FEATURE_HTTPD_LAST_MODIFIED
+ bool "Add Last-Modified header to response"
+ default y
+ depends on BUSYBOX_HTTPD
+ help
+ The Last-Modified header is used for cache validation.
+ The client sends last seen mtime to server in If-Modified-Since.
+ Both headers MUST be an RFC 1123 formatted, which is hard to parse.
+ Use ETag header instead.
+
+config BUSYBOX_FEATURE_HTTPD_DATE
+ bool "Add Date header to response"
+ default y
+ depends on BUSYBOX_HTTPD
+ help
+ RFC2616 says that server MUST add Date header to response.
+ But it is almost useless and can be omitted.
+
+config BUSYBOX_FEATURE_HTTPD_ACL_IP
+ bool "ACL IP"
+ default y
+ depends on BUSYBOX_HTTPD
+ help
+ Support IP deny/allow rules
config BUSYBOX_IFCONFIG
bool "ifconfig (12 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Ifconfig is used to configure the kernel-resident network interfaces.
@@ -339,14 +404,12 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
config BUSYBOX_IFENSLAVE
bool "ifenslave (13 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Userspace application to bind several interfaces
to a logical interface (use with kernel bonding driver).
config BUSYBOX_IFPLUGD
bool "ifplugd (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Network interface plug detection daemon.
config BUSYBOX_IFUP
@@ -498,7 +561,6 @@ config BUSYBOX_FEATURE_INETD_RPC
config BUSYBOX_IP
bool "ip (35 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The "ip" applet is a TCP/IP interface configuration and routing
utility.
@@ -510,7 +572,6 @@ config BUSYBOX_IPADDR
bool "ipaddr (14 kb)"
default y
select BUSYBOX_FEATURE_IP_ADDRESS
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip addr"
@@ -518,7 +579,6 @@ config BUSYBOX_IPLINK
bool "iplink (17 kb)"
default y
select BUSYBOX_FEATURE_IP_LINK
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip link"
@@ -526,7 +586,6 @@ config BUSYBOX_IPROUTE
bool "iproute (15 kb)"
default y
select BUSYBOX_FEATURE_IP_ROUTE
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip route"
@@ -534,7 +593,6 @@ config BUSYBOX_IPTUNNEL
bool "iptunnel (9.6 kb)"
default y
select BUSYBOX_FEATURE_IP_TUNNEL
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip tunnel"
@@ -542,7 +600,6 @@ config BUSYBOX_IPRULE
bool "iprule (10 kb)"
default y
select BUSYBOX_FEATURE_IP_RULE
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip rule"
@@ -550,7 +607,6 @@ config BUSYBOX_IPNEIGH
bool "ipneigh (8.3 kb)"
default y
select BUSYBOX_FEATURE_IP_NEIGH
- select BUSYBOX_PLATFORM_LINUX
help
Short form of "ip neigh"
@@ -641,7 +697,6 @@ config BUSYBOX_FAKEIDENTD
config BUSYBOX_NAMEIF
bool "nameif (6.6 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_FEATURE_SYSLOG
help
nameif is used to rename network interface by its MAC address.
@@ -713,7 +768,6 @@ config BUSYBOX_NC_110_COMPAT
config BUSYBOX_NETSTAT
bool "netstat (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
netstat prints information about the Linux networking subsystem.
@@ -750,7 +804,6 @@ config BUSYBOX_FEATURE_NSLOOKUP_LONG_OPTIONS
config BUSYBOX_NTPD
bool "ntpd (22 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The NTP client/server daemon.
@@ -777,7 +830,6 @@ config BUSYBOX_FEATURE_NTP_AUTH
config BUSYBOX_PING
bool "ping (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
elicit an ICMP ECHO_RESPONSE from a host or gateway.
@@ -805,13 +857,11 @@ config BUSYBOX_PSCAN
config BUSYBOX_ROUTE
bool "route (8.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Route displays or manipulates the kernel's IP routing tables.
config BUSYBOX_SLATTACH
bool "slattach (6.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
slattach configures serial line as SLIP network interface.
config BUSYBOX_SSL_CLIENT
@@ -921,6 +971,12 @@ config BUSYBOX_FEATURE_TELNETD_STANDALONE
help
Selecting this will make telnetd able to run standalone.
+config BUSYBOX_FEATURE_TELNETD_PORT_DEFAULT
+ int "Default port"
+ default 23
+ range 1 65535
+ depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
+
config BUSYBOX_FEATURE_TELNETD_INETD_WAIT
bool "Support -w SEC option (inetd wait mode)"
default y
@@ -1011,7 +1067,6 @@ config BUSYBOX_TLS
config BUSYBOX_TRACEROUTE
bool "traceroute (11 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Utility to trace the route of IP packets.
@@ -1037,7 +1092,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
config BUSYBOX_TUNCTL
bool "tunctl (6.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
tunctl creates or deletes tun devices.
@@ -1051,7 +1105,6 @@ config BUSYBOX_FEATURE_TUNCTL_UG
config BUSYBOX_VCONFIG
bool "vconfig (2.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Creates, removes, and configures VLAN interfaces
config BUSYBOX_WGET
@@ -1071,6 +1124,13 @@ config BUSYBOX_FEATURE_WGET_STATUSBAR
default y
depends on BUSYBOX_WGET
+config BUSYBOX_FEATURE_WGET_FTP
+ bool "Enable FTP protocol (+1k)"
+ default y
+ depends on BUSYBOX_WGET
+ help
+ To support FTPS, enable FEATURE_WGET_HTTPS as well.
+
config BUSYBOX_FEATURE_WGET_AUTHENTICATION
bool "Enable HTTP authentication"
default y
@@ -1099,6 +1159,7 @@ config BUSYBOX_FEATURE_WGET_HTTPS
select BUSYBOX_TLS
help
wget will use internal TLS code to connect to https:// URLs.
+ It also enables FTPS support, but it's not well tested yet.
Note:
On NOMMU machines, ssl_helper applet should be available
in the $PATH for this to work. Make sure to select that applet.
@@ -1136,6 +1197,9 @@ config BUSYBOX_FEATURE_WGET_HTTPS
patches, but do want to waste bandwidth expaining how wrong
it is, you will be ignored.
+ FEATURE_WGET_OPENSSL does implement TLS verification
+ using the certificates available to OpenSSL.
+
config BUSYBOX_FEATURE_WGET_OPENSSL
bool "Try to connect to HTTPS using openssl"
default y
@@ -1160,6 +1224,9 @@ config BUSYBOX_FEATURE_WGET_OPENSSL
If openssl can't be executed, internal TLS code will be used
(if you enabled it); if openssl can be executed but fails later,
wget can't detect this, and download will fail.
+
+ By default TLS verification is performed, unless
+ --no-check-certificate option is passed.
config BUSYBOX_WHOIS
bool "whois (6.3 kb)"
default y
@@ -1168,7 +1235,6 @@ config BUSYBOX_WHOIS
config BUSYBOX_ZCIP
bool "zcip (8.4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_FEATURE_SYSLOG
help
ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 683a1c8d5..4b1255c52 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -7,7 +7,6 @@
config BUSYBOX_UDHCPD
bool "udhcpd (21 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
udhcpd is a DHCP server geared primarily toward embedded systems,
while striving to be fully functional and RFC compliant.
@@ -63,7 +62,6 @@ config BUSYBOX_DHCPRELAY
config BUSYBOX_UDHCPC
bool "udhcpc (24 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
udhcpc is a DHCP client geared primarily toward embedded systems,
while striving to be fully functional and RFC compliant.
@@ -144,6 +142,14 @@ config BUSYBOX_FEATURE_UDHCPC6_RFC5970
comment "Common options for DHCP applets"
depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
+config BUSYBOX_UDHCPC_DEFAULT_INTERFACE
+ string "Default interface name"
+ default "eth0"
+ depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6
+ help
+ The interface that will be used if no other interface is
+ specified on the commandline.
+
config BUSYBOX_FEATURE_UDHCP_PORT
bool "Enable '-P port' option for udhcpd and udhcpc"
default n
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index dfd4e2c14..0c1733b9f 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -6,10 +6,24 @@
menu "Process Utilities"
+config BUSYBOX_FEATURE_FAST_TOP
+ bool "Faster /proc scanning code (+100 bytes)"
+ default n # all "fast or small" options default to small
+ help
+ This option makes top and ps ~20% faster (or 20% less CPU hungry),
+ but code size is slightly bigger.
+
+config BUSYBOX_FEATURE_SHOW_THREADS
+ bool "Support thread display in ps/pstree/top"
+ default y
+ depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
+ help
+ Enables the ps -T option, showing of threads in pstree,
+ and 'h' command in top.
+
config BUSYBOX_FREE
bool "free (3.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX #sysinfo()
help
free displays the total amount of free and used physical and swap
memory in the system, as well as the buffers used by the kernel.
@@ -144,7 +158,6 @@ config BUSYBOX_FEATURE_PS_TIME
bool "Enable -o time and -o etime specifiers"
default y
depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && BUSYBOX_DESKTOP
- select BUSYBOX_PLATFORM_LINUX
config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -243,7 +256,6 @@ config BUSYBOX_FEATURE_TOPMEM
config BUSYBOX_UPTIME
bool "uptime (3.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX #sysinfo()
help
uptime gives a one line display of the current time, how long
the system has been running, how many users are currently logged
@@ -262,12 +274,4 @@ config BUSYBOX_WATCH
watch is used to execute a program periodically, showing
output to the screen.
-config BUSYBOX_FEATURE_SHOW_THREADS
- bool "Support thread display in ps/pstree/top"
- default y
- depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
- help
- Enables the ps -T option, showing of threads in pstree,
- and 'h' command in top.
-
endmenu
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index a1656b3cb..61275cdc5 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -18,6 +18,7 @@ choice
config BUSYBOX_SH_IS_ASH
depends on !BUSYBOX_NOMMU
bool "ash"
+ select BUSYBOX_SHELL_ASH
help
Choose ash to be the shell executed by 'sh' name.
The ash code will be built into busybox. If you don't select
@@ -26,6 +27,7 @@ config BUSYBOX_SH_IS_ASH
config BUSYBOX_SH_IS_HUSH
bool "hush"
+ select BUSYBOX_SHELL_HUSH
help
Choose hush to be the shell executed by 'sh' name.
The hush code will be built into busybox. If you don't select
@@ -58,6 +60,7 @@ choice
config BUSYBOX_BASH_IS_ASH
depends on !BUSYBOX_NOMMU
bool "ash"
+ select BUSYBOX_SHELL_ASH
help
Choose ash to be the shell executed by 'bash' name.
The ash code will be built into busybox. If you don't select
@@ -66,6 +69,7 @@ config BUSYBOX_BASH_IS_ASH
config BUSYBOX_BASH_IS_HUSH
bool "hush"
+ select BUSYBOX_SHELL_HUSH
help
Choose hush to be the shell executed by 'bash' name.
The hush code will be built into busybox. If you don't select
@@ -78,10 +82,15 @@ config BUSYBOX_BASH_IS_NONE
endchoice
+config BUSYBOX_SHELL_ASH
+ bool #hidden option
+ depends on !BUSYBOX_NOMMU
+
config BUSYBOX_ASH
bool "ash (78 kb)"
default y
depends on !BUSYBOX_NOMMU
+ select BUSYBOX_SHELL_ASH
help
The most complete and most pedantically correct shell included with
busybox. This shell is actually a derivative of the Debian 'dash'
@@ -91,17 +100,17 @@ config BUSYBOX_ASH
# ash options
# note: Don't remove !NOMMU part in the next line; it would break
# menuconfig's indenting.
-if !BUSYBOX_NOMMU && (BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH)
+if !BUSYBOX_NOMMU && (BUSYBOX_SHELL_ASH || BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH)
config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE
bool "Optimize for size instead of speed"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_INTERNAL_GLOB
bool "Use internal glob() implementation"
default y # Y is bigger, but because of uclibc glob() bug, let Y be default for now
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
Do not use glob() function from libc, use internal implementation.
Use this if you are getting "glob.h: No such file or directory"
@@ -112,7 +121,7 @@ config BUSYBOX_ASH_INTERNAL_GLOB
config BUSYBOX_ASH_BASH_COMPAT
bool "bash-compatible extensions"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_BASH_SOURCE_CURDIR
bool "'source' and '.' builtins search current directory after $PATH"
@@ -133,17 +142,17 @@ config BUSYBOX_ASH_BASH_NOT_FOUND_HOOK
config BUSYBOX_ASH_JOB_CONTROL
bool "Job control"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_ALIAS
bool "Alias support"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_RANDOM_SUPPORT
bool "Pseudorandom generator and $RANDOM variable"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
Enable pseudorandom generator and dynamic variable "$RANDOM".
Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -154,7 +163,7 @@ config BUSYBOX_ASH_RANDOM_SUPPORT
config BUSYBOX_ASH_EXPAND_PRMT
bool "Expand prompt string"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
$PS# may contain volatile content, such as backquote commands.
This option recreates the prompt string from the environment
@@ -163,14 +172,14 @@ config BUSYBOX_ASH_EXPAND_PRMT
config BUSYBOX_ASH_IDLE_TIMEOUT
bool "Idle timeout variable $TMOUT"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
Enable bash-like auto-logout after $TMOUT seconds of idle time.
config BUSYBOX_ASH_MAIL
bool "Check for new mail in interactive shell"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
Enable "check for new mail" function:
if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files
@@ -180,32 +189,32 @@ config BUSYBOX_ASH_MAIL
config BUSYBOX_ASH_ECHO
bool "echo builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_PRINTF
bool "printf builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_TEST
bool "test builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_HELP
bool "help builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_GETOPTS
bool "getopts builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
config BUSYBOX_ASH_CMDCMD
bool "command builtin"
default y
- depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+ depends on BUSYBOX_SHELL_ASH
help
Enable support for the 'command' builtin, which allows
you to run the specified command or builtin,
@@ -258,6 +267,7 @@ config BUSYBOX_CTTYHACK
config BUSYBOX_HUSH
bool "hush (68 kb)"
default y
+ select BUSYBOX_SHELL_HUSH
help
hush is a small shell. It handles the normal flow control
constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
@@ -269,10 +279,18 @@ config BUSYBOX_HUSH
It does not handle select, aliases, tilde expansion,
&>file and >&file redirection of stdout+stderr.
+config BUSYBOX_SHELL_HUSH
+ bool "Internal shell for embedded script support"
+ default n
+
+# hush options
+# It's only needed to get "nice" menuconfig indenting.
+if BUSYBOX_SHELL_HUSH || BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
config BUSYBOX_HUSH_BASH_COMPAT
bool "bash-compatible extensions"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_BRACE_EXPANSION
bool "Brace expansion"
@@ -281,11 +299,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
help
Enable {abc,def} extension.
-config BUSYBOX_HUSH_LINENO_VAR
- bool "$LINENO variable"
- default y
- depends on BUSYBOX_HUSH_BASH_COMPAT
-
config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
bool "'source' and '.' builtins search current directory after $PATH"
default n # do not encourage non-standard behavior
@@ -293,10 +306,15 @@ config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
help
This is not compliant with standards. Avoid if possible.
+config BUSYBOX_HUSH_LINENO_VAR
+ bool "$LINENO variable (bashism)"
+ default y
+ depends on BUSYBOX_SHELL_HUSH
+
config BUSYBOX_HUSH_INTERACTIVE
bool "Interactive mode"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable interactive mode (prompt and command editing).
Without this, hush simply reads and executes commands
@@ -322,31 +340,31 @@ config BUSYBOX_HUSH_JOB
config BUSYBOX_HUSH_TICK
bool "Support command substitution"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable `command` and $(command).
config BUSYBOX_HUSH_IF
bool "Support if/then/elif/else/fi"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_LOOPS
bool "Support for, while and until loops"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_CASE
bool "Support case ... esac statement"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable case ... esac statement. +400 bytes.
config BUSYBOX_HUSH_FUNCTIONS
bool "Support funcname() { commands; } syntax"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable support for shell functions. +800 bytes.
@@ -360,7 +378,7 @@ config BUSYBOX_HUSH_LOCAL
config BUSYBOX_HUSH_RANDOM_SUPPORT
bool "Pseudorandom generator and $RANDOM variable"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable pseudorandom generator and dynamic variable "$RANDOM".
Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -368,7 +386,7 @@ config BUSYBOX_HUSH_RANDOM_SUPPORT
config BUSYBOX_HUSH_MODE_X
bool "Support 'hush -x' option and 'set -x' command"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
This instructs hush to print commands before execution.
Adds ~300 bytes.
@@ -376,27 +394,27 @@ config BUSYBOX_HUSH_MODE_X
config BUSYBOX_HUSH_ECHO
bool "echo builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_PRINTF
bool "printf builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_TEST
bool "test builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_HELP
bool "help builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_EXPORT
bool "export builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_EXPORT_N
bool "Support 'export -n' option"
@@ -408,83 +426,85 @@ config BUSYBOX_HUSH_EXPORT_N
config BUSYBOX_HUSH_READONLY
bool "readonly builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
help
Enable support for read-only variables.
config BUSYBOX_HUSH_KILL
bool "kill builtin (supports kill %jobspec)"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_WAIT
bool "wait builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_COMMAND
bool "command builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_TRAP
bool "trap builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_TYPE
bool "type builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_TIMES
bool "times builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_READ
bool "read builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_SET
bool "set builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_UNSET
bool "unset builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_ULIMIT
bool "ulimit builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_UMASK
bool "umask builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_GETOPTS
bool "getopts builtin"
default y
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
config BUSYBOX_HUSH_MEMLEAK
bool "memleak builtin (debugging)"
default n
- depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_HUSH
+
+endif # hush options
comment "Options common to all shells"
-if BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+if BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
config BUSYBOX_FEATURE_SH_MATH
bool "POSIX math support"
default y
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
Enable math support in the shell via $((...)) syntax.
@@ -505,14 +525,14 @@ config BUSYBOX_FEATURE_SH_MATH_BASE
config BUSYBOX_FEATURE_SH_EXTRA_QUIET
bool "Hide message on interactive shell startup"
default y
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
Remove the busybox introduction when starting a shell.
config BUSYBOX_FEATURE_SH_STANDALONE
bool "Standalone shell"
default n
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
This option causes busybox shells to use busybox applets
in preference to executables in the PATH whenever possible. For
@@ -533,7 +553,7 @@ config BUSYBOX_FEATURE_SH_STANDALONE
config BUSYBOX_FEATURE_SH_NOFORK
bool "Run 'nofork' applets directly"
default n
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
This option causes busybox shells to not execute typical
fork/exec/wait sequence, but call <applet>_main directly,
@@ -551,14 +571,14 @@ config BUSYBOX_FEATURE_SH_NOFORK
config BUSYBOX_FEATURE_SH_READ_FRAC
bool "read -t N.NNN support (+110 bytes)"
default y
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
Enable support for fractional second timeout in read builtin.
config BUSYBOX_FEATURE_SH_HISTFILESIZE
bool "Use $HISTFILESIZE"
default y
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
This option makes busybox shells to use $HISTFILESIZE variable
to set shell history size. Note that its max value is capped
@@ -567,7 +587,7 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
bool "Embed scripts in the binary"
default y
- depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+ depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
Allow scripts to be compressed and embedded in the busybox
binary. The scripts should be placed in the 'embed' directory
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 20275755c..0d8b63557 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -23,7 +23,6 @@ config BUSYBOX_FEATURE_KLOGD_KLOGCTL
bool "Use the klogctl() interface"
default y
depends on BUSYBOX_KLOGD
- select BUSYBOX_PLATFORM_LINUX
help
The klogd applet supports two interfaces for reading
kernel messages. Linux provides the klogctl() interface
@@ -116,6 +115,14 @@ config BUSYBOX_FEATURE_SYSLOGD_CFG
help
Supports restricted syslogd config. See docs/syslog.conf.txt
+config BUSYBOX_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
+ bool "Include milliseconds in timestamps"
+ default n
+ depends on BUSYBOX_SYSLOGD
+ help
+ Includes milliseconds (HH:MM:SS.mmm) in timestamp when
+ timestamps are added.
+
config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE
int "Read buffer size in bytes"
default 256
@@ -153,7 +160,6 @@ config BUSYBOX_FEATURE_KMSG_SYSLOG
bool "Linux kernel printk buffer support"
default y
depends on BUSYBOX_SYSLOGD
- select BUSYBOX_PLATFORM_LINUX
help
When you enable this feature, the syslogd utility will
write system log message to the Linux kernel's printk buffer.
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index ec053a39c..e0adb9ea0 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -9,7 +9,6 @@ menu "Linux System Utilities"
config BUSYBOX_ACPID
bool "acpid (9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
acpid listens to ACPI events coming either in textual form from
/proc/acpi/event (though it is marked deprecated it is still widely
@@ -31,13 +30,11 @@ config BUSYBOX_FEATURE_ACPID_COMPAT
config BUSYBOX_BLKDISCARD
bool "blkdiscard (4.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
blkdiscard discards sectors on a given device.
config BUSYBOX_BLKID
bool "blkid (12 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_VOLUMEID
help
Lists labels and UUIDs of all filesystems.
@@ -67,7 +64,6 @@ config BUSYBOX_CHRT
config BUSYBOX_DMESG
bool "dmesg (3.7 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
dmesg is used to examine or control the kernel ring buffer. When the
Linux kernel prints messages to the system log, they are stored in
@@ -100,7 +96,6 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
config BUSYBOX_EJECT
bool "eject (4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Used to eject cdroms. (defaults to /dev/cdrom)
@@ -119,13 +114,11 @@ config BUSYBOX_FALLOCATE
config BUSYBOX_FATATTR
bool "fatattr (1.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
fatattr lists or changes the file attributes on a fat file system.
config BUSYBOX_FBSET
bool "fbset (5.9 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
fbset is used to show or change the settings of a Linux frame buffer
device. The frame buffer device provides a simple and unique
@@ -153,13 +146,11 @@ config BUSYBOX_FEATURE_FBSET_READMODE
config BUSYBOX_FDFORMAT
bool "fdformat (4.4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
fdformat is used to low-level format a floppy disk.
config BUSYBOX_FDISK
bool "fdisk (37 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The fdisk utility is used to divide hard disks into one or more
logical disks, which are generally called partitions. This utility
@@ -233,7 +224,6 @@ config BUSYBOX_FEATURE_FDISK_ADVANCED
config BUSYBOX_FINDFS
bool "findfs (12 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_VOLUMEID
help
Prints the name of a filesystem with given label or UUID.
@@ -245,7 +235,6 @@ config BUSYBOX_FLOCK
config BUSYBOX_FDFLUSH
bool "fdflush (1.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
fdflush is only needed when changing media on slightly-broken
removable media drives. It is used to make Linux believe that a
@@ -258,7 +247,6 @@ config BUSYBOX_FDFLUSH
config BUSYBOX_FREERAMDISK
bool "freeramdisk (1.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Linux allows you to create ramdisks. This utility allows you to
delete them and completely free all memory that was used for the
@@ -279,14 +267,12 @@ config BUSYBOX_FSCK_MINIX
config BUSYBOX_FSFREEZE
bool "fsfreeze (3.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_LONG_OPTS
help
Halt new accesses and flush writes on a mounted filesystem.
config BUSYBOX_FSTRIM
bool "fstrim (4.4 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Discard unused blocks on a mounted filesystem.
config BUSYBOX_GETOPT
@@ -313,16 +299,6 @@ config BUSYBOX_HEXDUMP
The hexdump utility is used to display binary data in a readable
way that is comparable to the output from most hex editors.
-config BUSYBOX_FEATURE_HEXDUMP_REVERSE
- bool "Support -R, reverse of 'hexdump -Cv'"
- default y
- depends on BUSYBOX_HEXDUMP
- help
- The hexdump utility is used to display binary data in an ascii
- readable way. This option creates binary data from an ascii input.
- NB: this option is non-standard. It's unwise to use it in scripts
- aimed to be portable.
-
config BUSYBOX_HD
bool "hd (7.8 kb)"
default y
@@ -337,7 +313,6 @@ config BUSYBOX_XXD
config BUSYBOX_HWCLOCK
bool "hwclock (5.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The hwclock utility is used to read and set the hardware clock
on a system. This is primarily used to set the current time on
@@ -358,7 +333,6 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
config BUSYBOX_IONICE
bool "ionice (3.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Set/set program io scheduling class and priority
Requires kernel >= 2.6.13
@@ -372,7 +346,6 @@ config BUSYBOX_IPCRM
config BUSYBOX_IPCS
bool "ipcs (11 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The ipcs utility is used to provide information on the currently
allocated System V interprocess (IPC) objects in the system.
@@ -393,7 +366,6 @@ config BUSYBOX_FEATURE_LAST_FANCY
config BUSYBOX_LOSETUP
bool "losetup (5.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
losetup is used to associate or detach a loop device with a regular
file or block device, and to query the status of a loop device. This
@@ -401,7 +373,6 @@ config BUSYBOX_LOSETUP
config BUSYBOX_LSPCI
bool "lspci (6.3 kb)"
default y
- #select PLATFORM_LINUX
help
lspci is a utility for displaying information about PCI buses in the
system and devices connected to them.
@@ -410,7 +381,6 @@ config BUSYBOX_LSPCI
config BUSYBOX_LSUSB
bool "lsusb (4.2 kb)"
default y
- #select PLATFORM_LINUX
help
lsusb is a utility for displaying information about USB buses in the
system and devices connected to them.
@@ -419,7 +389,6 @@ config BUSYBOX_LSUSB
config BUSYBOX_MDEV
bool "mdev (17 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
mdev is a mini-udev implementation for dynamically creating device
nodes in the /dev directory.
@@ -505,20 +474,17 @@ config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
config BUSYBOX_MKE2FS
bool "mke2fs (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Utility to create EXT2 filesystems.
config BUSYBOX_MKFS_EXT2
bool "mkfs.ext2 (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Alias to "mke2fs".
config BUSYBOX_MKFS_MINIX
bool "mkfs.minix (10 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The minix filesystem is a nice, small, compact, read-write filesystem
with little overhead. If you wish to be able to create minix
@@ -535,21 +501,18 @@ config BUSYBOX_FEATURE_MINIX2
config BUSYBOX_MKFS_REISER
bool "mkfs_reiser"
default n
- select BUSYBOX_PLATFORM_LINUX
help
Utility to create ReiserFS filesystems.
Note: this applet needs a lot of testing and polishing.
config BUSYBOX_MKDOSFS
bool "mkdosfs (7.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Utility to create FAT32 filesystems.
config BUSYBOX_MKFS_VFAT
bool "mkfs.vfat (7.2 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Alias to "mkdosfs".
config BUSYBOX_MKSWAP
@@ -583,7 +546,6 @@ config BUSYBOX_MORE
config BUSYBOX_MOUNT
bool "mount (23 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
All files and filesystems in Unix are arranged into one big directory
tree. The 'mount' utility is used to graft a filesystem onto a
@@ -685,7 +647,7 @@ config BUSYBOX_NOLOGIN
config BUSYBOX_NOLOGIN_DEPENDENCIES
bool "Enable dependencies for nologin"
- default y
+ default n # Y default makes it harder to select single-applet test
depends on BUSYBOX_NOLOGIN
select BUSYBOX_CAT
select BUSYBOX_ECHO
@@ -699,13 +661,11 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES
config BUSYBOX_NSENTER
bool "nsenter (6.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Run program with namespaces of other processes.
config BUSYBOX_PIVOT_ROOT
bool "pivot_root (1.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The pivot_root utility swaps the mount points for the root filesystem
with some other mounted filesystem. This allows you to do all sorts
@@ -730,7 +690,6 @@ config BUSYBOX_RDEV
config BUSYBOX_READPROFILE
bool "readprofile (7.1 kb)"
default y
- #select PLATFORM_LINUX
help
This allows you to parse /proc/profile for basic profiling.
config BUSYBOX_RENICE
@@ -747,7 +706,6 @@ config BUSYBOX_REV
config BUSYBOX_RTCWAKE
bool "rtcwake (6.8 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Enter a system sleep state until specified wakeup time.
config BUSYBOX_SCRIPT
@@ -764,7 +722,6 @@ config BUSYBOX_SCRIPTREPLAY
config BUSYBOX_SETARCH
bool "setarch (3.6 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The linux32 utility is used to create a 32bit environment for the
specified program (usually a shell). It only makes sense to have
@@ -774,20 +731,17 @@ config BUSYBOX_SETARCH
config BUSYBOX_LINUX32
bool "linux32 (3.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Alias to "setarch linux32".
config BUSYBOX_LINUX64
bool "linux64 (3.3 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Alias to "setarch linux64".
config BUSYBOX_SETPRIV
bool "setpriv (6.6 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_LONG_OPTS
help
Run a program with different Linux privilege settings.
@@ -828,7 +782,6 @@ config BUSYBOX_SETSID
config BUSYBOX_SWAPON
bool "swapon (15 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
Once you have created some swap space using 'mkswap', you also need
to enable your swap space with the 'swapon' utility. The 'swapoff'
@@ -855,7 +808,6 @@ config BUSYBOX_FEATURE_SWAPON_PRI
config BUSYBOX_SWAPOFF
bool "swapoff (14 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
config BUSYBOX_FEATURE_SWAPONOFF_LABEL
bool "Support specifying devices by label or UUID"
@@ -868,7 +820,6 @@ config BUSYBOX_FEATURE_SWAPONOFF_LABEL
config BUSYBOX_SWITCH_ROOT
bool "switch_root (5.5 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
The switch_root utility is used from initramfs to select a new
root device. Under initramfs, you have to use this instead of
@@ -900,17 +851,23 @@ config BUSYBOX_FEATURE_TASKSET_FANCY
Needed for machines with more than 32-64 CPUs:
affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
in this case. Otherwise, it is limited to sizeof(long).
+
+config BUSYBOX_FEATURE_TASKSET_CPULIST
+ bool "CPU list support (-c option)"
+ default y
+ depends on BUSYBOX_FEATURE_TASKSET_FANCY
+ help
+ Add support for taking/printing affinity as CPU list when '-c'
+ option is used. For example, it prints '0-3,7' instead of mask '8f'.
config BUSYBOX_UEVENT
bool "uevent (3.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
uevent is a netlink listener for kernel uevent notifications
sent via netlink. It is usually used for dynamic device creation.
config BUSYBOX_UMOUNT
bool "umount (5.1 kb)"
default y
- select BUSYBOX_PLATFORM_LINUX
help
When you want to remove a mounted filesystem from its current mount
point, for example when you are shutting down the system, the
@@ -927,7 +884,6 @@ config BUSYBOX_UNSHARE
bool "unshare (7.2 kb)"
default y
depends on !BUSYBOX_NOMMU
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_LONG_OPTS
help
Run program with some namespaces unshared from parent.
diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in
index f71425874..828482d54 100644
--- a/config/busybox/util-linux/volume_id/Config.in
+++ b/config/busybox/util-linux/volume_id/Config.in
@@ -23,6 +23,12 @@ config BUSYBOX_FEATURE_VOLUMEID_CRAMFS
bool "cramfs filesystem"
default y
depends on BUSYBOX_VOLUMEID
+config BUSYBOX_FEATURE_VOLUMEID_EROFS
+ bool "erofs filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID
+ help
+ Erofs is a compressed readonly filesystem for Linux.
config BUSYBOX_FEATURE_VOLUMEID_EXFAT
bool "exFAT filesystem"
default y
diff --git a/config/hostapd/defconfig b/config/hostapd/defconfig
index d05e1774b..fe0f3a959 100644
--- a/config/hostapd/defconfig
+++ b/config/hostapd/defconfig
@@ -44,15 +44,9 @@ CONFIG_LIBNL32=y
# Driver interface for no driver (e.g., RADIUS server only)
CONFIG_DRIVER_NONE=y
-# IEEE 802.11F/IAPP
-CONFIG_IAPP=y
-
# WPA2/IEEE 802.11i RSN pre-authentication
CONFIG_RSN_PREAUTH=y
-# IEEE 802.11w (management frame protection)
-CONFIG_IEEE80211W=y
-
# Support Operating Channel Validation
#CONFIG_OCV=y
@@ -154,9 +148,6 @@ CONFIG_IEEE80211R=y
# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
#CONFIG_DRIVER_RADIUS_ACL=y
-# IEEE 802.11n (High Throughput) support
-CONFIG_IEEE80211N=y
-
# Wireless Network Management (IEEE Std 802.11v-2011)
# Note: This is experimental and not complete implementation.
CONFIG_WNM=y
@@ -355,12 +346,12 @@ CONFIG_FST=y
# * ath10k
#
# For more details refer to:
-# http://wireless.kernel.org/en/users/Documentation/acs
+# https://wireless.wiki.kernel.org/en/users/documentation/acs
#
CONFIG_ACS=y
# Multiband Operation support
-# These extentions facilitate efficient use of multiple frequency bands
+# These extensions facilitate efficient use of multiple frequency bands
# available to the AP and the devices that may associate with it.
#CONFIG_MBO=y
@@ -386,12 +377,40 @@ CONFIG_OWE=y
# Airtime policy support
#CONFIG_AIRTIME_POLICY=y
-# Device Provisioning Protocol (DPP)
-CONFIG_DPP=y
-
# Simultaneous Authentication of Equals (SAE)
CONFIG_SAE=y
+
# Override default value for the wpa_disable_eapol_key_retries configuration
# parameter. See that parameter in hostapd.conf for more details.
#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
+
+# Wired equivalent privacy (WEP)
+# WEP is an obsolete cryptographic data confidentiality algorithm that is not
+# considered secure. It should not be used for anything anymore. The
+# functionality needed to use WEP is available in the current hostapd
+# release under this optional build parameter. This functionality is subject to
+# be completely removed in a future release.
+#CONFIG_WEP=y
+
+# Remove all TKIP functionality
+# TKIP is an old cryptographic data confidentiality algorithm that is not
+# considered secure. It should not be used anymore. For now, the default hostapd
+# build includes this to allow mixed mode WPA+WPA2 networks to be enabled, but
+# that functionality is subject to be removed in the future.
+CONFIG_NO_TKIP=y
+
+# Pre-Association Security Negotiation (PASN)
+# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol
+# design is still subject to change. As such, this should not yet be enabled in
+# production use.
+# This requires CONFIG_IEEE80211W=y to be enabled, too.
+#CONFIG_PASN=y
+
+# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
+CONFIG_DPP=y
+# DPP version 2 support
+CONFIG_DPP2=y
+# DPP version 3 support (experimental and still changing; do not enable for
+# production use)
+#CONFIG_DPP3=y
diff --git a/config/wpasupplicant/defconfig b/config/wpasupplicant/defconfig
index 7a30cac77..03bc86a31 100644
--- a/config/wpasupplicant/defconfig
+++ b/config/wpasupplicant/defconfig
@@ -77,7 +77,7 @@ CONFIG_DRIVER_WIRED=y
#CONFIG_DRIVER_MACSEC_QCA=y
# Driver interface for Linux MACsec drivers
-#CONFIG_DRIVER_MACSEC_LINUX=y
+CONFIG_DRIVER_MACSEC_LINUX=y
# Driver interface for the Broadcom RoboSwitch family
#CONFIG_DRIVER_ROBOSWITCH=y
@@ -183,7 +183,7 @@ CONFIG_EAP_IKEV2=y
#CONFIG_EAP_EKE=y
# MACsec
-#CONFIG_MACSEC=y
+CONFIG_MACSEC=y
# PKCS#12 (PFX) support (used to read private key and certificate file from
# a file that usually has extension .p12 or .pfx)
@@ -248,7 +248,7 @@ CONFIG_WPA_CLI_EDIT=y
# Simultaneous Authentication of Equals (SAE), WPA3-Personal
CONFIG_SAE=y
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
+# Disable scan result processing (ap_scan=1) to save code size by about 1 kB.
# This can be used if ap_scan=1 mode is never enabled.
#CONFIG_NO_SCAN_PROCESSING=y
@@ -310,10 +310,6 @@ CONFIG_L2_PACKET=linux
# bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
-# IEEE 802.11w (management frame protection), also known as PMF
-# Driver support is also needed for IEEE 802.11w.
-CONFIG_IEEE80211W=y
-
# Support Operating Channel Validation
#CONFIG_OCV=y
@@ -366,7 +362,7 @@ CONFIG_TLSV12=y
#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
+# (fi.w1.wpa_supplicant1)
#CONFIG_CTRL_IFACE_DBUS_NEW=y
# Add introspection support for new DBus control interface
@@ -475,11 +471,7 @@ CONFIG_DELAYED_MIC_ERROR_REPORT=y
# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
CONFIG_GETRANDOM=y
-# IEEE 802.11n (High Throughput) support (mainly for AP mode)
-CONFIG_IEEE80211N=y
-
# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
-# (depends on CONFIG_IEEE80211N)
CONFIG_IEEE80211AC=y
# Wireless Network Management (IEEE Std 802.11v-2011)
@@ -538,6 +530,8 @@ CONFIG_AUTOSCAN_PERIODIC=y
#
# External password backend for testing purposes (developer use)
#CONFIG_EXT_PASSWORD_TEST=y
+# File-based backend to read passwords from an external file.
+#CONFIG_EXT_PASSWORD_FILE=y
# Enable Fast Session Transfer (FST)
CONFIG_FST=y
@@ -609,7 +603,5 @@ CONFIG_BGSCAN_LEARN=y
# Experimental implementation of draft-harkins-owe-07.txt
CONFIG_OWE=y
-# Device Provisioning Protocol (DPP)
-# This requires CONFIG_IEEE80211W=y to be enabled, too. (see
-# wpa_supplicant/README-DPP for details)
+# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
CONFIG_DPP=y
diff --git a/doc/ref_make_macros.rst b/doc/ref_make_macros.rst
index 730687daf..684390089 100644
--- a/doc/ref_make_macros.rst
+++ b/doc/ref_make_macros.rst
@@ -150,6 +150,33 @@ When ``--verbose`` is used then the full command is logged. With
.. _install_copy:
+ptx/image-install, ptx/image-install-link, world/image-clean
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Usage:
+
+.. code-block:: make
+
+ @$(call world/image-clean, <PKG>)
+ @$(call ptx/image-install, <PKG>, $(<PKG>_BUILD_DIR)/<source-image-name>[, <image-name>])
+ @$(call ptx/image-install-link, <PKG>, <link-target>, <link-name>)
+
+These macros are used to install files to ``|ptxdistPlatformDir|/images``.
+They are only allowed in the *targetinstall* stage. They are used by
+packages that produce files that are not part of a filesystem. Bootloaders
+are typical packages that do this.
+
+``world/image-clean`` will remove the files that were created by the other
+two macros in a previous run of the *targetinstall* stage. This also
+happens implicitly when the package is cleaned.
+
+``ptx/image-install`` copies a file. The source must be an absolute path.
+The destination must be relative to the image directory. If the destination
+file name is the source file without the path, then this argument can be
+omitted.
+
+``ptx/image-install-link`` creates a symlink in the image directory.
+
install_copy
~~~~~~~~~~~~~
diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
index a5b9bfe9e..063fc3498 100644
--- a/doc/ref_parameter.rst
+++ b/doc/ref_parameter.rst
@@ -229,6 +229,32 @@ Misc Actions
are shown as well, so this can be used to verify that the correct version
of these files are used.
+``fast-bsp-report``
+ create a yaml report that describes the BSP and all packages. The data is
+ similar to what ``bsp-info`` and ``package-info`` provide but combined
+ into a machine readable format.
+
+ To run this command, the BSP must be configured (e.g. the toolchain must
+ be available), but it works without building packages.
+
+ The expected format of the yaml file is described in schema
+ ``scripts/bsp-report-schema.yaml`` in the PTXdist source tree. There is
+ also a simple helper script ``scripts/validate-bsp-report-schema.py``
+ that can be used to validate the yaml file.
+
+ The result is found in ``<platform-dir>/release/fast-bsp-report.yaml``.
+
+``full-bsp-report``
+ create a yaml report much like ``fast-bsp-report``. It contains some
+ additional data, such as the list of ipkgs created by a package. The
+ license information is validated and expanded, so this can be used to
+ create a custom license report.
+
+ When the report is generated all packages will be built unless they are
+ already built.
+
+ The result is found in ``<platform-dir>/release/full-bsp-report.yaml``.
+
.. _command_print:
``print <var>``
diff --git a/patches/Python-3.7.10/0001-python3-don-t-leak-host-path-into-target-binaries.patch b/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
index ac5e64d48..e59f7c649 100644
--- a/patches/Python-3.7.10/0001-python3-don-t-leak-host-path-into-target-binaries.patch
+++ b/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
@@ -13,7 +13,7 @@ diff --git a/setup.py b/setup.py
index bf90600eaad3..9250f5a1b691 100644
--- a/setup.py
+++ b/setup.py
-@@ -1344,7 +1344,6 @@ class PyBuildExt(build_ext):
+@@ -1516,7 +1516,6 @@ class PyBuildExt(build_ext):
if dbm_setup_debug: print("building dbm using bdb")
dbmext = Extension('_dbm', ['_dbmmodule.c'],
library_dirs=dblib_dir,
diff --git a/patches/Python-3.7.10/0002-python3-prevent-host-path-leakage.patch b/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
index 36ece1f85..e4d5eed17 100644
--- a/patches/Python-3.7.10/0002-python3-prevent-host-path-leakage.patch
+++ b/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
@@ -26,17 +26,18 @@ diff --git a/setup.py b/setup.py
index 9250f5a1b691..3278aaf6e677 100644
--- a/setup.py
+++ b/setup.py
-@@ -587,10 +587,12 @@ class PyBuildExt(build_ext):
- if not cross_compiling:
+@@ -829,10 +829,12 @@ class PyBuildExt(build_ext):
+ if not CROSS_COMPILING:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+
+ self.add_multiarch_paths()
+
# only change this for cross builds for 3.3, issues on Mageia
- if cross_compiling:
- self.add_gcc_paths()
+ if CROSS_COMPILING:
+ self.add_cross_compiling_paths()
- self.add_multiarch_paths()
+ self.add_ldflags_cppflags()
- # Add paths specified in the environment variables LDFLAGS and
- # CPPFLAGS for header and library files.
+ def init_inc_lib_dirs(self):
+
diff --git a/patches/Python-3.7.10/series b/patches/Python-3.10.4/series
index 305ae1d73..305ae1d73 100644
--- a/patches/Python-3.7.10/series
+++ b/patches/Python-3.10.4/series
diff --git a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch
index dd3470963..95d04c40c 100644
--- a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch
+++ b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch
@@ -4,16 +4,16 @@ Subject: [PATCH] configure: make opengl support switchable
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
- configure.in | 7 +++++++
+ configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
-diff --git a/configure.in b/configure.in
-index 32b3a9139efd..d77bab0c0069 100644
---- a/configure.in
-+++ b/configure.in
-@@ -105,6 +105,12 @@ AM_PATH_SDL2($SDL_VERSION,
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
+diff --git a/configure.ac b/configure.ac
+index cb2a65ee83b7..7123a7c564b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -232,6 +232,12 @@ CheckVisibilityHidden()
+ }
+ CheckVisibilityHidden
+dnl Check to see if OpenGL support is desired
+AC_ARG_ENABLE(opengl,
@@ -23,12 +23,12 @@ index 32b3a9139efd..d77bab0c0069 100644
+if test x$enable_opengl = xyes; then
dnl Check for OpenGL
case "$host" in
- *-*-cygwin* | *-*-mingw32*)
-@@ -157,6 +163,7 @@ else
+ *-*-cygwin* | *-*-mingw*)
+@@ -282,6 +288,7 @@ else
GL_LIBS=""
fi
AC_SUBST([GL_LIBS])
+fi
AC_SUBST([MATHLIB])
AC_SUBST([WINDRES])
-
+ AC_SUBST([TTF_CFLAGS])
diff --git a/patches/SDL2_ttf-2.0.15/autogen.sh b/patches/SDL2_ttf-2.0.18/autogen.sh
index a430a4eb7..a430a4eb7 100755
--- a/patches/SDL2_ttf-2.0.15/autogen.sh
+++ b/patches/SDL2_ttf-2.0.18/autogen.sh
diff --git a/patches/SDL2_ttf-2.0.15/series b/patches/SDL2_ttf-2.0.18/series
index 89c7959a2..89c7959a2 100644
--- a/patches/SDL2_ttf-2.0.15/series
+++ b/patches/SDL2_ttf-2.0.18/series
diff --git a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
deleted file mode 100644
index 886374795..000000000
--- a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 28 Jun 2021 12:08:53 +0200
-Subject: [PATCH] fix build with --disable-ucm
-
-Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html
-Reported-by: Michael Forney <mforney@mforney.org>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- include/local.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/include/local.h b/include/local.h
-index 4e7d88a0ecac..7cfcec53dd5d 100644
---- a/include/local.h
-+++ b/include/local.h
-@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
- void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen);
- #endif
-
-+#ifdef BUILD_UCM
-+
- const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name);
-
- static inline int _snd_is_ucm_device(const char *name)
-@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name)
- return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm';
- }
-
-+#else
-+
-+static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; }
-+static inline int _snd_is_ucm_device(const char *name) { return 0; }
-+
-+
-+#endif
-+
- #endif
diff --git a/patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
index 40caa5480..40caa5480 100644
--- a/patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch
+++ b/patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.2.5.1/autogen.sh b/patches/alsa-lib-1.2.6.1/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/alsa-lib-1.2.5.1/autogen.sh
+++ b/patches/alsa-lib-1.2.6.1/autogen.sh
diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.6.1/series
index 1ede62264..cab3f9ae2 100644
--- a/patches/alsa-lib-1.2.5.1/series
+++ b/patches/alsa-lib-1.2.6.1/series
@@ -1,5 +1,4 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-add-largefile-support.patch
-0002-fix-build-with-disable-ucm.patch
# e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic
diff --git a/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch b/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch
deleted file mode 100644
index ef8b6ae7f..000000000
--- a/patches/bash-5.1.8/0001-Bash-5.1-patch-12.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -urN bash-5.1.8.orig/builtins/wait.def bash-5.1.8/builtins/wait.def
---- bash-5.1.8.orig/builtins/wait.def 2021-12-21 12:57:08.083139502 +0100
-+++ bash-5.1.8/builtins/wait.def 2021-12-21 12:58:24.304849937 +0100
-@@ -111,7 +111,8 @@
- wait_builtin (list)
- WORD_LIST *list;
- {
-- int status, code, opt, nflag, wflags;
-+ int status, code, opt, nflag;
-+ volatile int wflags;
- char *vname;
- SHELL_VAR *pidvar;
- struct procstat pstat;
-@@ -180,6 +181,8 @@
- last_command_exit_signal = wait_signal_received;
- status = 128 + wait_signal_received;
- wait_sigint_cleanup ();
-+ if (wflags & JWAIT_WAITING)
-+ unset_waitlist ();
- WAIT_RETURN (status);
- }
-
-diff -urN bash-5.1.8.orig/command.h bash-5.1.8/command.h
---- bash-5.1.8.orig/command.h 2021-12-21 12:57:08.099139862 +0100
-+++ bash-5.1.8/command.h 2021-12-21 12:58:27.760927380 +0100
-@@ -124,6 +124,7 @@
- #define SUBSHELL_PROCSUB 0x20 /* subshell caused by <(command) or >(command) */
- #define SUBSHELL_COPROC 0x40 /* subshell from a coproc pipeline */
- #define SUBSHELL_RESETTRAP 0x80 /* subshell needs to reset trap strings on first call to trap */
-+#define SUBSHELL_IGNTRAP 0x100 /* subshell should reset trapped signals from trap_handler */
-
- /* A structure which represents a word. */
- typedef struct word_desc {
-diff -urN bash-5.1.8.orig/execute_cmd.c bash-5.1.8/execute_cmd.c
---- bash-5.1.8.orig/execute_cmd.c 2021-12-21 12:57:08.091139683 +0100
-+++ bash-5.1.8/execute_cmd.c 2021-12-21 12:58:27.764927470 +0100
-@@ -1547,6 +1547,9 @@
- clear_pending_traps ();
- reset_signal_handlers ();
- subshell_environment |= SUBSHELL_RESETTRAP;
-+ /* Note that signal handlers have been reset, so we should no longer
-+ reset the handler and resend trapped signals to ourselves. */
-+ subshell_environment &= ~SUBSHELL_IGNTRAP;
-
- /* We are in a subshell, so forget that we are running a trap handler or
- that the signal handler has changed (we haven't changed it!) */
-@@ -4320,7 +4323,8 @@
- already_forked = 1;
- cmdflags |= CMD_NO_FORK;
-
-- subshell_environment = SUBSHELL_FORK; /* XXX */
-+ /* We redo some of what make_child() does with SUBSHELL_IGNTRAP */
-+ subshell_environment = SUBSHELL_FORK|SUBSHELL_IGNTRAP; /* XXX */
- if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
- subshell_environment |= SUBSHELL_PIPE;
- if (async)
-@@ -4574,6 +4578,7 @@
- trap strings if we run trap to change a signal disposition. */
- reset_signal_handlers ();
- subshell_environment |= SUBSHELL_RESETTRAP;
-+ subshell_environment &= ~SUBSHELL_IGNTRAP;
-
- if (async)
- {
-@@ -5514,6 +5519,7 @@
- reset_terminating_signals (); /* XXX */
- /* Cancel traps, in trap.c. */
- restore_original_signals ();
-+ subshell_environment &= ~SUBSHELL_IGNTRAP;
-
- #if defined (JOB_CONTROL)
- FREE (p);
-diff -urN bash-5.1.8.orig/jobs.c bash-5.1.8/jobs.c
---- bash-5.1.8.orig/jobs.c 2021-12-21 12:57:08.091139683 +0100
-+++ bash-5.1.8/jobs.c 2021-12-21 12:58:27.764927470 +0100
-@@ -2217,6 +2217,8 @@
- signals to the default state for a new process. */
- pid_t mypid;
-
-+ subshell_environment |= SUBSHELL_IGNTRAP;
-+
- /* If this ends up being changed to modify or use `command' in the
- child process, go back and change callers who free `command' in
- the child process when this returns. */
-diff -urN bash-5.1.8.orig/lib/malloc/malloc.c bash-5.1.8/lib/malloc/malloc.c
---- bash-5.1.8.orig/lib/malloc/malloc.c 2021-12-21 12:57:08.095139773 +0100
-+++ bash-5.1.8/lib/malloc/malloc.c 2021-12-21 12:58:22.200802784 +0100
-@@ -1286,13 +1286,12 @@
- p = (union mhead *) ap - 1;
- }
-
-- /* XXX - should we return 0 if ISFREE? */
-- maxbytes = binsize(p->mh_index);
--
-- /* So the usable size is the maximum number of bytes in the bin less the
-- malloc overhead */
-- maxbytes -= MOVERHEAD + MSLOP;
-- return (maxbytes);
-+ /* return 0 if ISFREE */
-+ if (p->mh_alloc == ISFREE)
-+ return 0;
-+
-+ /* Since we use bounds checking, the usable size is the last requested size. */
-+ return (p->mh_nbytes);
- }
-
- #if !defined (NO_VALLOC)
-diff -urN bash-5.1.8.orig/nojobs.c bash-5.1.8/nojobs.c
---- bash-5.1.8.orig/nojobs.c 2021-12-21 12:57:08.091139683 +0100
-+++ bash-5.1.8/nojobs.c 2021-12-21 12:58:27.764927470 +0100
-@@ -575,6 +575,8 @@
- last_asynchronous_pid = getpid ();
- #endif
-
-+ subshell_environment |= SUBSHELL_IGNTRAP;
-+
- default_tty_job_signals ();
- }
- else
-diff -urN bash-5.1.8.orig/parse.y bash-5.1.8/parse.y
---- bash-5.1.8.orig/parse.y 2021-12-21 12:57:08.099139862 +0100
-+++ bash-5.1.8/parse.y 2021-12-21 12:58:26.112890455 +0100
-@@ -6493,10 +6493,8 @@
- old_expand_aliases = expand_aliases;
-
- push_stream (1);
--#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
- if (ea = expanding_alias ())
- parser_save_alias ();
--#endif
- last_read_token = WORD; /* WORD to allow reserved words here */
- current_command_line_count = 0;
- echo_input_at_read = expand_aliases = 0;
-@@ -6531,10 +6529,8 @@
- last_read_token = '\n';
- pop_stream ();
-
--#if 0 /* TAG: bash-5.2 */
- if (ea)
- parser_restore_alias ();
--#endif
-
- #if defined (HISTORY)
- remember_on_history = old_remember_on_history;
-diff -urN bash-5.1.8.orig/patchlevel.h bash-5.1.8/patchlevel.h
---- bash-5.1.8.orig/patchlevel.h 2021-12-21 12:57:08.075139321 +0100
-+++ bash-5.1.8/patchlevel.h 2021-12-21 12:58:27.764927470 +0100
-@@ -25,6 +25,6 @@
- regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
- looks for to find the patch level (for the sccs version string). */
-
--#define PATCHLEVEL 8
-+#define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
-diff -urN bash-5.1.8.orig/sig.c bash-5.1.8/sig.c
---- bash-5.1.8.orig/sig.c 2021-12-21 12:57:08.071139231 +0100
-+++ bash-5.1.8/sig.c 2021-12-21 12:58:27.764927470 +0100
-@@ -55,7 +55,8 @@
- # include "bashhist.h"
- #endif
-
--extern void initialize_siglist ();
-+extern void initialize_siglist PARAMS((void));
-+extern void set_original_signal PARAMS((int, SigHandler *));
-
- #if !defined (JOB_CONTROL)
- extern void initialize_job_signals PARAMS((void));
-@@ -255,6 +256,13 @@
- sigaction (XSIG (i), &act, &oact);
- XHANDLER(i) = oact.sa_handler;
- XSAFLAGS(i) = oact.sa_flags;
-+
-+#if 0
-+ set_original_signal (XSIG(i), XHANDLER(i)); /* optimization */
-+#else
-+ set_original_signal (XSIG(i), act.sa_handler); /* optimization */
-+#endif
-+
- /* Don't do anything with signals that are ignored at shell entry
- if the shell is not interactive. */
- /* XXX - should we do this for interactive shells, too? */
-diff -urN bash-5.1.8.orig/subst.c bash-5.1.8/subst.c
---- bash-5.1.8.orig/subst.c 2021-12-21 12:57:08.099139862 +0100
-+++ bash-5.1.8/subst.c 2021-12-21 12:58:27.764927470 +0100
-@@ -5951,6 +5951,7 @@
- free_pushed_string_input ();
- /* Cancel traps, in trap.c. */
- restore_original_signals (); /* XXX - what about special builtins? bash-4.2 */
-+ subshell_environment &= ~SUBSHELL_IGNTRAP;
- QUIT; /* catch any interrupts we got post-fork */
- setup_async_signals ();
- #if 0
-@@ -6382,6 +6383,7 @@
- }
- QUIT; /* catch any interrupts we got post-fork */
- subshell_environment |= SUBSHELL_RESETTRAP;
-+ subshell_environment &= ~SUBSHELL_IGNTRAP;
- }
-
- #if defined (JOB_CONTROL)
-diff -urN bash-5.1.8.orig/trap.c bash-5.1.8/trap.c
---- bash-5.1.8.orig/trap.c 2021-12-21 12:57:08.083139502 +0100
-+++ bash-5.1.8/trap.c 2021-12-21 12:58:27.764927470 +0100
-@@ -481,6 +481,32 @@
- SIGRETURN (0);
- }
-
-+ /* This means we're in a subshell, but have not yet reset the handler for
-+ trapped signals. We're not supposed to execute the trap in this situation;
-+ we should restore the original signal and resend the signal to ourselves
-+ to preserve the Posix "signal traps that are not being ignored shall be
-+ set to the default action" semantics. */
-+ if ((subshell_environment & SUBSHELL_IGNTRAP) && trap_list[sig] != (char *)IGNORE_SIG)
-+ {
-+ sigset_t mask;
-+
-+ /* Paranoia */
-+ if (original_signals[sig] == IMPOSSIBLE_TRAP_HANDLER)
-+ original_signals[sig] = SIG_DFL;
-+
-+ restore_signal (sig);
-+
-+ /* Make sure we let the signal we just caught through */
-+ sigemptyset (&mask);
-+ sigprocmask (SIG_SETMASK, (sigset_t *)NULL, &mask);
-+ sigdelset (&mask, sig);
-+ sigprocmask (SIG_SETMASK, &mask, (sigset_t *)NULL);
-+
-+ kill (getpid (), sig);
-+
-+ SIGRETURN (0);
-+ }
-+
- if ((sig >= NSIG) ||
- (trap_list[sig] == (char *)DEFAULT_SIG) ||
- (trap_list[sig] == (char *)IGNORE_SIG))
-diff -urN bash-5.1.8.orig/y.tab.c bash-5.1.8/y.tab.c
---- bash-5.1.8.orig/y.tab.c 2021-12-21 12:57:08.075139321 +0100
-+++ bash-5.1.8/y.tab.c 2021-12-21 12:58:26.116890545 +0100
-@@ -8787,10 +8787,8 @@
- old_expand_aliases = expand_aliases;
-
- push_stream (1);
--#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
- if (ea = expanding_alias ())
- parser_save_alias ();
--#endif
- last_read_token = WORD; /* WORD to allow reserved words here */
- current_command_line_count = 0;
- echo_input_at_read = expand_aliases = 0;
-@@ -8825,10 +8823,8 @@
- last_read_token = '\n';
- pop_stream ();
-
--#if 0 /* TAG: bash-5.2 */
- if (ea)
- parser_restore_alias ();
--#endif
-
- #if defined (HISTORY)
- remember_on_history = old_remember_on_history;
diff --git a/patches/bash-5.1.8/series b/patches/bash-5.1.8/series
deleted file mode 100644
index 0e53e492a..000000000
--- a/patches/bash-5.1.8/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Bash-5.1-patch-12.patch
diff --git a/patches/boost_1_67_0/0001-Fix-compatibility-with-Python-3.10.0a4-fopen.patch b/patches/boost_1_67_0/0001-Fix-compatibility-with-Python-3.10.0a4-fopen.patch
new file mode 100644
index 000000000..30b000662
--- /dev/null
+++ b/patches/boost_1_67_0/0001-Fix-compatibility-with-Python-3.10.0a4-fopen.patch
@@ -0,0 +1,24 @@
+From: Victor Stinner <vstinner@python.org>
+Date: Wed, 6 Jan 2021 10:07:29 +0100
+Subject: [PATCH] Fix compatibility with Python 3.10.0a4: fopen
+
+Replace private _Py_fopen() with public fopen(): private _Py_fopen()
+function was removed in 3.10.0a4:
+https://bugs.python.org/issue32381
+---
+ libs/python/src/exec.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
+index 171c6f4189b9..43e860d992b1 100644
+--- a/libs/python/src/exec.cpp
++++ b/libs/python/src/exec.cpp
+@@ -106,7 +106,7 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
+ char *f = const_cast<char *>(filename);
+ // Let python open the file to avoid potential binary incompatibilities.
+ #if PY_VERSION_HEX >= 0x03040000
+- FILE *fs = _Py_fopen(f, "r");
++ FILE *fs = fopen(f, "r");
+ #elif PY_VERSION_HEX >= 0x03000000
+ PyObject *fo = Py_BuildValue("s", f);
+ FILE *fs = _Py_fopen(fo, "r");
diff --git a/patches/boost_1_67_0/series b/patches/boost_1_67_0/series
new file mode 100644
index 000000000..23091ab6f
--- /dev/null
+++ b/patches/boost_1_67_0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fix-compatibility-with-Python-3.10.0a4-fopen.patch
+# c8badef60b4852b6a594d6f9a18f9d11 - git-ptx-patches magic
diff --git a/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch b/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch
deleted file mode 100644
index 5e4c62ee1..000000000
--- a/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Tue, 19 Nov 2019 13:06:40 +0100
-Subject: [PATCH] Remove stime() function calls
-
-stime() has been deprecated in glibc 2.31 and replaced with
-clock_settime(). Let's replace the stime() function calls with
-clock_settime() in preperation.
-
-function old new delta
-rdate_main 197 224 +27
-clock_settime - 27 +27
-date_main 926 941 +15
-stime 37 - -37
-------------------------------------------------------------------------------
-(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- coreutils/date.c | 6 +++++-
- libbb/missing_syscalls.c | 8 --------
- util-linux/rdate.c | 8 ++++++--
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/coreutils/date.c b/coreutils/date.c
-index 3414d38aedd9..4ade6abb4249 100644
---- a/coreutils/date.c
-+++ b/coreutils/date.c
-@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- time(&ts.tv_sec);
- #endif
- }
-+#if !ENABLE_FEATURE_DATE_NANO
-+ ts.tv_nsec = 0;
-+#endif
- localtime_r(&ts.tv_sec, &tm_time);
-
- /* If date string is given, update tm_time, and maybe set date */
-@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- if (date_str[0] != '@')
- tm_time.tm_isdst = -1;
- ts.tv_sec = validate_tm_time(date_str, &tm_time);
-+ ts.tv_nsec = 0;
-
- /* if setting time, set it */
-- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
-+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
- bb_perror_msg("can't set date");
- }
- }
-diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
-index 87cf59b3d4cc..dc40d91552f1 100644
---- a/libbb/missing_syscalls.c
-+++ b/libbb/missing_syscalls.c
-@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
- return syscall(__NR_getsid, pid);
- }
-
--int stime(const time_t *t)
--{
-- struct timeval tv;
-- tv.tv_sec = *t;
-- tv.tv_usec = 0;
-- return settimeofday(&tv, NULL);
--}
--
- int sethostname(const char *name, size_t len)
- {
- return syscall(__NR_sethostname, name, len);
-diff --git a/util-linux/rdate.c b/util-linux/rdate.c
-index 70f829e7fec7..878375d7868d 100644
---- a/util-linux/rdate.c
-+++ b/util-linux/rdate.c
-@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
- if (!(flags & 2)) { /* no -p (-s may be present) */
- if (time(NULL) == remote_time)
- bb_error_msg("current time matches remote time");
-- else
-- if (stime(&remote_time) < 0)
-+ else {
-+ struct timespec ts;
-+ ts.tv_sec = remote_time;
-+ ts.tv_nsec = 0;
-+ if (clock_settime(CLOCK_REALTIME, &ts) < 0)
- bb_perror_msg_and_die("can't set time of day");
-+ }
- }
-
- if (flags != 1) /* not lone -s */
diff --git a/patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
deleted file mode 100644
index 5a21793d8..000000000
--- a/patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Dinny Wu <dinny.wu@gmail.com>
-Date: Thu, 26 Jul 2012 14:12:51 +0000
-Subject: [PATCH] Fix the format warning when building applets/usage_pod.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When compiling busybox with gcc 4.6.3, it shows below warning:
-
-applets/usage_pod.c: In function ‘main’:
-applets/usage_pod.c:74:3: warning: format not a string literal and no format arguments [-Wformat-security]
-
-Signed-off-by: Dinny Wu <dinny.wu@gmail.com>
----
- applets/usage_pod.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/usage_pod.c b/applets/usage_pod.c
-index ccc166aed708..9e6d3f0ee5b1 100644
---- a/applets/usage_pod.c
-+++ b/applets/usage_pod.c
-@@ -71,7 +71,7 @@ int main(void)
- } else {
- printf(", ");
- }
-- printf(usage_array[i].aname);
-+ printf("%s", usage_array[i].aname);
- col += len2;
- }
- printf("\n\n");
diff --git a/patches/busybox-1.31.1/series b/patches/busybox-1.31.1/series
deleted file mode 100644
index 2e75917fa..000000000
--- a/patches/busybox-1.31.1/series
+++ /dev/null
@@ -1,11 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream-stable --start-number 1
-#tag:upstream-master --start-number 100
-0100-Remove-stime-function-calls.patch
-#tag:ptx --start-number 200
-0200-reactivate-check-for-tty.patch
-0201-Fix-the-format-warning-when-building-applets-usage_p.patch
-0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
-0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# df58d733972ae3ce861e84850c98ce86 - git-ptx-patches magic
diff --git a/patches/busybox-1.31.1/0200-reactivate-check-for-tty.patch b/patches/busybox-1.35.0/0200-reactivate-check-for-tty.patch
index 077b84efa..5c1c79272 100644
--- a/patches/busybox-1.31.1/0200-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.35.0/0200-reactivate-check-for-tty.patch
@@ -14,10 +14,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 57734b590ace..b9cf03d76f55 100644
+index 39ec1cdb63ec..be94e19c2011 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
-@@ -537,7 +537,7 @@ int main(int ac, char **av)
+@@ -539,7 +539,7 @@ int main(int ac, char **av)
break;
case 's':
input_mode = ask_silent;
diff --git a/patches/busybox-1.31.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
index 4e9dca9dc..87f382e05 100644
--- a/patches/busybox-1.31.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+++ b/patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
@@ -10,10 +10,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 1 insertion(+)
diff --git a/Makefile.flags b/Makefile.flags
-index f3c897b0687f..72e0a13a6388 100644
+index c34356230a9f..7c42c3abf80c 100644
--- a/Makefile.flags
+++ b/Makefile.flags
-@@ -153,6 +153,7 @@ ifeq ($(CONFIG_SELINUX),y)
+@@ -180,6 +180,7 @@ ifeq ($(CONFIG_SELINUX),y)
SELINUX_PC_MODULES = libselinux libsepol
$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
CPPFLAGS += $(SELINUX_CFLAGS)
diff --git a/patches/busybox-1.31.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.35.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
index 6f2106090..21b6d3ccc 100644
--- a/patches/busybox-1.31.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ b/patches/busybox-1.35.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
@@ -9,10 +9,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/scripts/trylink b/scripts/trylink
-index ba2d265bc919..a3f3b5b8cc10 100755
+index 2255deee7699..4febc28fc013 100755
--- a/scripts/trylink
+++ b/scripts/trylink
-@@ -268,7 +268,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
+@@ -269,7 +269,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
cat $EXE.out
exit 1
}
@@ -26,7 +26,7 @@ index ba2d265bc919..a3f3b5b8cc10 100755
chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
fi
-@@ -289,7 +294,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
+@@ -290,7 +295,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
cat $EXE.out
exit 1
}
@@ -39,7 +39,7 @@ index ba2d265bc919..a3f3b5b8cc10 100755
echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
fi
-@@ -326,7 +335,9 @@ int main(int argc, char **argv)
+@@ -327,7 +336,9 @@ int main(int argc, char **argv)
exit 1
}
rm -- "$sharedlib_dir/applet.c" $EXE.out
diff --git a/patches/busybox-1.35.0/series b/patches/busybox-1.35.0/series
new file mode 100644
index 000000000..ee5360887
--- /dev/null
+++ b/patches/busybox-1.35.0/series
@@ -0,0 +1,9 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream-stable --start-number 1
+#tag:upstream-master --start-number 100
+#tag:ptx --start-number 200
+0200-reactivate-check-for-tty.patch
+0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+# 9c0cc4baa8090165b429198c9a10e02c - git-ptx-patches magic
diff --git a/patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
index 01f213633..01f213633 100644
--- a/patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch
+++ b/patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
diff --git a/patches/chrony-4.1/series b/patches/chrony-4.2/series
index 501972558..501972558 100644
--- a/patches/chrony-4.1/series
+++ b/patches/chrony-4.2/series
diff --git a/patches/crda-3.18/0001-fix-linking-libreg.patch b/patches/crda-4.14/0001-fix-linking-libreg.patch
index 8eae90bd3..8eae90bd3 100644
--- a/patches/crda-3.18/0001-fix-linking-libreg.patch
+++ b/patches/crda-4.14/0001-fix-linking-libreg.patch
diff --git a/patches/crda-3.18/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch b/patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch
index fac346892..fac346892 100644
--- a/patches/crda-3.18/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch
+++ b/patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch
diff --git a/patches/crda-3.18/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch b/patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch
index 5a55618e6..5a55618e6 100644
--- a/patches/crda-3.18/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch
+++ b/patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch
diff --git a/patches/crda-3.18/0004-udev-Fix-rule-for-initial-setup.patch b/patches/crda-4.14/0004-udev-Fix-rule-for-initial-setup.patch
index 551b84bf6..551b84bf6 100644
--- a/patches/crda-3.18/0004-udev-Fix-rule-for-initial-setup.patch
+++ b/patches/crda-4.14/0004-udev-Fix-rule-for-initial-setup.patch
diff --git a/patches/crda-3.18/series b/patches/crda-4.14/series
index fdaa19478..fdaa19478 100644
--- a/patches/crda-3.18/series
+++ b/patches/crda-4.14/series
diff --git a/patches/dropwatch-1.5.3/0001-Fix-build-issue-when-compiling-with-Wcast-align.patch b/patches/dropwatch-1.5.3/0001-Fix-build-issue-when-compiling-with-Wcast-align.patch
deleted file mode 100644
index d63d0b18a..000000000
--- a/patches/dropwatch-1.5.3/0001-Fix-build-issue-when-compiling-with-Wcast-align.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Sat, 21 Mar 2020 07:22:29 -0400
-Subject: [PATCH] Fix build issue when compiling with -Wcast-align
-
-Passing a char buffer cast to struct nlmsghdr * violates the rules of
--Wcast-align on some arches, as described in :
-https://github.com/nhorman/dropwatch/issues/26
-
-Fix it by declaring the buffer as a struct nlmsghdr, and casting to a
-less alligned type
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
----
- src/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bd87085d7dc8..2253fc4eb8c1 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -267,7 +267,7 @@ int send_netlink_message(struct netlink_message *msg)
-
- struct netlink_message *recv_netlink_message(int *err)
- {
-- static unsigned char *buf;
-+ static struct nlmsghdr *buf;
- struct netlink_message *msg;
- struct genlmsghdr *glm;
- struct sockaddr_nl nla;
-@@ -277,7 +277,7 @@ struct netlink_message *recv_netlink_message(int *err)
- *err = 0;
-
- do {
-- rc = nl_recv(nsd, &nla, &buf, NULL);
-+ rc = nl_recv(nsd, &nla, (unsigned char **)&buf, NULL);
- if (rc < 0) {
- switch (errno) {
- case EINTR:
-@@ -294,7 +294,7 @@ struct netlink_message *recv_netlink_message(int *err)
- }
- } while (rc == 0);
-
-- msg = wrap_netlink_msg((struct nlmsghdr *)buf);
-+ msg = wrap_netlink_msg(buf);
-
- type = ((struct nlmsghdr *)msg->msg)->nlmsg_type;
-
diff --git a/patches/dropwatch-1.5.3/0002-Fix-configure-for-libnl3-genl.patch b/patches/dropwatch-1.5.3/0002-Fix-configure-for-libnl3-genl.patch
deleted file mode 100644
index 5c39d8201..000000000
--- a/patches/dropwatch-1.5.3/0002-Fix-configure-for-libnl3-genl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Wed, 20 May 2020 07:08:47 -0400
-Subject: [PATCH] Fix configure for libnl3-genl
-
-Apparently, way back when we wrote the configure script, we included a
-package check for libnl, but not libnl3-genl (ostensibly because it
-didn't exist I think), and so we hardcoded linking to -lnl3-genl. The
-pkg-config file for that library exists now, so lets actually test for
-it during the running of configure, and use its output during make
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
----
- configure.ac | 1 +
- src/Makefile.am | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ad917022eb82..278da5479152 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,7 @@ AC_PROG_AWK
- AC_CHECK_FUNCS(getopt_long)
-
- PKG_CHECK_MODULES([LIBNL3], [libnl-3.0], [], [AC_MSG_ERROR([libnl-3.0 is required])])
-+PKG_CHECK_MODULES([LIBNLG3], [libnl-genl-3.0], [], [AC_MSG_ERROR([libnl-genl-3.0 is required])])
- # Fallback on using -lreadline as readline.pc is only available since version 8.0
- PKG_CHECK_MODULES([READLINE], [readline], [], [READLINE_LIBS=-lreadline])
- PKG_CHECK_MODULES([LIBPCAP], [libpcap], [], [
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a324fd36eb9e..f56a39dcf274 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,8 +1,8 @@
-
- bin_PROGRAMS = dropwatch dwdump
-
--AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS)
--AM_LDFLAGS = $(LIBNL3_LIBS) -lnl-genl-3 $(READLINE_LIBS) -lpcap
-+AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(LIBNLG3_CFLAGS) $(READLINE_CFLAGS)
-+AM_LDFLAGS = $(LIBNL3_LIBS) $(LIBNLG3_LIBS) $(READLINE_LIBS) -lpcap
- AM_CPPFLAGS = -D_GNU_SOURCE
-
- dropwatch_SOURCES = main.c lookup.c lookup_kas.c
diff --git a/patches/dropwatch-1.5.3/series b/patches/dropwatch-1.5.3/series
deleted file mode 100644
index f3c5dd88d..000000000
--- a/patches/dropwatch-1.5.3/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-build-issue-when-compiling-with-Wcast-align.patch
-0002-Fix-configure-for-libnl3-genl.patch
-# 68fccae5492fb3b53d1b549cfe32ed5f - git-ptx-patches magic
diff --git a/patches/dropwatch-1.5.3/autogen.sh b/patches/dropwatch-1.5.4/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/dropwatch-1.5.3/autogen.sh
+++ b/patches/dropwatch-1.5.4/autogen.sh
diff --git a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
deleted file mode 100644
index 052419940..000000000
--- a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Wed, 6 Jan 2021 14:52:26 +1100
-Subject: [PATCH] fdtdump: Fix gcc11 warning
-
-In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
-array instead of the full fdt header it expects. That's relying on the
-fact that in fact fdt_set_magic() will only actually access the first 4
-bytes of the buffer.
-
-This trips a new warning in GCC 11 - and it's entirely possible it was
-always UB. So, don't do that.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- fdtdump.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fdtdump.c b/fdtdump.c
-index 9613befede71..d9fb374a59be 100644
---- a/fdtdump.c
-+++ b/fdtdump.c
-@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
- char *p = buf;
- char *endp = buf + len;
-
-- fdt_set_magic(smagic, FDT_MAGIC);
-+ fdt32_st(smagic, FDT_MAGIC);
-
- /* poor man's memmem */
- while ((endp - p) >= FDT_MAGIC_SIZE) {
diff --git a/patches/dtc-v1.6.0/series b/patches/dtc-v1.6.0/series
deleted file mode 100644
index a7e9d0319..000000000
--- a/patches/dtc-v1.6.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fdtdump-Fix-gcc11-warning.patch
-# cb5c26c7ab3ae2082ecff7af4de4e8c5 - git-ptx-patches magic
diff --git a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch b/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
deleted file mode 100644
index 270a35846..000000000
--- a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 059e48b82beb4fb920cca977b02db1ceb48facb9 Mon Sep 17 00:00:00 2001
-From: Oliver Jowett <oliver.jowett@flightaware.com>
-Date: Thu, 23 Sep 2021 13:23:17 +0800
-Subject: [PATCH] Allow env vars (not only command line overrides) to set
- CPUFEATURES_{ARCH,UNAME}. Change CPUFEATURES_{ARCH,UNAME} defaults to use
- {ARCH,UNAME} values.
-
-Fixes #158
----
- Makefile | 8 ++++++--
- Makefile.cpufeatures | 4 ++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a85d154c5..9d81ed157 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,11 @@ else
- LIMESDR ?= no
- endif
-
--UNAME := $(shell uname)
-+HOST_UNAME := $(shell uname)
-+HOST_ARCH := $(shell uname -m)
-+
-+UNAME ?= $(HOST_UNAME)
-+ARCH ?= $(HOST_ARCH)
-
- ifeq ($(UNAME), Linux)
- CPPFLAGS += -D_DEFAULT_SOURCE
-@@ -150,7 +154,6 @@ endif
- ## starch (runtime DSP code selection) mix, architecture-specific
- ##
-
--ARCH ?= $(shell uname -m)
- ifneq ($(CPUFEATURES),yes)
- # need to be able to detect CPU features at runtime to enable any non-standard compiler flags
- STARCH_MIX := generic
-@@ -180,6 +183,7 @@ include dsp/generated/makefile.$(STARCH_MIX)
- showconfig:
- @echo "Building with:" >&2
- @echo " Version string: $(DUMP1090_VERSION)" >&2
-+ @echo " Architecture: $(ARCH)" >&2
- @echo " DSP mix: $(STARCH_MIX)" >&2
- @echo " RTLSDR support: $(RTLSDR)" >&2
- @echo " BladeRF support: $(BLADERF)" >&2
-diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
-index 8c3b8418d..6b4289978 100644
---- a/Makefile.cpufeatures
-+++ b/Makefile.cpufeatures
-@@ -2,8 +2,8 @@
-
- # cmake integration is a little tricky, so let's do this by hand for now
-
--CPUFEATURES_UNAME := $(shell uname)
--CPUFEATURES_ARCH := $(shell uname -m)
-+CPUFEATURES_UNAME ?= $(UNAME)
-+CPUFEATURES_ARCH ?= $(ARCH)
-
- CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o
- CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG
diff --git a/patches/dump1090fa-6.1/series b/patches/dump1090fa-6.1/series
deleted file mode 100644
index cc3b46e66..000000000
--- a/patches/dump1090fa-6.1/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_cpufeatures_arch.patch
-
diff --git a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
deleted file mode 100644
index 89e913a74..000000000
--- a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 7 Jan 2019 10:30:59 -0500
-Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers
- safely.
-
-GCC 9 adds -Werror=address-of-packed-member, which causes us to see the
-build error reported at
- https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 .
-
-That bug report shows us the following:
-
-In file included from dp.c:26:
-dp.h: In function 'format_vendor_helper':
-dp.h:120:37: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member]
- 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid);
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~
-dp.h:74:25: note: in definition of macro 'format_guid'
- 74 | _rc = efi_guid_to_str(guid, &_guidstr); \
- | ^~~~
-cc1: all warnings being treated as errors
-
-This patch makes format_guid() use a local variable as a bounce buffer
-in the case that the guid we're passed is aligned as chaotic neutral.
-
-Note that this only fixes this instance and there may be others that bz
-didn't show because it exited too soon, and I don't have a gcc 9 build
-in front of me right now.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/dp.h b/src/dp.h
-index aa4e3902992d..20cb608d05f7 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -70,8 +70,15 @@
- #define format_guid(buf, size, off, dp_type, guid) ({ \
- int _rc; \
- char *_guidstr = NULL; \
-- \
-- _rc = efi_guid_to_str(guid, &_guidstr); \
-+ efi_guid_t _guid; \
-+ const efi_guid_t * const _guid_p = \
-+ likely(__alignof__(guid) == sizeof(guid)) \
-+ ? guid \
-+ : &_guid; \
-+ \
-+ if (unlikely(__alignof__(guid) == sizeof(guid))) \
-+ memmove(&_guid, guid, sizeof(_guid)); \
-+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
- dp_type); \
diff --git a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
deleted file mode 100644
index 7653bd80a..000000000
--- a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 21 Feb 2019 15:20:12 -0500
-Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches.
-
-This gets rid of all the places GCC 9's -Werror=address-of-packed-member
-flags as problematic.
-
-Fixes github issue #123
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp-message.c | 6 ++++--
- src/dp.h | 12 ++++--------
- src/guid.c | 2 +-
- src/include/efivar/efivar.h | 2 +-
- src/ucs2.h | 27 +++++++++++++++++++--------
- 5 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 3724e5f57bdb..9f964663de86 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- ) / sizeof(efi_ip_addr_t);
- format(buf, size, off, "Dns", "Dns(");
- for (int i=0; i < end; i++) {
-- const efi_ip_addr_t *addr = &dp->dns.addrs[i];
-+ efi_ip_addr_t addr;
-+
-+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr));
- if (i != 0)
- format(buf, size, off, "Dns", ",");
- format_ip_addr(buf, size, off, "Dns",
-- dp->dns.is_ipv6, addr);
-+ dp->dns.is_ipv6, &addr);
- }
- format(buf, size, off, "Dns", ")");
- break;
-diff --git a/src/dp.h b/src/dp.h
-index 20cb608d05f7..1f921d524aaf 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -71,13 +71,9 @@
- int _rc; \
- char *_guidstr = NULL; \
- efi_guid_t _guid; \
-- const efi_guid_t * const _guid_p = \
-- likely(__alignof__(guid) == sizeof(guid)) \
-- ? guid \
-- : &_guid; \
-- \
-- if (unlikely(__alignof__(guid) == sizeof(guid))) \
-- memmove(&_guid, guid, sizeof(_guid)); \
-+ const efi_guid_t * const _guid_p = &_guid; \
-+ \
-+ memmove(&_guid, guid, sizeof(_guid)); \
- _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
-@@ -86,7 +82,7 @@
- _guidstr = onstack(_guidstr, \
- strlen(_guidstr)+1); \
- _rc = format(buf, size, off, dp_type, "%s", \
-- _guidstr); \
-+ _guidstr); \
- } \
- _rc; \
- })
-diff --git a/src/guid.c b/src/guid.c
-index 306c9ff8287c..3156b3b7c60a 100644
---- a/src/guid.c
-+++ b/src/guid.c
-@@ -31,7 +31,7 @@
- extern const efi_guid_t efi_guid_zero;
-
- int NONNULL(1, 2) PUBLIC
--efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
-+efi_guid_cmp(const void * const a, const void * const b)
- {
- return memcmp(a, b, sizeof (efi_guid_t));
- }
-diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
-index 316891ccae9c..ad6449d9d938 100644
---- a/src/include/efivar/efivar.h
-+++ b/src/include/efivar/efivar.h
-@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
-
- extern int efi_guid_is_zero(const efi_guid_t *guid);
- extern int efi_guid_is_empty(const efi_guid_t *guid);
--extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
-+extern int efi_guid_cmp(const void * const a, const void * const b);
-
- /* import / export functions */
- typedef struct efi_variable efi_variable_t;
-diff --git a/src/ucs2.h b/src/ucs2.h
-index dbb59004b7c0..edd8367b4bcc 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -23,16 +23,21 @@
- (((val) & ((mask) << (shift))) >> (shift))
-
- static inline size_t UNUSED
--ucs2len(const uint16_t * const s, ssize_t limit)
-+ucs2len(const void *vs, ssize_t limit)
- {
- ssize_t i;
-- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++)
-+ const uint16_t *s = vs;
-+ const uint8_t *s8 = vs;
-+
-+ for (i = 0;
-+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
-+ i++, s8 += 2, s++)
- ;
- return i;
- }
-
- static inline size_t UNUSED
--ucs2size(const uint16_t * const s, ssize_t limit)
-+ucs2size(const void *s, ssize_t limit)
- {
- size_t rc = ucs2len(s, limit);
- rc *= sizeof (uint16_t);
-@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit)
- }
-
- static inline unsigned char * UNUSED
--ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
-+ucs2_to_utf8(const void * const voidchars, ssize_t limit)
- {
- ssize_t i, j;
- unsigned char *ret;
-+ const uint16_t * const chars = voidchars;
-
- if (limit < 0)
- limit = ucs2len(chars, -1);
-@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
- }
-
- static inline ssize_t UNUSED NONNULL(4)
--utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
-+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8)
- {
- ssize_t req;
- ssize_t i, j;
-+ uint16_t *ucs2 = ucs2void;
-+ uint16_t val16;
-
- if (!ucs2 && size > 0) {
- errno = EINVAL;
-@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
- val = utf8[i] & 0x7f;
- i += 1;
- }
-- ucs2[j] = val;
-+ val16 = val;
-+ ucs2[j] = val16;
-+ }
-+ if (terminate) {
-+ val16 = 0;
-+ ucs2[j++] = val16;
- }
-- if (terminate)
-- ucs2[j++] = (uint16_t)0;
- return j;
- };
-
diff --git a/patches/efivar-37/series b/patches/efivar-37/series
deleted file mode 100644
index e6f14fec2..000000000
--- a/patches/efivar-37/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
-0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
-# cbb8f240dc2a442323107d34454fa178 - git-ptx-patches magic
diff --git a/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch b/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch
new file mode 100644
index 000000000..12db66bfa
--- /dev/null
+++ b/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch
@@ -0,0 +1,34 @@
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 18 Jan 2022 11:53:41 +0100
+Subject: [PATCH] src/Makefile: build util.c separately for makeguids
+
+util.c needs to be built twice when cross-compiling:
+for the build machine to be able to link with
+makeguids which then runs during the same build,
+and then for the actual target.
+
+Upstream-Status: Submitted [https://github.com/rhboot/efivar/pull/203]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 0e423c44601a..b10051ba0adf 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -28,10 +28,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFIVAR_SOURCES)))
+ EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c
+ EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES)))
+ GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c
+-MAKEGUIDS_SOURCES = makeguids.c util.c
++MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c
+ MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES)))
+ MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds
+
++util-makeguids.c :
++ cp util.c util-makeguids.c
++
+ ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \
+ $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \
+ $(sort $(wildcard include/efivar/*.h))
diff --git a/patches/efivar-38/0002-docs-Remove-docs-building.patch b/patches/efivar-38/0002-docs-Remove-docs-building.patch
new file mode 100644
index 000000000..ef34cf96c
--- /dev/null
+++ b/patches/efivar-38/0002-docs-Remove-docs-building.patch
@@ -0,0 +1,25 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Fri, 28 Jan 2022 18:42:13 +0100
+Subject: [PATCH] docs: Remove docs building.
+
+efivar uses mandoc which ptxdist does not provide (yet).
+Just skip the entire documentation generation and installation.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c896fc38c210..bf081a66970d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ include $(TOPDIR)/src/include/defaults.mk
+ include $(TOPDIR)/src/include/coverity.mk
+ include $(TOPDIR)/src/include/scan-build.mk
+
+-SUBDIRS := src docs
++SUBDIRS := src
+
+ all : | efivar.spec src/include/version.mk prep
+ all clean install prep :
diff --git a/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch b/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch
new file mode 100644
index 000000000..fef499699
--- /dev/null
+++ b/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch
@@ -0,0 +1,26 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 7 Mar 2022 08:35:41 +0100
+Subject: [PATCH] fix building with binutils 2.36
+
+'-T' must be used here as well. Otherwise building fails with:
+
+.../bin/ld: warning: guids.lds contains output sections; did you forget -T?
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/include/workarounds.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/workarounds.mk b/src/include/workarounds.mk
+index 311883427118..a0521686b2bc 100644
+--- a/src/include/workarounds.mk
++++ b/src/include/workarounds.mk
+@@ -9,7 +9,7 @@ LD_DASH_T := $(shell \
+ if [ "x${LD_FLAVOR}" = xLLD ] ; then \
+ echo '-T' ; \
+ elif [ "x${LD_FLAVOR}" = xGNU ] ; then \
+- if echo "${LD_VERSION}" | grep -q -E '^2\.3[789]|^2\.[456789]|^[3456789]|^[[:digit:]][[:digit:]]' ; then \
++ if echo "${LD_VERSION}" | grep -q -E '^2\.3[6789]|^2\.[456789]|^[3456789]|^[[:digit:]][[:digit:]]' ; then \
+ echo '-T' ; \
+ else \
+ echo "" ; \
diff --git a/patches/efivar-38/series b/patches/efivar-38/series
new file mode 100644
index 000000000..0c17e143b
--- /dev/null
+++ b/patches/efivar-38/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-src-Makefile-build-util.c-separately-for-makeguids.patch
+0002-docs-Remove-docs-building.patch
+0003-fix-building-with-binutils-2.36.patch
+# 051f21d7f5a24e87b0ddfd14b98df864 - git-ptx-patches magic
diff --git a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
index 62052db8c..961b984fe 100644
--- a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -6,15 +6,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
builds/unix/configure.ac | 4 +++-
builds/unix/freetype-config.in | 19 ++++++-------------
- builds/unix/freetype2.in | 14 +++++++-------
+ builds/unix/freetype2.in | 18 +++++++++---------
builds/unix/unix-def.in | 3 ---
- 4 files changed, 16 insertions(+), 24 deletions(-)
+ 4 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index f54b94631d27..28420c6ba3bd 100644
+index 393ec3bb69a7..c58607c69fbd 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
-@@ -1164,7 +1164,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
+@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
# and `builds/unix/unix-cc.mk' that will be used by the build system
#
AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
@@ -26,7 +26,7 @@ index f54b94631d27..28420c6ba3bd 100644
AC_OUTPUT
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index 3918ddb92f74..847d9393f09c 100644
+index c076bc1f8222..166afc685009 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -16,13 +16,6 @@ export LC_ALL
@@ -68,7 +68,7 @@ index 3918ddb92f74..847d9393f09c 100644
test "${SYSROOT}$libdir" != "/usr/lib64" ; then
libs_L="-L${SYSROOT}$libdir"
diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
-index 2d759ecf8bfd..f44f14cabf9a 100644
+index fe389f4b6fef..885444efebf7 100644
--- a/builds/unix/freetype2.in
+++ b/builds/unix/freetype2.in
@@ -1,14 +1,14 @@
@@ -85,19 +85,21 @@ index 2d759ecf8bfd..f44f14cabf9a 100644
URL: https://freetype.org
Description: A free, high-quality, and portable font engine.
-Version: %ft_version%
+-Requires: %PKGCONFIG_REQUIRES%
+-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
+-Libs: %PKGCONFIG_LIBS%
+-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
+Version: @ft_version@
- Requires:
--Requires.private: %REQUIRES_PRIVATE%
-+Requires.private: @REQUIRES_PRIVATE@
- Libs: -L${libdir} -lfreetype
--Libs.private: %LIBS_PRIVATE%
-+Libs.private: @LIBS_PRIVATE@
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Libs: @PKGCONFIG_LIBS@
++Libs.private: @PKGCONFIG_LIBS_PRIVATE@
Cflags: -I${includedir}/freetype2
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index 5e04f1c6a705..8ed66631dfb9 100644
+index 8e298ac59107..519d5958dce5 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
-@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
+@@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
# defines whether we should install `freetype-config' or not
INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@
diff --git a/patches/freetype-2.10.4/autogen.sh b/patches/freetype-2.12.1/autogen.sh
index 1056b101c..1056b101c 100755
--- a/patches/freetype-2.10.4/autogen.sh
+++ b/patches/freetype-2.12.1/autogen.sh
diff --git a/patches/freetype-2.10.4/series b/patches/freetype-2.12.1/series
index ab166a354..ab166a354 100644
--- a/patches/freetype-2.10.4/series
+++ b/patches/freetype-2.12.1/series
diff --git a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch b/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
deleted file mode 100644
index 53356897d..000000000
--- a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 13 Jul 2021 07:30:20 +0200
-Subject: [PATCH] don't build tls tests
-
-They fail to compile because gnutls is built without pkcs11 support in
-ptxdist:
-
-.../tls/tests/certificate.c:597: undefined reference to `gnutls_pkcs11_init'
-.../tls/tests/certificate.c:598: undefined reference to `gnutls_pkcs11_add_provider'
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 81c2a8b15ca0..1a2c447b21e8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -189,7 +189,6 @@ if backends.contains('openssl')
- subdir('tls/openssl')
- endif
-
--subdir('tls/tests')
-
- # Will automatically pick it up from the cross file if defined
- gio_querymodules = find_program('gio-querymodules', required : false)
diff --git a/patches/glib-networking-2.68.1/series b/patches/glib-networking-2.68.1/series
deleted file mode 100644
index 38027c13d..000000000
--- a/patches/glib-networking-2.68.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-don-t-build-tls-tests.patch
-# 8ebc581a61077fad77b1bf442bb096d1 - git-ptx-patches magic
diff --git a/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
new file mode 100644
index 000000000..4ca5b6d87
--- /dev/null
+++ b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
@@ -0,0 +1,23 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Mon, 4 Apr 2022 13:59:16 +0200
+Subject: [PATCH] tls: Don't build TLS tests.
+
+* Rework previous patch for glib-networking.
+
+TLS tests fail to compile because gnutls is built without
+pkcs11 support in ptxdist.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ tls/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tls/meson.build b/tls/meson.build
+index e76e7666bb30..c96d145f6d8d 100644
+--- a/tls/meson.build
++++ b/tls/meson.build
+@@ -14,4 +14,3 @@ if backends.contains('openssl')
+ subdir('openssl')
+ endif
+
+-subdir('tests')
diff --git a/patches/glib-networking-2.72.0/series b/patches/glib-networking-2.72.0/series
new file mode 100644
index 000000000..00f04e9bf
--- /dev/null
+++ b/patches/glib-networking-2.72.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-tls-Don-t-build-TLS-tests.patch
+# b8239d52e458030f4b9cd353000ddd21 - git-ptx-patches magic
diff --git a/patches/gnutls-3.6.16/0001-don-t-try-ru-build-run-code-generator.patch b/patches/gnutls-3.6.16/0001-don-t-try-ru-build-run-code-generator.patch
deleted file mode 100644
index c879ec7f8..000000000
--- a/patches/gnutls-3.6.16/0001-don-t-try-ru-build-run-code-generator.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 3 Apr 2020 13:07:30 +0200
-Subject: [PATCH] don't try ru build / run code generator
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- lib/nettle/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
-index aae87e09023a..de6f9ed44399 100644
---- a/lib/nettle/Makefile.am
-+++ b/lib/nettle/Makefile.am
-@@ -99,6 +99,8 @@ ecc_generated_headers = \
- BUILT_SOURCES = $(ecc_generated_headers)
- EXTRA_DIST = $(ecc_generated_headers) ecc/eccdata.stamp
-
-+if !CROSS_COMPILING
-+
- noinst_PROGRAMS = ecc/eccdata$(EXEEXT)
-
- ecc_eccdata_SOURCES = ecc/eccdata.c
-@@ -126,6 +128,8 @@ ecc/ecc-gost-gc512a-32.h: ecc/eccdata.stamp
- ecc/ecc-gost-gc512a-64.h: ecc/eccdata.stamp
- $(AM_V_GEN)ecc/eccdata$(EXEEXT) gost_gc512a 43 6 64 > $@T && mv $@T $@
-
-+endif
-+
- libcrypto_la_SOURCES += \
- gost/ecc-gost-hash.c nettle-alloca.h ecc-gost-curve.h
-
diff --git a/patches/gnutls-3.6.16/series b/patches/gnutls-3.6.16/series
deleted file mode 100644
index 1a79ecf82..000000000
--- a/patches/gnutls-3.6.16/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-don-t-try-ru-build-run-code-generator.patch
-# b14a2a9426010360472bbafa176de894 - git-ptx-patches magic
diff --git a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
new file mode 100644
index 000000000..51df2f0c4
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc82c29..297b0ad26ee5 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+
+ lib_intermediates = []
+ foreach f: lib_sources
+- name = f.underscorify(f)
++ name = f.underscorify()
+ lib = static_library('igt-' + name,
+ [ f, lib_version ],
+ include_directories: inc,
+--
+2.30.2
+
diff --git a/patches/igt-gpu-tools-1.26/series b/patches/igt-gpu-tools-1.26/series
new file mode 100644
index 000000000..30537838e
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/series
@@ -0,0 +1 @@
+0001-lib-meson.build-Fix-underscorify-call.patch
diff --git a/patches/libgudev-236/0001-Prepare-to-check-for-an-older-UDEV.patch b/patches/libgudev-237/0001-Prepare-to-check-for-an-older-UDEV.patch
index 988221ba3..988221ba3 100644
--- a/patches/libgudev-236/0001-Prepare-to-check-for-an-older-UDEV.patch
+++ b/patches/libgudev-237/0001-Prepare-to-check-for-an-older-UDEV.patch
diff --git a/patches/libgudev-236/series b/patches/libgudev-237/series
index ad87bca53..ad87bca53 100644
--- a/patches/libgudev-236/series
+++ b/patches/libgudev-237/series
diff --git a/patches/libseccomp-2.5.3/0001-run-time-use-a-broadly-supported-shell-interpreter.patch b/patches/libseccomp-2.5.4/0001-run-time-use-a-broadly-supported-shell-interpreter.patch
index 9e4b6d350..9e4b6d350 100644
--- a/patches/libseccomp-2.5.3/0001-run-time-use-a-broadly-supported-shell-interpreter.patch
+++ b/patches/libseccomp-2.5.4/0001-run-time-use-a-broadly-supported-shell-interpreter.patch
diff --git a/patches/libseccomp-2.5.3/series b/patches/libseccomp-2.5.4/series
index d492518bb..d492518bb 100644
--- a/patches/libseccomp-2.5.3/series
+++ b/patches/libseccomp-2.5.4/series
diff --git a/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch b/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch
deleted file mode 100644
index 7dbc92bc3..000000000
--- a/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 12 Jan 2014 18:36:22 +0100
-Subject: [PATCH] configure.ac: use default largefile macro
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 20ba55a..72dccac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -200,7 +200,7 @@ case "$host_os" in
- pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t
- unset ac_cv_sizeof_off_t
-
-- AC_SYS_EXTRA_LARGEFILE
-+ AC_SYS_LARGEFILE
-
- if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then
- ac_cv_sys_largefile_CFLAGS=""
diff --git a/patches/libsndfile-1.0.25/autogen.sh b/patches/libsndfile-1.0.25/autogen.sh
deleted file mode 100755
index cf66cf33c..000000000
--- a/patches/libsndfile-1.0.25/autogen.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-aclocal $ACLOCAL_FLAGS
-
-libtoolize \
- --force \
- --copy
-
-autoreconf \
- --include=M4 \
- --force \
- --install \
- --warnings=cross \
- --warnings=syntax \
- --warnings=obsolete \
- --warnings=unsupported
-
diff --git a/patches/libsndfile-1.0.25/series b/patches/libsndfile-1.0.25/series
deleted file mode 100644
index 2c7bf05de..000000000
--- a/patches/libsndfile-1.0.25/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure.ac-use-default-largefile-macro.patch
-# b26d82dddc9376bd2a2696502b2b4dd2 - git-ptx-patches magic
diff --git a/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch b/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch
deleted file mode 100644
index 52e21f513..000000000
--- a/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 17 Apr 2015 15:05:42 +0200
-Subject: [PATCH] libool.m4: add ARFLAGS variable
-
-Libtool has used $AR_FLAGS since 2000-05-29 commit
-8300de4c54e6f04f0d, Automake ARFLAGS since 2003-04-06 commit
-a71b3490639831ca. Even though ARFLAGS is younger, it sounds like
-better name according GNU Coding Standards.
-
-Related to bug#20082.
-
-* m4/libtool.m4 (_LT_PROG_AR): Copy ARFLAGS value into AR_FLAGS
-variable if AR_FLAGS is not set. Add new _LT_DECL'ed variable
-'lt_ar_flags' to keep the configure-time value of AR_FLAGS. The
-new 'lt_ar_flags' is to be used as the default value for AR_FLAGS
-at libtool-runtime.
-* NEWS: Document.
----
- NEWS | 6 ++++++
- m4/libtool.m4 | 17 +++++++++++++++--
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index d7ca4341c393..590ce15ed5cd 100644
---- a/NEWS
-+++ b/NEWS
-@@ -140,6 +140,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool
-
- make check-local TESTSUITEFLAGS='-k "!expensive"'
-
-+** New features:
-+
-+ - Libtool script now supports (configure-time and runtime) ARFLAGS
-+ variable, which obsoletes AR_FLAGS. This is due to naming conventions
-+ among other *FLAGS and to be consistent with Automake's ARFLAGS.
-+
- ** Bug fixes:
-
- - Fix a long-standing latent bug in autom4te include path for autotests
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index a3bc337b79ad..2d6bda98fc92 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1493,9 +1493,22 @@ need_locks=$enable_libtool_lock
- m4_defun([_LT_PROG_AR],
- [AC_CHECK_TOOLS(AR, [ar], false)
- : ${AR=ar}
--: ${AR_FLAGS=cru}
- _LT_DECL([], [AR], [1], [The archiver])
--_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-+
-+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-+# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-+# higher priority because thats what people were doing historically (setting
-+# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
-+# variable obsoleted/removed.
-+
-+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru}
-+lt_ar_flags=$AR_FLAGS
-+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
-+
-+# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override
-+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
-+ [Flags to create an archive])
-
- AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
diff --git a/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch b/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch
deleted file mode 100644
index a137845e8..000000000
--- a/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 17 Apr 2015 16:54:58 +0200
-Subject: [PATCH] ARFLAGS: use 'cr' instead of 'cru' by default
-
-In some GNU/Linux distributions people started to compile 'ar'
-binary with --enable-deterministic-archives (binutils project).
-That, however, in combination with our previous long time working
-default AR_FLAGS=cru causes warnings on such installations:
-ar: `u' modifier ignored since `D' is the default (see `U')
-
-The 'u' option (at least with GNU binutils) did small optimization
-during repeated builds because it instructed 'ar' to not
-open/close unchanged *.o files and to rather read their contents
-from old archive file. However, its removal should not cause a
-big performance hit for usual workflows.
-
-Distributions started using --enable-deterministic-archives
-knowing that it would disable the 'u', just to rather have a bit
-more deterministic builds.
-
-Also, to justify this change a bit more, keeping 'u' in ARFLAGS
-could only result in many per-project changes to override
-Libtool's ARFLAGS default, just to silent such warnings.
-
-Fixes bug#19967. Reported by Eric Blake.
-
-* m4/libtool.m4 (_LT_PROG_AR): Default AR_FLAGS to 'cr'.
-(_LT_REQUIRED_DARWIN_CHECKS): Use $AR_FLAGS instead 'cru' string.
-* doc/libtool.texi: Do 's/ar cru/ar cr/' in whole documentation.
-* NEWS: Document.
----
- NEWS | 4 ++++
- doc/libtool.texi | 10 +++++-----
- m4/libtool.m4 | 6 +++---
- 3 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 590ce15ed5cd..2afc01ef38a9 100644
---- a/NEWS
-+++ b/NEWS
-@@ -146,6 +146,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- variable, which obsoletes AR_FLAGS. This is due to naming conventions
- among other *FLAGS and to be consistent with Automake's ARFLAGS.
-
-+** Important incompatible changes:
-+
-+ - Libtool changed ARFLAGS/AR_FLAGS default from 'cru' to 'cr'.
-+
- ** Bug fixes:
-
- - Fix a long-standing latent bug in autom4te include path for autotests
-diff --git a/doc/libtool.texi b/doc/libtool.texi
-index 0298627c2464..4c664bb2ab05 100644
---- a/doc/libtool.texi
-+++ b/doc/libtool.texi
-@@ -602,7 +602,7 @@ Without libtool, the programmer would invoke the @command{ar} command to
- create a static library:
-
- @example
--burger$ @kbd{ar cru libhello.a hello.o foo.o}
-+burger$ @kbd{ar cr libhello.a hello.o foo.o}
- burger$
- @end example
-
-@@ -632,7 +632,7 @@ libtool are the same ones you would use to produce an executable named
- a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.o hello.o}
- *** Warning: Linking the shared library libhello.la against the
- *** non-libtool objects foo.o hello.o is not portable!
--ar cru .libs/libhello.a
-+ar cr .libs/libhello.a
- ranlib .libs/libhello.a
- creating libhello.la
- (cd .libs && rm -f libhello.la && ln -s ../libhello.la libhello.la)
-@@ -662,7 +662,7 @@ archive, not a shared library (@pxref{Static libraries}).}:
- @example
- a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \
- -rpath /usr/local/lib -lm}
--ar cru @value{objdir}/libhello.a foo.o hello.o
-+ar cr @value{objdir}/libhello.a foo.o hello.o
- ranlib @value{objdir}/libhello.a
- creating libhello.la
- (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la)
-@@ -676,7 +676,7 @@ burger$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \
- -rpath /usr/local/lib -lm}
- rm -fr @value{objdir}/libhello.a @value{objdir}/libhello.la
- ld -Bshareable -o @value{objdir}/libhello.so.0.0 @value{objdir}/foo.o @value{objdir}/hello.o -lm
--ar cru @value{objdir}/libhello.a foo.o hello.o
-+ar cr @value{objdir}/libhello.a foo.o hello.o
- ranlib @value{objdir}/libhello.a
- creating libhello.la
- (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la)
-@@ -6001,7 +6001,7 @@ in cases where it is necessary.
- @subsection Archivers
-
- On all known systems, building a static library can be accomplished by
--running @kbd{ar cru lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}},
-+running @kbd{ar cr lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}},
- where the @file{.a} file is the output library, and each @file{.o} file is an
- object file.
-
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 2d6bda98fc92..3335def6d847 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1042,8 +1042,8 @@ int forced_loaded() { return 2;}
- _LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-+ echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-+ $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-@@ -1501,7 +1501,7 @@ _LT_DECL([], [AR], [1], [The archiver])
- # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
- # variable obsoleted/removed.
-
--test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru}
-+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
- lt_ar_flags=$AR_FLAGS
- _LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
-
diff --git a/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch b/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch
deleted file mode 100644
index c40a2b711..000000000
--- a/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 18 Sep 2015 10:36:43 +0200
-Subject: [PATCH] libtool: fix GCC linking with -specs=*
-
-References:
-https://bugzilla.redhat.com/show_bug.cgi?id=985592
-
-* build-aux/ltmain.in (func_mode_link): Pass -specs=*
-to the linker, Fedora uses this option for hardening.
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index d5cf07a63f59..0c40da06deb4 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5360,10 +5360,12 @@ func_mode_link ()
- # -tp=* Portland pgcc target processor selection
- # --sysroot=* for sysroot support
- # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+ # -specs=* GCC specs files
- # -stdlib=* select c++ std lib with clang
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+ -specs=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
- func_append compile_command " $arg"
diff --git a/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch b/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch
deleted file mode 100644
index 67e103ca3..000000000
--- a/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Date: Sun, 18 Oct 2015 21:55:39 -0700
-Subject: [PATCH] libtool: fix GCC/clang linking with -fsanitize=*
-
-References:
-https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html
-
-* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the
-linker to allow trivial use of the clang address sanitizer.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Copyright-paperwork-exempt: Yes
----
- build-aux/ltmain.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0c40da06deb4..d063aa44a486 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5362,10 +5362,11 @@ func_mode_link ()
- # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- # -specs=* GCC specs files
- # -stdlib=* select c++ std lib with clang
-+ # -fsanitize=* Clang/GCC memory and address sanitizer
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-- -specs=*)
-+ -specs=*|-fsanitize=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
- func_append compile_command " $arg"
diff --git a/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch b/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch
deleted file mode 100644
index e7c88c60c..000000000
--- a/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 13 Feb 2016 02:14:29 -0500
-Subject: [PATCH] libtool: pass through -fuse-ld flags
-
-Starting with gcc-4.8, there's a -fuse-ld flag that can be used to
-select between bfd & gold. Make sure we pass it through to the
-linking stage.
-
-* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags
-through.
-Copyright-paperwork-exempt: Yes
----
- build-aux/ltmain.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index d063aa44a486..14e45d0b9d07 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5363,10 +5363,11 @@ func_mode_link ()
- # -specs=* GCC specs files
- # -stdlib=* select c++ std lib with clang
- # -fsanitize=* Clang/GCC memory and address sanitizer
-+ # -fuse-ld=* Linker select flags for GCC
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-- -specs=*|-fsanitize=*)
-+ -specs=*|-fsanitize=*|-fuse-ld=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
- func_append compile_command " $arg"
diff --git a/patches/libtool-2.4.6/series b/patches/libtool-2.4.6/series
deleted file mode 100644
index c0b3d421b..000000000
--- a/patches/libtool-2.4.6/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-libool.m4-add-ARFLAGS-variable.patch
-0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch
-0003-libtool-fix-GCC-linking-with-specs.patch
-0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch
-0005-libtool-pass-through-fuse-ld-flags.patch
-# 55967635b8c962a56e9ee2fd8dc06f7d - git-ptx-patches magic
diff --git a/patches/libtremor-1.0.3/0001-HACK-configure.in-remove-extended-OGG-check.patch b/patches/libtremor-2018-03-19-g7c30a6634619/0001-HACK-configure.in-remove-extended-OGG-check.patch
index d0a40ef2a..5d17c6e9a 100644
--- a/patches/libtremor-1.0.3/0001-HACK-configure.in-remove-extended-OGG-check.patch
+++ b/patches/libtremor-2018-03-19-g7c30a6634619/0001-HACK-configure.in-remove-extended-OGG-check.patch
@@ -13,7 +13,7 @@ Tested-by: Juergen Beisert <jbe@pengutronix.de>
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/configure.in b/configure.in
-index e7f5690..6eaf6e4 100644
+index e7f56900295d..6eaf6e418363 100644
--- a/configure.in
+++ b/configure.in
@@ -119,11 +119,7 @@ fi
diff --git a/patches/libtremor-2018-03-19-g7c30a6634619/0002-Only-enable-ARM-assember-on-armel.patch b/patches/libtremor-2018-03-19-g7c30a6634619/0002-Only-enable-ARM-assember-on-armel.patch
new file mode 100644
index 000000000..19f267659
--- /dev/null
+++ b/patches/libtremor-2018-03-19-g7c30a6634619/0002-Only-enable-ARM-assember-on-armel.patch
@@ -0,0 +1,30 @@
+From: Sebastian Ramacher <sramacher@debian.org>
+Date: Sat, 12 Sep 2020 17:48:41 +0200
+Subject: [PATCH] Only enable ARM assember on armel
+
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 6eaf6e418363..a33613e34aab 100644
+--- a/configure.in
++++ b/configure.in
+@@ -48,7 +48,7 @@ cflags_save="$CFLAGS"
+ ldflags_save="$LDFLAGS"
+ if test -z "$GCC"; then
+ case $host in
+- arm-*-*)
++ arm-*-gnueabi)
+ DEBUG="-g -D_ARM_ASSEM_"
+ CFLAGS="-O -D_ARM_ASSEM_"
+ PROFILE="-p -g -O -D_ARM_ASSEM_" ;;
+@@ -60,7 +60,7 @@ if test -z "$GCC"; then
+ else
+
+ case $host in
+- arm-*-*)
++ arm-*-gnueabi)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -D_ARM_ASSEM_"
+ CFLAGS="-O2 -D_ARM_ASSEM_ -fsigned-char"
+ PROFILE="-W -pg -g -O2 -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
diff --git a/patches/gnutls-3.6.16/autogen.sh b/patches/libtremor-2018-03-19-g7c30a6634619/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/gnutls-3.6.16/autogen.sh
+++ b/patches/libtremor-2018-03-19-g7c30a6634619/autogen.sh
diff --git a/patches/libtremor-1.0.3/series b/patches/libtremor-2018-03-19-g7c30a6634619/series
index 75ee87212..12c69a94c 100644
--- a/patches/libtremor-1.0.3/series
+++ b/patches/libtremor-2018-03-19-g7c30a6634619/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-HACK-configure.in-remove-extended-OGG-check.patch
-# 8b861fdf14ed5f27dce4c67d75786cf3 - git-ptx-patches magic
+0002-Only-enable-ARM-assember-on-armel.patch
+# bf1ffccccf3c1c9653f3f1c13bad6006 - git-ptx-patches magic
diff --git a/patches/libuv-v1.34.0/autogen.sh b/patches/libuv-v1.42.0/autogen.sh
index e81262ffe..e81262ffe 100755
--- a/patches/libuv-v1.34.0/autogen.sh
+++ b/patches/libuv-v1.42.0/autogen.sh
diff --git a/patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
index 7204497b3..96bd12dbd 100644
--- a/patches/libxml2-2.9.12/0200-xml2-config-is-not-SYSROOT-aware.patch
+++ b/patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
@@ -10,7 +10,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xml2-config.in b/xml2-config.in
-index cb4aa613a68c..31f9e67a999b 100644
+index 5863ffa04956..b5effdb2d15e 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -1,6 +1,6 @@
diff --git a/patches/libxml2-2.9.12/series b/patches/libxml2-2.9.14/series
index 05ba5ddea..05ba5ddea 100644
--- a/patches/libxml2-2.9.12/series
+++ b/patches/libxml2-2.9.14/series
diff --git a/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
deleted file mode 100644
index ab7227344..000000000
--- a/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Fri, 15 Nov 2019 11:53:11 +0100
-Subject: [PATCH] Fix xml2-config check in configure script
-
-A 'print' option has never been supported. After a recent change to
-libxml2, invalid options cause xml2-config to fail.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 325a7bea0dcf..d6b5594ad477 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable,
- dnl test version and init our variables
- dnl
-
--if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
-+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
- then
- AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION)
- XMLVERS=`$XML_CONFIG --version`
diff --git a/patches/libxslt-1.1.34/autogen.sh b/patches/libxslt-1.1.34/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/libxslt-1.1.34/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/libxslt-1.1.34/series b/patches/libxslt-1.1.34/series
deleted file mode 100644
index 1ede19a8c..000000000
--- a/patches/libxslt-1.1.34/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream --start-number 1
-0001-Fix-xml2-config-check-in-configure-script.patch
-#tag:ptx --start-number 200
-0200-xslt-config-add-SYSROOT-support.patch
-# c8a532c629ee7654cb91733eefc0814b - git-ptx-patches magic
diff --git a/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch
index 1f124a8d6..1f124a8d6 100644
--- a/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch
+++ b/patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch
diff --git a/patches/libxslt-1.1.35/series b/patches/libxslt-1.1.35/series
new file mode 100644
index 000000000..e7aa0f393
--- /dev/null
+++ b/patches/libxslt-1.1.35/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:ptx --start-number 200
+0200-xslt-config-add-SYSROOT-support.patch
+# d971b2e05382256c96c63c656e15719c - git-ptx-patches magic
diff --git a/patches/lxml-4.4.2/series b/patches/lxml-4.4.2/series
deleted file mode 100644
index 13f153f5b..000000000
--- a/patches/lxml-4.4.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-do-not-use-libdirs-from-xslt-config.patch
diff --git a/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch b/patches/lxml-4.8.0/0001-do-not-use-libdirs-from-xslt-config.patch
index c0cea0f16..6246e81bb 100644
--- a/patches/lxml-4.4.2/0001-do-not-use-libdirs-from-xslt-config.patch
+++ b/patches/lxml-4.8.0/0001-do-not-use-libdirs-from-xslt-config.patch
@@ -1,4 +1,3 @@
-From d20f79d5e0d04a243f8bda8ef49e59f8d3afaf9c Mon Sep 17 00:00:00 2001
From: Artur Wiebe <artur@4wiebe.de>
Date: Thu, 30 Aug 2018 10:46:22 +0200
Subject: [PATCH] do not use libdirs from xslt-config
@@ -8,10 +7,10 @@ Subject: [PATCH] do not use libdirs from xslt-config
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/setupinfo.py b/setupinfo.py
-index bdac1d0..87feac7 100644
+index c1247c6d6722..0553703b3bd7 100644
--- a/setupinfo.py
+++ b/setupinfo.py
-@@ -292,10 +292,10 @@ def library_dirs(static_library_dirs):
+@@ -289,10 +289,10 @@ def library_dirs(static_library_dirs):
return static_library_dirs
# filter them from xslt-config --libs
result = []
@@ -26,6 +25,3 @@ index bdac1d0..87feac7 100644
return result
def include_dirs(static_include_dirs):
---
-2.18.0
-
diff --git a/patches/lxml-4.8.0/series b/patches/lxml-4.8.0/series
new file mode 100644
index 000000000..bbe0200e9
--- /dev/null
+++ b/patches/lxml-4.8.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-do-not-use-libdirs-from-xslt-config.patch
+# 0b549a54970ac68107ee4758af10ee0f - git-ptx-patches magic
diff --git a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch b/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
deleted file mode 100644
index 086ec0d81..000000000
--- a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Mon, 7 Dec 2020 11:40:20 -0500
-Subject: [PATCH] pkgconfig: Respect variable ordering when passed as list
-
-This fix a regression introduced in Meson 0.56.0 when using python 3.5.
-Also mention in documentation that using a meson dict does not guarantee
-ordering.
-
-Fixes: #8074.
----
- mesonbuild/interpreter.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
-index 6222f97a71d8..b0cbecc75114 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -2690,7 +2690,7 @@ class Interpreter(InterpreterBase):
- varlist = mesonlib.stringlistify(variables)
- if list_new:
- FeatureNew.single_use('variables as list of strings', '0.56.0', self.subproject)
-- variables = {}
-+ variables = collections.OrderedDict()
- for v in varlist:
- try:
- (key, value) = v.split('=', 1)
diff --git a/patches/meson-0.56.0/series b/patches/meson-0.56.0/series
deleted file mode 100644
index 10eaa5573..000000000
--- a/patches/meson-0.56.0/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:upstream --start-number 1
-0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
-#tag:ptxdist --start-number 100
-0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
-0101-HACK-enable-NEON-only-for-ARMv7.patch
-# a15bcb28786933dffabce202768a0e86 - git-ptx-patches magic
diff --git a/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index ccf5bfc2f..b0319b365 100644
--- a/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -7,14 +7,14 @@ size unnecessarily.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- mesonbuild/linkers.py | 8 ++++++--
+ mesonbuild/linkers/linkers.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
-diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
-index 589945c511ff..59463bdfdcc5 100644
---- a/mesonbuild/linkers.py
-+++ b/mesonbuild/linkers.py
-@@ -605,7 +605,10 @@ class GnuLikeDynamicLinkerMixin:
+diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
+index 334fc4f24e13..9545744b9bca 100644
+--- a/mesonbuild/linkers/linkers.py
++++ b/mesonbuild/linkers/linkers.py
+@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
# Need to deduplicate rpaths, as macOS's install_name_tool
# is *very* allergic to duplicate -delete_rpath arguments
# when calling depfixer on installation.
@@ -26,7 +26,7 @@ index 589945c511ff..59463bdfdcc5 100644
rpath_dirs_to_remove = set()
for p in all_paths:
rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -633,7 +636,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
paths = padding
else:
paths = paths + ':' + padding
diff --git a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
index f6f0dc448..f6c355728 100644
--- a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
-index 4c066fb91339..e4b1824a7087 100644
+index 3339cea5a03f..da2e740d4cd3 100644
--- a/mesonbuild/modules/unstable_simd.py
+++ b/mesonbuild/modules/unstable_simd.py
-@@ -62,6 +62,9 @@ class SimdModule(ExtensionModule):
+@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
continue
iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
args = compiler.get_instruction_set_args(iset)
diff --git a/patches/meson-0.60.3/series b/patches/meson-0.60.3/series
new file mode 100644
index 000000000..7c887e1b3
--- /dev/null
+++ b/patches/meson-0.60.3/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:ptxdist --start-number 1
+0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+0002-HACK-enable-NEON-only-for-ARMv7.patch
+# 0a496d0bc50051baaa87da126e867c5c - git-ptx-patches magic
diff --git a/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
index 707b5a49c..707b5a49c 100644
--- a/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
+++ b/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
diff --git a/patches/ncurses-6.2/series b/patches/ncurses-6.3/series
index fbdd3447d..fbdd3447d 100644
--- a/patches/ncurses-6.2/series
+++ b/patches/ncurses-6.3/series
diff --git a/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch b/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch
deleted file mode 100644
index 2b5ff1bf5..000000000
--- a/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Florian Westphal <fw@strlen.de>
-Date: Wed, 4 Apr 2018 13:53:28 +0200
-Subject: [PATCH] configure: don't enable xtables when --without-xtables is
- passed
-
-AC_ARG_WITH runs this when EITHER --with-foo or --without-foo is given,
-so use 'withval'.
-
-After this patch:
-./configure -> xtables off
-./configure --with-xtables -> xtables on
-./configure --without-xtables -> xtables off (was on).
-
-Reported-by: Alexander Dahl <ada@thorsis.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2d0b1b939a18..74e721cd4691 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,7 +99,7 @@ AM_CONDITIONAL([BUILD_CLI], [test "x$with_cli" != xno])
-
- AC_ARG_WITH([xtables], [AS_HELP_STRING([--with-xtables],
- [Use libxtables for iptables interaction)])],
-- [with_libxtables=yes], [with_libxtables=no])
-+ [with_libxtables=$withval], [with_libxtables=no])
- AS_IF([test "x$with_libxtables" != xno], [
- PKG_CHECK_MODULES([XTABLES], [xtables >= 1.6.1])
- AC_DEFINE([HAVE_LIBXTABLES], [1], [0])
diff --git a/patches/nftables-0.8.3/autogen.sh b/patches/nftables-0.8.3/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/nftables-0.8.3/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/nftables-0.8.3/series b/patches/nftables-0.8.3/series
deleted file mode 100644
index d4fe1dc34..000000000
--- a/patches/nftables-0.8.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure-don-t-enable-xtables-when-without-xtables-.patch
-# 12321dad8667c00b553d2c9b76ee6dd3 - git-ptx-patches magic
diff --git a/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
new file mode 100644
index 000000000..a0f92ba15
--- /dev/null
+++ b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
+Date: Mon, 5 Jul 2021 00:22:46 +0200
+Subject: [PATCH] build: uvwasi honours node_shared_libuv
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix #39248.
+
+PR-URL: https://github.com/nodejs/node/pull/39260
+Reviewed-By: Richard Lau <rlau@redhat.com>
+Reviewed-By: Tobias Nießen <tniessen@tnie.de>
+Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
+Reviewed-By: James M Snell <jasnell@gmail.com>
+---
+ deps/uvwasi/uvwasi.gyp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/deps/uvwasi/uvwasi.gyp b/deps/uvwasi/uvwasi.gyp
+index c07b07b608b7..3ff3daf3a11e 100644
+--- a/deps/uvwasi/uvwasi.gyp
++++ b/deps/uvwasi/uvwasi.gyp
+@@ -14,12 +14,16 @@
+ 'src/uv_mapping.c',
+ 'src/uvwasi.c',
+ ],
+- 'dependencies': [
+- '../uv/uv.gyp:libuv',
+- ],
+ 'direct_dependent_settings': {
+ 'include_dirs': ['include']
+ },
++ 'conditions': [
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [
++ '../uv/uv.gyp:libuv',
++ ],
++ }],
++ ],
+ }
+ ]
+ }
diff --git a/patches/node-v12.16.1/series b/patches/node-v12.16.1/series
index f0162c556..ff8057d57 100644
--- a/patches/node-v12.16.1/series
+++ b/patches/node-v12.16.1/series
@@ -5,4 +5,5 @@
0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
0004-HACK-don-t-add-LD_LIBRARY_PATH-for-external-tools.patch
0005-HACK-run-configure-directly-with-python2.patch
-# c39d7fdc79e6b2f672a807f38ade396e - git-ptx-patches magic
+0006-build-uvwasi-honours-node_shared_libuv.patch
+# c8720e3d38a736f9877911821bd3e666 - git-ptx-patches magic
diff --git a/patches/nss-3.73/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.75/0001-nss-fix-nsinstall-build.patch
index 6787295ce..6787295ce 100644
--- a/patches/nss-3.73/0001-nss-fix-nsinstall-build.patch
+++ b/patches/nss-3.75/0001-nss-fix-nsinstall-build.patch
diff --git a/patches/nss-3.73/0002-add-nss.pc.in.patch b/patches/nss-3.75/0002-add-nss.pc.in.patch
index addc805b5..addc805b5 100644
--- a/patches/nss-3.73/0002-add-nss.pc.in.patch
+++ b/patches/nss-3.75/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.73/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.75/0003-HACK-don-t-build-commands-that-need-zlib.patch
index c32769392..c32769392 100644
--- a/patches/nss-3.73/0003-HACK-don-t-build-commands-that-need-zlib.patch
+++ b/patches/nss-3.75/0003-HACK-don-t-build-commands-that-need-zlib.patch
diff --git a/patches/nss-3.73/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.75/0004-HACK-fix-parallel-building-issue.patch
index b4e5a9f00..b4e5a9f00 100644
--- a/patches/nss-3.73/0004-HACK-fix-parallel-building-issue.patch
+++ b/patches/nss-3.75/0004-HACK-fix-parallel-building-issue.patch
diff --git a/patches/nss-3.73/0005-fix-dependency-generation.patch b/patches/nss-3.75/0005-fix-dependency-generation.patch
index 1192da18b..1192da18b 100644
--- a/patches/nss-3.73/0005-fix-dependency-generation.patch
+++ b/patches/nss-3.75/0005-fix-dependency-generation.patch
diff --git a/patches/nss-3.73/series b/patches/nss-3.75/series
index 534d0d6d6..534d0d6d6 100644
--- a/patches/nss-3.73/series
+++ b/patches/nss-3.75/series
diff --git a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch b/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch
deleted file mode 100644
index 5c70b10a2..000000000
--- a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 23 Oct 2018 00:21:54 +0200
-Subject: [PATCH] make the build reproducible
-
-Don't include the current date / time into the build.
-
-Original patch from Debian.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- scripts/build/mkver.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/scripts/build/mkver.in b/scripts/build/mkver.in
-index 3aef1c816a7f..badd2cda8c1f 100644
---- a/scripts/build/mkver.in
-+++ b/scripts/build/mkver.in
-@@ -15,8 +15,6 @@ case "@VER_SUFFIX@" in
- *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;;
- esac
-
--ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
--
- if [ ! -f .version ]; then
- echo 0 > .version
- fi
diff --git a/patches/ntp-4.2.8p12/series b/patches/ntp-4.2.8p12/series
deleted file mode 100644
index 6b9bdfd27..000000000
--- a/patches/ntp-4.2.8p12/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-the-build-reproducible.patch
-# a698708e9f96ed91827a81d376db1955 - git-ptx-patches magic
diff --git a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
new file mode 100644
index 000000000..017b4d41f
--- /dev/null
+++ b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
@@ -0,0 +1,29 @@
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+[Copied from https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch]
+Signed-off-by: Alexey Brodkin <abrokdin@synopsys.com>
+---
+ libntp/work_thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libntp/work_thread.c b/libntp/work_thread.c
+index 03a5647bea36..3ddd751557e0 100644
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE (64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
diff --git a/patches/ntp-4.2.8p15/series b/patches/ntp-4.2.8p15/series
new file mode 100644
index 000000000..7a2de77a2
--- /dev/null
+++ b/patches/ntp-4.2.8p15/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
+# e85ebd807ca50b5d07918a17d9595773 - git-ptx-patches magic
diff --git a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch b/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
deleted file mode 100644
index 2c88b429b..000000000
--- a/patches/numpy-1.17.4/0001-remove-sse2-flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4708211dc86d396f30c54bf71bc7194338272637 Mon Sep 17 00:00:00 2001
-From: mattip <matti.picus@gmail.com>
-Date: Mon, 11 Nov 2019 12:48:00 -0700
-Subject: [PATCH] BUILD: remove SSE2 flag from numpy.random builds
-
-This is a backport of https://github.com/numpy/numpy/pull/14878
-
----
- numpy/random/setup.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/numpy/random/setup.py b/numpy/random/setup.py
-index ca01250f437..f9059d7d76a 100644
---- a/numpy/random/setup.py
-+++ b/numpy/random/setup.py
-@@ -49,11 +49,6 @@
- elif not is_msvc:
- # Some bit generators require c99
- EXTRA_COMPILE_ARGS += ['-std=c99']
-- INTEL_LIKE = any(arch in platform.machine()
-- for arch in ('x86', 'i686', 'i386', 'amd64'))
-- if INTEL_LIKE:
-- # Assumes GCC or GCC-like compiler
-- EXTRA_COMPILE_ARGS += ['-msse2']
-
- # Use legacy integer variable sizes
- LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
diff --git a/patches/numpy-1.17.4/series b/patches/numpy-1.17.4/series
deleted file mode 100644
index 64785c945..000000000
--- a/patches/numpy-1.17.4/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-remove-sse2-flag.patch
diff --git a/patches/openssl-1.1.1l/0001-debian-targets.patch b/patches/openssl-1.1.1o/0001-debian-targets.patch
index 12b4fbc8e..465b5fd3f 100644
--- a/patches/openssl-1.1.1l/0001-debian-targets.patch
+++ b/patches/openssl-1.1.1o/0001-debian-targets.patch
@@ -2,20 +2,20 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
Date: Sun, 5 Nov 2017 15:09:09 +0100
Subject: [PATCH] debian-targets
-Imported from openssl_1.1.1l-1.debian.tar.xz
+Imported from openssl_1.1.1m-1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- Configurations/20-debian.conf | 210 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 210 insertions(+)
+ Configurations/20-debian.conf | 213 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 213 insertions(+)
create mode 100644 Configurations/20-debian.conf
diff --git a/Configurations/20-debian.conf b/Configurations/20-debian.conf
new file mode 100644
-index 000000000000..a3d5f68d36aa
+index 000000000000..49600280bd6c
--- /dev/null
+++ b/Configurations/20-debian.conf
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,213 @@
+my %targets = (
+ "debian" => {
+ cflags => add("-Wa,--noexecstack -Wall"),
@@ -31,6 +31,9 @@ index 000000000000..a3d5f68d36aa
+ inherit_from => [ "debian-alpha" ],
+ cflags => add("-mcpu=ev5"),
+ },
++ "debian-arc" => {
++ inherit_from => [ "linux-generic32", "debian" ],
++ },
+ "debian-arm64" => {
+ inherit_from => [ "linux-aarch64", "debian" ],
+ },
diff --git a/patches/openssl-1.1.1l/0002-pic.patch b/patches/openssl-1.1.1o/0002-pic.patch
index 20cf5b242..96385595f 100644
--- a/patches/openssl-1.1.1l/0002-pic.patch
+++ b/patches/openssl-1.1.1o/0002-pic.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
Date: Sun, 5 Nov 2017 15:09:09 +0100
Subject: [PATCH] pic
-Imported from openssl_1.1.1l-1.debian.tar.xz
+Imported from openssl_1.1.1m-1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.1.1l/0003-Set-systemwide-default-settings-for-libssl-users.patch b/patches/openssl-1.1.1o/0003-Set-systemwide-default-settings-for-libssl-users.patch
index 8d0baf7cb..dd3e4304a 100644
--- a/patches/openssl-1.1.1l/0003-Set-systemwide-default-settings-for-libssl-users.patch
+++ b/patches/openssl-1.1.1o/0003-Set-systemwide-default-settings-for-libssl-users.patch
@@ -10,7 +10,7 @@ security level to the 112 bit security level.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Imported from openssl_1.1.1l-1.debian.tar.xz
+Imported from openssl_1.1.1m-1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.1.1l/series b/patches/openssl-1.1.1o/series
index 2bfca5ade..2bfca5ade 100644
--- a/patches/openssl-1.1.1l/series
+++ b/patches/openssl-1.1.1o/series
diff --git a/patches/pciutils-3.8.0/0001-work-around-build-issue-with-gcc-9.x.patch b/patches/pciutils-3.8.0/0001-work-around-build-issue-with-gcc-9.x.patch
new file mode 100644
index 000000000..46b492476
--- /dev/null
+++ b/patches/pciutils-3.8.0/0001-work-around-build-issue-with-gcc-9.x.patch
@@ -0,0 +1,47 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 8 May 2022 09:34:43 +0200
+Subject: [PATCH] work around build issue with gcc <= 9.x
+
+Without this, building fails with:
+
+...-gcc -O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -fPIC -fvisibility=hidden -c -o filter.o filter.c
+/tmp/ccwDUrvo.s: Assembler messages:
+/tmp/ccwDUrvo.s:6: Error: multiple versions [`pci_filter_init@@LIBPCI_3.8'|`pci_filter_init@LIBPCI_3.3'] for symbol `pci_filter_init_v38'
+/tmp/ccwDUrvo.s:8: Error: multiple versions [`pci_filter_parse_slot@@LIBPCI_3.8'|`pci_filter_parse_slot@LIBPCI_3.3'] for symbol `pci_filter_parse_slot_v38'
+/tmp/ccwDUrvo.s:10: Error: multiple versions [`pci_filter_parse_id@@LIBPCI_3.8'|`pci_filter_parse_id@LIBPCI_3.3'] for symbol `pci_filter_parse_id_v38'
+/tmp/ccwDUrvo.s:12: Error: multiple versions [`pci_filter_match@@LIBPCI_3.8'|`pci_filter_match@LIBPCI_3.3'] for symbol `pci_filter_match_v38'
+make[1]: *** [<builtin>: filter.o] Error 1
+
+See also:
+https://github.com/pciutils/pciutils/issues/98
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ lib/filter.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/filter.c b/lib/filter.c
+index b881b6bc9083..bc34e8c2bab9 100644
+--- a/lib/filter.c
++++ b/lib/filter.c
+@@ -304,20 +304,16 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d)
+
+ STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f));
+ SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0);
+-SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3);
+ SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8);
+
+ STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str));
+ SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0);
+-SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3);
+ SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8);
+
+ STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str));
+ SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0);
+-SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3);
+ SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8);
+
+ STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d));
+ SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0);
+-SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3);
+ SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8);
diff --git a/patches/pciutils-3.8.0/series b/patches/pciutils-3.8.0/series
new file mode 100644
index 000000000..5a33b91d4
--- /dev/null
+++ b/patches/pciutils-3.8.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-work-around-build-issue-with-gcc-9.x.patch
+# eb31c34f54f4dccb7d7cc774287fa37b - git-ptx-patches magic
diff --git a/patches/polkit-0.105/0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch b/patches/polkit-0.105/0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch
index 0dcef786f..2fccdb7b7 100644
--- a/patches/polkit-0.105/0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch
+++ b/patches/polkit-0.105/0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch
@@ -9,7 +9,7 @@ that by writing to a temporary string buffer.
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
Origin: upstream, 0.106, commit:14121fda7e4fa9463c66ce419cc32be7e7f3b535
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0002-0.107-Try-harder-to-look-up-the-right-localization.patch b/patches/polkit-0.105/0002-0.107-Try-harder-to-look-up-the-right-localization.patch
new file mode 100644
index 000000000..494675fc0
--- /dev/null
+++ b/patches/polkit-0.105/0002-0.107-Try-harder-to-look-up-the-right-localization.patch
@@ -0,0 +1,57 @@
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 27 Jun 2012 20:28:00 -0400
+Subject: [PATCH] 0.107: Try harder to look up the right localization
+
+The code for looking up localized strings for action descriptions
+was manually trying to break locale names into pieces, but didn't
+get it right for e.g. zh_CN.utf-8. Instead, use the GLib function
+g_get_locale_variants(), which handles this (and more). This fixes
+the translation problem reported in
+https://bugzilla.gnome.org/show_bug.cgi?id=665497
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+(cherry picked from commit facadfb5c8c52ba45fd20ffe3b6d3ddd4208a427)
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkitbackend/polkitbackendactionpool.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c
+index e3ed38d4a81e..0af00109e175 100644
+--- a/src/polkitbackend/polkitbackendactionpool.c
++++ b/src/polkitbackend/polkitbackendactionpool.c
+@@ -1108,7 +1108,7 @@ _localize (GHashTable *translations,
+ const gchar *lang)
+ {
+ const gchar *result;
+- gchar lang2[256];
++ gchar **langs;
+ guint n;
+
+ if (lang == NULL)
+@@ -1123,16 +1123,14 @@ _localize (GHashTable *translations,
+ goto out;
+
+ /* we could have a translation for 'da' but lang=='da_DK'; cut off the last part and try again */
+- strncpy (lang2, lang, sizeof (lang2));
+- for (n = 0; lang2[n] != '\0'; n++)
++ langs = g_get_locale_variants (lang);
++ for (n = 0; langs[n] != NULL; n++)
+ {
+- if (lang2[n] == '_')
+- {
+- lang2[n] = '\0';
+- break;
+- }
++ result = (const char *) g_hash_table_lookup (translations, (void *) langs[n]);
++ if (result != NULL)
++ break;
+ }
+- result = (const char *) g_hash_table_lookup (translations, (void *) lang2);
++ g_strfreev (langs);
+ if (result != NULL)
+ goto out;
+
diff --git a/patches/polkit-0.105/0002-0.108-build-Fix-.gir-generation-for-parallel-make.patch b/patches/polkit-0.105/0003-0.108-build-Fix-.gir-generation-for-parallel-make.patch
index 6f8991262..e5e418b28 100644
--- a/patches/polkit-0.105/0002-0.108-build-Fix-.gir-generation-for-parallel-make.patch
+++ b/patches/polkit-0.105/0003-0.108-build-Fix-.gir-generation-for-parallel-make.patch
@@ -9,7 +9,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=57077
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
Bug-Debian: https://bugs.debian.org/894205
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0004-0.108-PolkitAgent-Avoid-crashing-if-initializing-the.patch b/patches/polkit-0.105/0004-0.108-PolkitAgent-Avoid-crashing-if-initializing-the.patch
new file mode 100644
index 000000000..60e83b052
--- /dev/null
+++ b/patches/polkit-0.105/0004-0.108-PolkitAgent-Avoid-crashing-if-initializing-the.patch
@@ -0,0 +1,38 @@
+From: Adam Jackson <ajax@nwnk.net>
+Date: Tue, 9 Oct 2012 14:08:24 -0400
+Subject: [PATCH] 0.108: PolkitAgent: Avoid crashing if initializing the server
+ object fails
+
+Note that otherwise we return a freed server object. Since later in
+polkit_agent_listener_register_with_options we check against NULL to
+determine failure, this makes for sad times later when we call
+server_free() on it again.
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+Origin: 0.108, commit:59f2d96ce3ac63173669f299a9453a7bf5e70a70
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55776
+Bug-Debian: https://bugs.debian.org/923046
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkitagent/polkitagentlistener.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
+index 0d97501a028c..5bddd035cc0e 100644
+--- a/src/polkitagent/polkitagentlistener.c
++++ b/src/polkitagent/polkitagentlistener.c
+@@ -260,10 +260,9 @@ server_new (PolkitSubject *subject,
+ if (!server_init_sync (server, cancellable, error))
+ {
+ server_free (server);
+- goto out;
++ return NULL;
+ }
+
+- out:
+ return server;
+ }
+
diff --git a/patches/polkit-0.105/0003-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch b/patches/polkit-0.105/0005-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch
index 53082a771..7395c97ad 100644
--- a/patches/polkit-0.105/0003-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch
+++ b/patches/polkit-0.105/0005-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch
@@ -20,7 +20,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51623
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
Origin: upstream, 0.110, commit:d6acecdd0ebb42e28ff28e04e0207cb01fa20910
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0004-0.110-Fix-build-on-GNU-Hurd.patch b/patches/polkit-0.105/0006-0.110-Fix-build-on-GNU-Hurd.patch
index c58fd302c..f6a6db8ce 100644
--- a/patches/polkit-0.105/0004-0.110-Fix-build-on-GNU-Hurd.patch
+++ b/patches/polkit-0.105/0006-0.110-Fix-build-on-GNU-Hurd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 0.110: Fix build on GNU Hurd
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35685
Applied-upstream: 0.110, commit:d6de13e12379826af8ca9355a32da48707b9831f
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0005-0.111-pkexec-Set-process-environment-from-pam_getenv.patch b/patches/polkit-0.105/0007-0.111-pkexec-Set-process-environment-from-pam_getenv.patch
index 4f4fa151a..e982c4622 100644
--- a/patches/polkit-0.105/0005-0.111-pkexec-Set-process-environment-from-pam_getenv.patch
+++ b/patches/polkit-0.105/0007-0.111-pkexec-Set-process-environment-from-pam_getenv.patch
@@ -10,7 +10,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=62016
Applied-upstream: 0.111, commit:5aef9722c15a350fbf8b20a3b58419f156cc7c98
Bug-Ubuntu: https://bugs.launchpad.net/bugs/982684
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0006-0.111-Fix-a-memory-leak.patch b/patches/polkit-0.105/0008-0.111-Fix-a-memory-leak.patch
index c92b7f595..ac33745c1 100644
--- a/patches/polkit-0.105/0006-0.111-Fix-a-memory-leak.patch
+++ b/patches/polkit-0.105/0008-0.111-Fix-a-memory-leak.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 0.111: Fix a memory leak
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64336
Origin: upstream, 0.111, commit:d7b6ab40b586c255c49aba22f558eb6602c88b1e
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0007-0.112-Use-GOnce-for-interface-type-registration.patch b/patches/polkit-0.105/0009-0.112-Use-GOnce-for-interface-type-registration.patch
index 907510e9e..c6db4a2ef 100644
--- a/patches/polkit-0.105/0007-0.112-Use-GOnce-for-interface-type-registration.patch
+++ b/patches/polkit-0.105/0009-0.112-Use-GOnce-for-interface-type-registration.patch
@@ -12,7 +12,7 @@ Thanks to Hans de Goede for spotting this!
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65130
Origin: upstream, 0.112, commit:20ad116a6582e57d20f9d8197758947918753a4c
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0008-0.112-polkitunixprocess-Deprecate-racy-APIs.patch b/patches/polkit-0.105/0010-0.112-polkitunixprocess-Deprecate-racy-APIs.patch
index c39c0486c..9a140a29e 100644
--- a/patches/polkit-0.105/0008-0.112-polkitunixprocess-Deprecate-racy-APIs.patch
+++ b/patches/polkit-0.105/0010-0.112-polkitunixprocess-Deprecate-racy-APIs.patch
@@ -8,7 +8,7 @@ subject to clients exec()ing setuid binaries after the fact.
Origin: upstream, 0.112, commit:08291789a1f99d4ab29c74c39344304bcca43023
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0009-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch b/patches/polkit-0.105/0011-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch
index 198ddc639..92f116ff8 100644
--- a/patches/polkit-0.105/0009-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch
+++ b/patches/polkit-0.105/0011-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch
@@ -17,7 +17,7 @@ test x$pkcheck_supports_uid = xyes
Origin: upstream, 0.112, commit:3968411b0c7ba193f9b9276ec911692aec248608
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0012-0.114-polkitpermission-Fix-a-memory-leak-on-authorit.patch b/patches/polkit-0.105/0012-0.114-polkitpermission-Fix-a-memory-leak-on-authorit.patch
new file mode 100644
index 000000000..a2476fb4e
--- /dev/null
+++ b/patches/polkit-0.105/0012-0.114-polkitpermission-Fix-a-memory-leak-on-authorit.patch
@@ -0,0 +1,29 @@
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Thu, 2 Mar 2017 14:50:31 +0100
+Subject: [PATCH] 0.114: polkitpermission: Fix a memory leak on authority
+ changes
+
+Signed-off-by: Rui Matos <tiagomatos@gmail.com>
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99741
+Origin: upstream, 0.114, commit:df6488c0a5b2a6c7a2d4f6a55008263635c5571b
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkit/polkitpermission.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
+index 22d195fcdc60..be794cb3487a 100644
+--- a/src/polkit/polkitpermission.c
++++ b/src/polkit/polkitpermission.c
+@@ -454,6 +454,7 @@ changed_check_cb (GObject *source_object,
+ if (result != NULL)
+ {
+ process_result (permission, result);
++ g_object_unref (result);
+ }
+ else
+ {
diff --git a/patches/polkit-0.105/0010-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch b/patches/polkit-0.105/0013-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch
index b1f29326e..41fbf6bd7 100644
--- a/patches/polkit-0.105/0010-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch
+++ b/patches/polkit-0.105/0013-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch
@@ -12,7 +12,7 @@ in this branch]
Origin: upstream, 0.113, commit:6d3d0a8ffb0fd8ae59eb35593b305ec87da8858d
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -20,7 +20,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
-index 22d195fcdc60..f8a666e81913 100644
+index be794cb3487a..f264094db206 100644
--- a/src/polkit/polkitpermission.c
+++ b/src/polkit/polkitpermission.c
@@ -122,7 +122,7 @@ polkit_permission_constructed (GObject *object)
diff --git a/patches/polkit-0.105/0011-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch b/patches/polkit-0.105/0014-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch
index a270de1fe..9990ebe1e 100644
--- a/patches/polkit-0.105/0011-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch
+++ b/patches/polkit-0.105/0014-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch
@@ -13,7 +13,7 @@ See http://lists.freedesktop.org/archives/systemd-devel/2013-November/014370.htm
Origin: upstream, 0.113, commit:8635ffc16aeff6a07d675f861fe0dea03ea81d7e
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0012-0.113-PolkitAgentSession-fix-race-between-child-and-.patch b/patches/polkit-0.105/0015-0.113-PolkitAgentSession-fix-race-between-child-and-.patch
index d91e0f09c..2ea725d4e 100644
--- a/patches/polkit-0.105/0012-0.113-PolkitAgentSession-fix-race-between-child-and-.patch
+++ b/patches/polkit-0.105/0015-0.113-PolkitAgentSession-fix-race-between-child-and-.patch
@@ -21,7 +21,7 @@ Bug: http://bugs.freedesktop.org/show_bug.cgi?id=30515
Bug-Ubuntu: https://launchpad.net/bugs/649939
Bug-Ubuntu: https://launchpad.net/bugs/445303
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0013-0.113-polkitd-Fix-problem-with-removing-non-existent.patch b/patches/polkit-0.105/0016-0.113-polkitd-Fix-problem-with-removing-non-existent.patch
index 9c6e5ec30..6113b2980 100644
--- a/patches/polkit-0.105/0013-0.113-polkitd-Fix-problem-with-removing-non-existent.patch
+++ b/patches/polkit-0.105/0016-0.113-polkitd-Fix-problem-with-removing-non-existent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 0.113: polkitd: Fix problem with removing non-existent source
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77167
Applied-upstream: 0.113, commit:3ca4e00c7e003ea80aa96b499bc7cd83246d7108
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0014-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch b/patches/polkit-0.105/0017-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch
index e10a19d58..ae741e4a6 100644
--- a/patches/polkit-0.105/0014-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch
+++ b/patches/polkit-0.105/0017-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch
@@ -11,7 +11,7 @@ removes duplicated code.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69538
Origin: upstream, 0.113, commit:904d8404d93dec45fce3b719eb1a626acc6b8a73
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0015-0.113-Fixed-compilation-problem-in-the-backend.patch b/patches/polkit-0.105/0018-0.113-Fixed-compilation-problem-in-the-backend.patch
index a61daa192..0dff05b52 100644
--- a/patches/polkit-0.105/0015-0.113-Fixed-compilation-problem-in-the-backend.patch
+++ b/patches/polkit-0.105/0018-0.113-Fixed-compilation-problem-in-the-backend.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] 0.113: Fixed compilation problem in the backend
Origin: upstream, 0.113, commit: dbbb7dc60abdd970af0a8fae404484181fa909c9
Bug-Debian: https://bugs.debian.org/798769
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0016-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch b/patches/polkit-0.105/0019-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch
index de3da552f..ee248d05e 100644
--- a/patches/polkit-0.105/0016-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch
+++ b/patches/polkit-0.105/0019-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch
@@ -7,7 +7,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71458
Origin: upstream, 0.113, commit: 145d43b9c891f248ad68ebe597cb151a865bdb3a
Bug-Debian: https://bugs.debian.org/798769
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0017-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch b/patches/polkit-0.105/0020-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch
index 756701aa4..e462b6983 100644
--- a/patches/polkit-0.105/0017-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch
+++ b/patches/polkit-0.105/0020-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch
@@ -11,7 +11,7 @@ This is just a code cleanup.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69538
Origin: upstream, 0.113, commit:26d0c0578211fb96fc8fe75572aa11ad6ecbf9b8
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0021-0.113-PolkitSystemBusName-Retrieve-both-pid-and-uid.patch b/patches/polkit-0.105/0021-0.113-PolkitSystemBusName-Retrieve-both-pid-and-uid.patch
new file mode 100644
index 000000000..4284c9bd1
--- /dev/null
+++ b/patches/polkit-0.105/0021-0.113-PolkitSystemBusName-Retrieve-both-pid-and-uid.patch
@@ -0,0 +1,239 @@
+From: Colin Walters <walters@verbum.org>
+Date: Sat, 9 Nov 2013 09:32:52 -0500
+Subject: [PATCH] 0.113: PolkitSystemBusName: Retrieve both pid and uid
+
+For polkit_system_bus_name_get_process_sync(), as pointed out by
+Miloslav Trmac, we can securely retrieve the owner uid as well from
+the system bus, rather than (racily) looking it up internally.
+
+This avoids use of a deprecated API.
+
+However, this is not a security fix because nothing in the polkit
+codebase itself actually retrieves the uid from the result of this API
+call. But, it might be useful in the future.
+
+Origin: upstream, 0.113, commit:bfa5036bfb93582c5a87c44b847957479d911e38
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkit/polkitsystembusname.c | 171 +++++++++++++++++++++----------
+ 1 file changed, 118 insertions(+), 53 deletions(-)
+
+diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
+index 51e4a694aa38..8daa12cb9093 100644
+--- a/src/polkit/polkitsystembusname.c
++++ b/src/polkit/polkitsystembusname.c
+@@ -341,6 +341,116 @@ subject_iface_init (PolkitSubjectIface *subject_iface)
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
++typedef struct {
++ GError **error;
++ guint retrieved_uid : 1;
++ guint retrieved_pid : 1;
++ guint caught_error : 1;
++
++ guint32 uid;
++ guint32 pid;
++} AsyncGetBusNameCredsData;
++
++static void
++on_retrieved_unix_uid_pid (GObject *src,
++ GAsyncResult *res,
++ gpointer user_data)
++{
++ AsyncGetBusNameCredsData *data = user_data;
++ GVariant *v;
++
++ v = g_dbus_connection_call_finish ((GDBusConnection*)src, res,
++ data->caught_error ? NULL : data->error);
++ if (!v)
++ {
++ data->caught_error = TRUE;
++ }
++ else
++ {
++ guint32 value;
++ g_variant_get (v, "(u)", &value);
++ g_variant_unref (v);
++ if (!data->retrieved_uid)
++ {
++ data->retrieved_uid = TRUE;
++ data->uid = value;
++ }
++ else
++ {
++ g_assert (!data->retrieved_pid);
++ data->retrieved_pid = TRUE;
++ data->pid = value;
++ }
++ }
++}
++
++static gboolean
++polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus_name,
++ guint32 *out_uid,
++ guint32 *out_pid,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret = FALSE;
++ AsyncGetBusNameCredsData data = { 0, };
++ GDBusConnection *connection = NULL;
++ GMainContext *tmp_context = NULL;
++
++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
++ if (connection == NULL)
++ goto out;
++
++ data.error = error;
++
++ tmp_context = g_main_context_new ();
++ g_main_context_push_thread_default (tmp_context);
++
++ /* Do two async calls as it's basically as fast as one sync call.
++ */
++ g_dbus_connection_call (connection,
++ "org.freedesktop.DBus", /* name */
++ "/org/freedesktop/DBus", /* object path */
++ "org.freedesktop.DBus", /* interface name */
++ "GetConnectionUnixUser", /* method */
++ g_variant_new ("(s)", system_bus_name->name),
++ G_VARIANT_TYPE ("(u)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ cancellable,
++ on_retrieved_unix_uid_pid,
++ &data);
++ g_dbus_connection_call (connection,
++ "org.freedesktop.DBus", /* name */
++ "/org/freedesktop/DBus", /* object path */
++ "org.freedesktop.DBus", /* interface name */
++ "GetConnectionUnixProcessID", /* method */
++ g_variant_new ("(s)", system_bus_name->name),
++ G_VARIANT_TYPE ("(u)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ cancellable,
++ on_retrieved_unix_uid_pid,
++ &data);
++
++ while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
++ g_main_context_iteration (tmp_context, TRUE);
++
++ if (out_uid)
++ *out_uid = data.uid;
++ if (out_pid)
++ *out_pid = data.pid;
++ ret = TRUE;
++ out:
++ if (tmp_context)
++ {
++ g_main_context_pop_thread_default (tmp_context);
++ g_main_context_unref (tmp_context);
++ }
++ if (connection != NULL)
++ g_object_unref (connection);
++ return ret;
++}
++
+ /**
+ * polkit_system_bus_name_get_process_sync:
+ * @system_bus_name: A #PolkitSystemBusName.
+@@ -357,43 +467,21 @@ polkit_system_bus_name_get_process_sync (PolkitSystemBusName *system_bus_name,
+ GCancellable *cancellable,
+ GError **error)
+ {
+- GDBusConnection *connection;
+- PolkitSubject *ret;
+- GVariant *result;
++ PolkitSubject *ret = NULL;
+ guint32 pid;
++ guint32 uid;
+
+ g_return_val_if_fail (POLKIT_IS_SYSTEM_BUS_NAME (system_bus_name), NULL);
+ g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+- ret = NULL;
+-
+- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
+- if (connection == NULL)
++ if (!polkit_system_bus_name_get_creds_sync (system_bus_name, &uid, &pid,
++ cancellable, error))
+ goto out;
+
+- result = g_dbus_connection_call_sync (connection,
+- "org.freedesktop.DBus", /* name */
+- "/org/freedesktop/DBus", /* object path */
+- "org.freedesktop.DBus", /* interface name */
+- "GetConnectionUnixProcessID", /* method */
+- g_variant_new ("(s)", system_bus_name->name),
+- G_VARIANT_TYPE ("(u)"),
+- G_DBUS_CALL_FLAGS_NONE,
+- -1,
+- cancellable,
+- error);
+- if (result == NULL)
+- goto out;
+-
+- g_variant_get (result, "(u)", &pid);
+- g_variant_unref (result);
+-
+- ret = polkit_unix_process_new (pid);
++ ret = polkit_unix_process_new_for_owner (pid, 0, uid);
+
+ out:
+- if (connection != NULL)
+- g_object_unref (connection);
+ return ret;
+ }
+
+@@ -413,42 +501,19 @@ polkit_system_bus_name_get_user_sync (PolkitSystemBusName *system_bus_name,
+ GCancellable *cancellable,
+ GError **error)
+ {
+- GDBusConnection *connection;
+- PolkitUnixUser *ret;
+- GVariant *result;
++ PolkitUnixUser *ret = NULL;
+ guint32 uid;
+
+ g_return_val_if_fail (POLKIT_IS_SYSTEM_BUS_NAME (system_bus_name), NULL);
+ g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+- ret = NULL;
+-
+- connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
+- if (connection == NULL)
+- goto out;
+-
+- result = g_dbus_connection_call_sync (connection,
+- "org.freedesktop.DBus", /* name */
+- "/org/freedesktop/DBus", /* object path */
+- "org.freedesktop.DBus", /* interface name */
+- "GetConnectionUnixUser", /* method */
+- g_variant_new ("(s)", system_bus_name->name),
+- G_VARIANT_TYPE ("(u)"),
+- G_DBUS_CALL_FLAGS_NONE,
+- -1,
+- cancellable,
+- error);
+- if (result == NULL)
++ if (!polkit_system_bus_name_get_creds_sync (system_bus_name, &uid, NULL,
++ cancellable, error))
+ goto out;
+
+- g_variant_get (result, "(u)", &uid);
+- g_variant_unref (result);
+-
+ ret = (PolkitUnixUser*)polkit_unix_user_new (uid);
+
+ out:
+- if (connection != NULL)
+- g_object_unref (connection);
+ return ret;
+ }
diff --git a/patches/polkit-0.105/0018-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch b/patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch
index ffd729a55..3a9834659 100644
--- a/patches/polkit-0.105/0018-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch
+++ b/patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch
@@ -17,7 +17,7 @@ Applied-upstream: 0.113, commit:a68f5dfd7662767b7b9822090b70bc5bd145c50c
[smcv: backport configure.ac changes; fail with #error if the required
API is not found]
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0019-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch b/patches/polkit-0.105/0023-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch
index 65708c9d5..68b746587 100644
--- a/patches/polkit-0.105/0019-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch
+++ b/patches/polkit-0.105/0023-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch
@@ -17,7 +17,7 @@ commit is both user-friendly and adding some hardening.)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83093
Origin: upstream, 0.113, commit:6c992bc8aefa195a41eaa41c07f46f17de18e25c
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0020-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch b/patches/polkit-0.105/0024-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch
index 6b5668119..60e470f64 100644
--- a/patches/polkit-0.105/0020-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch
+++ b/patches/polkit-0.105/0024-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch
@@ -10,7 +10,7 @@ patch fixed reference counting and following memory leak.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88288
Origin: upstream, 0.113, commit:f4d71e0de885010494b8b0b8d62ca910011d7544
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0021-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch b/patches/polkit-0.105/0025-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch
index 688d87e55..722826680 100644
--- a/patches/polkit-0.105/0021-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch
+++ b/patches/polkit-0.105/0025-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch
@@ -23,7 +23,7 @@ Reviewed-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Colin Walters <walters@redhat.com>
Origin: upstream, 0.113, commit:48e646918efb2bf0b3b505747655726d7869f31c
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch b/patches/polkit-0.105/0026-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch
index 6f10b2954..8103d68a5 100644
--- a/patches/polkit-0.105/0022-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch
+++ b/patches/polkit-0.105/0026-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch
@@ -25,7 +25,7 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76358
Applied-upstream: 0.113, commit:a29653ffa99e0809e15aa34afcd7b2df8593871c
Bug-Debian: https://bugs.debian.org/779988
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0023-0.113-Fix-a-possible-NULL-dereference.patch b/patches/polkit-0.105/0027-0.113-Fix-a-possible-NULL-dereference.patch
index 5bcc45010..72662a9fc 100644
--- a/patches/polkit-0.105/0023-0.113-Fix-a-possible-NULL-dereference.patch
+++ b/patches/polkit-0.105/0027-0.113-Fix-a-possible-NULL-dereference.patch
@@ -13,7 +13,7 @@ handle it also when actually using the value.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80767
Origin: upstream, 0.113, commit:6109543303def367b84eaac97d2ff9cefe735efb
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0024-0.113-Remove-a-redundant-assignment.patch b/patches/polkit-0.105/0028-0.113-Remove-a-redundant-assignment.patch
index aab9d157d..be48b59de 100644
--- a/patches/polkit-0.105/0024-0.113-Remove-a-redundant-assignment.patch
+++ b/patches/polkit-0.105/0028-0.113-Remove-a-redundant-assignment.patch
@@ -8,7 +8,7 @@ Instead of a nonsensical (data = data), use the more customary
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80767
Origin: upstream, 0.113, commit:37143eb06cb0c4dffca67079dd1c10c5b191b6a7
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0025-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch b/patches/polkit-0.105/0029-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch
index eca000906..2be9ec217 100644
--- a/patches/polkit-0.105/0025-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch
+++ b/patches/polkit-0.105/0029-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch
@@ -14,7 +14,7 @@ __import__('gi.repository.GLib', globals(), locals(),
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90877
Origin: upstream, 0.113, commit:2c8738941be18ef05ce724df46547f41dbc02fb5
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0026-0.113-Fix-a-crash-when-two-authentication-requests-a.patch b/patches/polkit-0.105/0030-0.113-Fix-a-crash-when-two-authentication-requests-a.patch
index 46dd4293d..540ce6f36 100644
--- a/patches/polkit-0.105/0026-0.113-Fix-a-crash-when-two-authentication-requests-a.patch
+++ b/patches/polkit-0.105/0030-0.113-Fix-a-crash-when-two-authentication-requests-a.patch
@@ -15,7 +15,7 @@ an appropriate error code, so the g_assert was unnecessary.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90879
Origin: upstream, 0.113, commit:e2d2fafd106624ddfea4b17d3f40704b2031c00b
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0027-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch b/patches/polkit-0.105/0031-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch
index 612bc4ef7..4ada7fb83 100644
--- a/patches/polkit-0.105/0027-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch
+++ b/patches/polkit-0.105/0031-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch
@@ -45,7 +45,7 @@ Signed-off-by: Colin Walters <walters@redhat.com>
Origin: upstream, 0.113, commit:ea544ffc18405237ccd95d28d7f45afef49aca17
Bug-Debian: https://bugs.debian.org/796134
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0028-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch b/patches/polkit-0.105/0032-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch
index 871bf9fbc..9d58ce2fe 100644
--- a/patches/polkit-0.105/0028-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch
+++ b/patches/polkit-0.105/0032-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch
@@ -44,7 +44,7 @@ Signed-off-by: Colin Walters <walters@redhat.com>
Origin: upstream, 0.113, commit:493aa5dc1d278ab9097110c1262f5229bbaf1766
Bug-Debian: https://bugs.debian.org/796134
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0029-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch b/patches/polkit-0.105/0033-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch
index ff1e8bd29..f48dc71ea 100644
--- a/patches/polkit-0.105/0029-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch
+++ b/patches/polkit-0.105/0033-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch
@@ -19,7 +19,7 @@ Reviewed-by: Colin Walters <walters@redhat.com>
Origin: upstream, 0.113, commit:fb5076b7c05d01a532d593a4079a29cf2d63a228
Bug-Debian: https://bugs.debian.org/796134
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -235,7 +235,7 @@ index f45abc4ad946..4e882e6412ea 100644
* polkit_authority_register_authentication_agent_with_options() for the
* asynchronous version.
diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
-index 0d97501a028c..10dbfb9c0d4e 100644
+index 5bddd035cc0e..2bfda2d57362 100644
--- a/src/polkitagent/polkitagentlistener.c
+++ b/src/polkitagent/polkitagentlistener.c
@@ -37,10 +37,7 @@
diff --git a/patches/polkit-0.105/0030-0.113-Fix-a-per-authorization-memory-leak.patch b/patches/polkit-0.105/0034-0.113-Fix-a-per-authorization-memory-leak.patch
index a3428746e..9386a060d 100644
--- a/patches/polkit-0.105/0030-0.113-Fix-a-per-authorization-memory-leak.patch
+++ b/patches/polkit-0.105/0034-0.113-Fix-a-per-authorization-memory-leak.patch
@@ -8,7 +8,7 @@ the success path, but also on various error paths as well.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69501
Origin: upstream, 0.113, commit:0f5852a4bdabe377ddcdbed09a0c1f95710e17fe
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0031-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch b/patches/polkit-0.105/0035-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch
index aa649cf24..c1a08dc23 100644
--- a/patches/polkit-0.105/0031-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch
+++ b/patches/polkit-0.105/0035-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] 0.113: Fix a memory leak when registering an authentication
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69501
Origin: upstream, 0.113, commit:ec039f9d7ede5b839f5511e26d5cd6ae9107cb2e
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0032-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch b/patches/polkit-0.105/0036-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch
index 9303bf791..7f06f1dd4 100644
--- a/patches/polkit-0.105/0032-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch
+++ b/patches/polkit-0.105/0036-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch
@@ -16,7 +16,7 @@ CVE: CVE-2015-3255
Origin: upstream, 0.113, commit:9f5e0c731784003bd4d6fc75ab739ff8b2ea269f
Bug-Debian: https://bugs.debian.org/796134
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -24,7 +24,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c
-index e3ed38d4a81e..4270d4ed2b41 100644
+index 0af00109e175..b16ed2f9a34c 100644
--- a/src/polkitbackend/polkitbackendactionpool.c
+++ b/src/polkitbackend/polkitbackendactionpool.c
@@ -40,7 +40,6 @@
diff --git a/patches/polkit-0.105/0033-0.113-Fix-use-after-free-in-polkitagentsession.c.patch b/patches/polkit-0.105/0037-0.113-Fix-use-after-free-in-polkitagentsession.c.patch
index ee35b7cb2..68ab41fb1 100644
--- a/patches/polkit-0.105/0033-0.113-Fix-use-after-free-in-polkitagentsession.c.patch
+++ b/patches/polkit-0.105/0037-0.113-Fix-use-after-free-in-polkitagentsession.c.patch
@@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=69501
Origin: upstream, 0.113, commit:efb6cd56a423ba15bb1f44ee3c4987aad5a5fd45
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0034-0.114-Fix-multi-line-pam-text-info.patch b/patches/polkit-0.105/0038-0.114-Fix-multi-line-pam-text-info.patch
index 5c51de5a7..b654105d9 100644
--- a/patches/polkit-0.105/0034-0.114-Fix-multi-line-pam-text-info.patch
+++ b/patches/polkit-0.105/0038-0.114-Fix-multi-line-pam-text-info.patch
@@ -10,7 +10,7 @@ to fail. Escaping these strings and unescaping them fixes the issue.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92886
Origin: upstream, 0.114, commit:10597322eccc320f9053821750ae9af51e918d74
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0035-0.114-Refactor-send_to_helper-usage.patch b/patches/polkit-0.105/0039-0.114-Refactor-send_to_helper-usage.patch
index 8be72ef26..6200e5877 100644
--- a/patches/polkit-0.105/0035-0.114-Refactor-send_to_helper-usage.patch
+++ b/patches/polkit-0.105/0039-0.114-Refactor-send_to_helper-usage.patch
@@ -8,7 +8,7 @@ Those actions has been delegated to already-existing send_to_helper function.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92886
Origin: upstream, 0.114, commit:2690cd0312b310946c86674c8dd1f55c63f7dd6a
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0036-0.114-Support-polkit-session-agent-running-outside-u.patch b/patches/polkit-0.105/0040-0.114-Support-polkit-session-agent-running-outside-u.patch
index 49ee8a807..74b17b316 100644
--- a/patches/polkit-0.105/0036-0.114-Support-polkit-session-agent-running-outside-u.patch
+++ b/patches/polkit-0.105/0040-0.114-Support-polkit-session-agent-running-outside-u.patch
@@ -15,7 +15,7 @@ that's not running directly in the users session.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=96977
Applied-upstream: 0.114, commit:00a663e3fb14d8023e7cb6a66d091872bf4f2851
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0037-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch b/patches/polkit-0.105/0041-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
index eaffd94a7..08a8b9869 100644
--- a/patches/polkit-0.105/0037-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
+++ b/patches/polkit-0.105/0041-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
@@ -45,7 +45,7 @@ server processes, to ask about arbitrary subjects.)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Origin: upstream, 0.115, commit:bc7ffad53643a9c80231fc41f5582d6a8931c32c
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0042-0.116-Possible-resource-leak-found-by-static-analyze.patch b/patches/polkit-0.105/0042-0.116-Possible-resource-leak-found-by-static-analyze.patch
new file mode 100644
index 000000000..bd8dd51a6
--- /dev/null
+++ b/patches/polkit-0.105/0042-0.116-Possible-resource-leak-found-by-static-analyze.patch
@@ -0,0 +1,25 @@
+From: Jan Rybar <jrybar@redhat.com>
+Date: Thu, 9 Aug 2018 16:46:38 +0200
+Subject: [PATCH] 0.116: Possible resource leak found by static analyzer
+
+Origin: upstream, 0.116, commit:542c6ec832919df6a74e16aba574adaeebe35e08
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkitagent/polkitagentlistener.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
+index 2bfda2d57362..000385178505 100644
+--- a/src/polkitagent/polkitagentlistener.c
++++ b/src/polkitagent/polkitagentlistener.c
+@@ -440,6 +440,7 @@ polkit_agent_listener_register_with_options (PolkitAgentListener *listener,
+ server->thread_initialization_error = NULL;
+ g_thread_join (server->thread);
+ server_free (server);
++ server = NULL;
+ goto out;
+ }
+ }
diff --git a/patches/polkit-0.105/0043-0.116-Fix-a-critical-warning-on-calling-polkit_permi.patch b/patches/polkit-0.105/0043-0.116-Fix-a-critical-warning-on-calling-polkit_permi.patch
new file mode 100644
index 000000000..b689f4ff3
--- /dev/null
+++ b/patches/polkit-0.105/0043-0.116-Fix-a-critical-warning-on-calling-polkit_permi.patch
@@ -0,0 +1,36 @@
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 19 Oct 2017 13:43:22 +0100
+Subject: [PATCH] 0.116: Fix a critical warning on calling
+ polkit_permission_new_sync with no system bus
+
+Origin: upstream, 0.116, commit:984d16e6d21c6d6b0fc28d4fe7fe82575a43c95b
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkit/polkitpermission.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
+index f264094db206..d4b245915bd3 100644
+--- a/src/polkit/polkitpermission.c
++++ b/src/polkit/polkitpermission.c
+@@ -137,10 +137,13 @@ polkit_permission_finalize (GObject *object)
+ g_free (permission->tmp_authz_id);
+ g_object_unref (permission->subject);
+
+- g_signal_handlers_disconnect_by_func (permission->authority,
+- on_authority_changed,
+- permission);
+- g_object_unref (permission->authority);
++ if (permission->authority != NULL)
++ {
++ g_signal_handlers_disconnect_by_func (permission->authority,
++ on_authority_changed,
++ permission);
++ g_object_unref (permission->authority);
++ }
+
+ if (G_OBJECT_CLASS (polkit_permission_parent_class)->finalize != NULL)
+ G_OBJECT_CLASS (polkit_permission_parent_class)->finalize (object);
diff --git a/patches/polkit-0.105/0038-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch b/patches/polkit-0.105/0044-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch
index 5ac4f582e..9e165aaa1 100644
--- a/patches/polkit-0.105/0038-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch
+++ b/patches/polkit-0.105/0044-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch
@@ -24,7 +24,7 @@ Fixes https://gitlab.freedesktop.org/polkit/polkit/issues/74.
(cherry picked from commit 2cb40c4d5feeaa09325522bd7d97910f1b59e379)
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0043-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch b/patches/polkit-0.105/0045-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch
index 93af341dc..429767ef7 100644
--- a/patches/polkit-0.105/0043-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch
+++ b/patches/polkit-0.105/0045-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch
@@ -13,10 +13,10 @@ And the above original email report is included in full in a new comment.
Reported-by: Jann Horn <jannh@google.com>
-Closes: https://gitlab.freedesktop.org/polkit/polkit/issues/75
-(cherry picked from commit 6cc6aafee135ba44ea748250d7d29b562ca190e3)
+Bug: https://gitlab.freedesktop.org/polkit/polkit/issues/75
+Origin: upstream, 0.116, commit:6cc6aafee135ba44ea748250d7d29b562ca190e3
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -39,7 +39,7 @@ index 78ec745a4df2..fadcfe9b624e 100644
* This function can be used in e.g. g_hash_table_new().
*
diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 4a4256746d6e..0f33598a7401 100644
+index 02a083f70a1c..5a2906850cd7 100644
--- a/src/polkit/polkitunixprocess.c
+++ b/src/polkit/polkitunixprocess.c
@@ -44,7 +44,10 @@
diff --git a/patches/polkit-0.105/0039-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch b/patches/polkit-0.105/0046-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch
index cdb6c31d9..82da748cc 100644
--- a/patches/polkit-0.105/0039-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch
+++ b/patches/polkit-0.105/0046-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch
@@ -17,7 +17,7 @@ This does not affect the protection against CVE-2018-19788 which is
based on creating a user with a UID up to but not including 4294967295
(-1).
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -25,10 +25,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 02a083f70a1c..4a4256746d6e 100644
+index 5a2906850cd7..0f33598a7401 100644
--- a/src/polkit/polkitunixprocess.c
+++ b/src/polkit/polkitunixprocess.c
-@@ -147,14 +147,9 @@ polkit_unix_process_set_property (GObject *object,
+@@ -216,14 +216,9 @@ polkit_unix_process_set_property (GObject *object,
polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
break;
diff --git a/patches/polkit-0.105/0047-0.116-pkttyagent-PolkitAgentTextListener-leaves-echo.patch b/patches/polkit-0.105/0047-0.116-pkttyagent-PolkitAgentTextListener-leaves-echo.patch
new file mode 100644
index 000000000..ba00915e6
--- /dev/null
+++ b/patches/polkit-0.105/0047-0.116-pkttyagent-PolkitAgentTextListener-leaves-echo.patch
@@ -0,0 +1,105 @@
+From: Jan Rybar <jrybar@redhat.com>
+Date: Fri, 15 Mar 2019 16:07:53 +0000
+Subject: [PATCH] 0.116: pkttyagent: PolkitAgentTextListener leaves echo tty
+ disabled if SIGINT/SIGTERM
+
+If no password is typed into terminal during authentication raised by PolkitAgentTextListener, pkttyagent sends kill (it receives from systemctl/hostnamectl e.g.) without chance to restore echoing back on. This cannot be done in on_request() since it's run in a thread without guarantee the signal is distributed there.
+
+Origin: upstream, 0.116, commit:bfb722bbe5a503095cc7e860f282b142f5aa75f1
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/programs/pkttyagent.c | 57 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/src/programs/pkttyagent.c b/src/programs/pkttyagent.c
+index 488ca8b28933..7561a29235f4 100644
+--- a/src/programs/pkttyagent.c
++++ b/src/programs/pkttyagent.c
+@@ -24,6 +24,10 @@
+ #endif
+
+ #include <stdio.h>
++#include <stdlib.h>
++#include <signal.h>
++#include <termios.h>
++#include <glib/gi18n.h>
+ #include <polkit/polkit.h>
+ #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
+ #include <polkitagent/polkitagent.h>
+@@ -47,6 +51,36 @@ usage (int argc, char *argv[])
+ }
+
+
++static volatile sig_atomic_t tty_flags_saved;
++struct termios ts;
++FILE *tty = NULL;
++struct sigaction savesigterm, savesigint, savesigtstp;
++
++
++static void tty_handler(int signal)
++{
++ switch (signal)
++ {
++ case SIGTERM:
++ sigaction (SIGTERM, &savesigterm, NULL);
++ break;
++ case SIGINT:
++ sigaction (SIGINT, &savesigint, NULL);
++ break;
++ case SIGTSTP:
++ sigaction (SIGTSTP, &savesigtstp, NULL);
++ break;
++ }
++
++ if (tty_flags_saved)
++ {
++ tcsetattr (fileno (tty), TCSAFLUSH, &ts);
++ }
++
++ kill(getpid(), signal);
++}
++
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -64,6 +98,8 @@ main (int argc, char *argv[])
+ guint ret = 126;
+ gint notify_fd = -1;
+ GVariantBuilder builder;
++ struct sigaction sa;
++ const char *tty_name = NULL;
+
+ g_type_init ();
+
+@@ -231,6 +267,27 @@ main (int argc, char *argv[])
+ }
+ }
+
++/* Bash leaves tty echo disabled if SIGINT/SIGTERM comes to polkitagenttextlistener.c::on_request(),
++ but due to threading the handlers cannot take care of the signal there.
++ Though if controlling terminal cannot be found, the world won't stop spinning.
++*/
++ tty_name = ctermid(NULL);
++ if (tty_name != NULL)
++ {
++ tty = fopen(tty_name, "r+");
++ }
++
++ if (tty != NULL && !tcgetattr (fileno (tty), &ts))
++ {
++ tty_flags_saved = TRUE;
++ }
++
++ memset (&sa, 0, sizeof (sa));
++ sa.sa_handler = &tty_handler;
++ sigaction (SIGTERM, &sa, &savesigterm);
++ sigaction (SIGINT, &sa, &savesigint);
++ sigaction (SIGTSTP, &sa, &savesigtstp);
++
+ loop = g_main_loop_new (NULL, FALSE);
+ g_main_loop_run (loop);
+
diff --git a/patches/polkit-0.105/0040-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch b/patches/polkit-0.105/0048-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch
index cd41f00be..fdc8c312e 100644
--- a/patches/polkit-0.105/0040-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch
+++ b/patches/polkit-0.105/0048-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch
@@ -20,7 +20,7 @@ remove unrelated cosmetic change to a man page]
Forwarded: no, Debian-specific
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0041-Build-against-libsystemd.patch b/patches/polkit-0.105/0049-Build-against-libsystemd.patch
index 76ef40029..abf187472 100644
--- a/patches/polkit-0.105/0041-Build-against-libsystemd.patch
+++ b/patches/polkit-0.105/0049-Build-against-libsystemd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build against libsystemd
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779756
Forwarded: no, obsoleted by upstream commit 2291767a014f5a04a92ca6f0eb472794f212ca67 in 0.113
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0042-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch b/patches/polkit-0.105/0050-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
index 89ecb9e66..57150eaa8 100644
--- a/patches/polkit-0.105/0042-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
+++ b/patches/polkit-0.105/0050-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
@@ -13,7 +13,7 @@ https://lists.freedesktop.org/archives/dbus/2015-July/016746.html
https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11
-Imported from policykit-1_0.105-25.debian.tar.xz
+Imported from policykit-1_0.105-31.1.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/polkit-0.105/0051-CVE-2021-3560.patch b/patches/polkit-0.105/0051-CVE-2021-3560.patch
new file mode 100644
index 000000000..c84ec101b
--- /dev/null
+++ b/patches/polkit-0.105/0051-CVE-2021-3560.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 27 Jan 2022 12:07:01 +0100
+Subject: [PATCH] CVE-2021-3560
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/polkit/polkitsystembusname.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
+index 8daa12cb9093..8ed13631508d 100644
+--- a/src/polkit/polkitsystembusname.c
++++ b/src/polkit/polkitsystembusname.c
+@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus
+ while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
+ g_main_context_iteration (tmp_context, TRUE);
+
++ if (data.caught_error)
++ goto out;
++
+ if (out_uid)
+ *out_uid = data.uid;
+ if (out_pid)
diff --git a/patches/polkit-0.105/0052-Local-Privilege-Escalation-in-polkit-s-pkexec-CVE-20.patch b/patches/polkit-0.105/0052-Local-Privilege-Escalation-in-polkit-s-pkexec-CVE-20.patch
new file mode 100644
index 000000000..6dc15398f
--- /dev/null
+++ b/patches/polkit-0.105/0052-Local-Privilege-Escalation-in-polkit-s-pkexec-CVE-20.patch
@@ -0,0 +1,75 @@
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Tue, 11 Jan 2022 23:18:04 +0100
+Subject: [PATCH] Local Privilege Escalation in polkit's pkexec (CVE-2021-4034)
+
+[Salvatore Bonaccorso: Backport to 0.105:
+ - Refresh for context changes
+ - Drop help() printout in pkcheck, for versions before e8e18d180888
+ ("Don't spawn man for --help") in 0.111. Instead call usage(). It
+ spawns a manpage, but pkcheck is not setuid root.
+]
+
+Imported from policykit-1_0.105-31.1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/programs/pkcheck.c | 6 ++++++
+ src/programs/pkexec.c | 21 ++++++++++++++++++++-
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
+index 057e926db86f..1747bd559f51 100644
+--- a/src/programs/pkcheck.c
++++ b/src/programs/pkcheck.c
+@@ -353,6 +353,12 @@ main (int argc, char *argv[])
+ local_agent_handle = NULL;
+ ret = 126;
+
++ if (argc < 1)
++ {
++ usage (argc, argv);
++ exit(1);
++ }
++
+ g_type_init ();
+
+ details = polkit_details_new ();
+diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
+index abc660dfddc6..c73c58ba8fb1 100644
+--- a/src/programs/pkexec.c
++++ b/src/programs/pkexec.c
+@@ -475,6 +475,17 @@ main (int argc, char *argv[])
+ pid_t pid_of_caller;
+ gpointer local_agent_handle;
+
++
++ /*
++ * If 'pkexec' is called wrong, just show help and bail out.
++ */
++ if (argc<1)
++ {
++ clearenv();
++ usage (argc, argv);
++ exit(1);
++ }
++
+ ret = 127;
+ authority = NULL;
+ subject = NULL;
+@@ -591,7 +602,15 @@ main (int argc, char *argv[])
+ goto out;
+ }
+ g_free (path);
+- argv[n] = path = s;
++ path = s;
++
++ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated.
++ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination
++ */
++ if (argv[n] != NULL)
++ {
++ argv[n] = path;
++ }
+ }
+ if (access (path, F_OK) != 0)
+ {
diff --git a/patches/polkit-0.105/series b/patches/polkit-0.105/series
index 107495884..b02545c04 100644
--- a/patches/polkit-0.105/series
+++ b/patches/polkit-0.105/series
@@ -2,49 +2,58 @@
#tag:base --start-number 1
#tag:debian --start-number 1
0001-0.106-agenthelper-pam-Fix-newline-trimming-code.patch
-0002-0.108-build-Fix-.gir-generation-for-parallel-make.patch
-0003-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch
-0004-0.110-Fix-build-on-GNU-Hurd.patch
-0005-0.111-pkexec-Set-process-environment-from-pam_getenv.patch
-0006-0.111-Fix-a-memory-leak.patch
-0007-0.112-Use-GOnce-for-interface-type-registration.patch
-0008-0.112-polkitunixprocess-Deprecate-racy-APIs.patch
-0009-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch
-0010-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch
-0011-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch
-0012-0.113-PolkitAgentSession-fix-race-between-child-and-.patch
-0013-0.113-polkitd-Fix-problem-with-removing-non-existent.patch
-0014-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch
-0015-0.113-Fixed-compilation-problem-in-the-backend.patch
-0016-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch
-0017-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch
-0018-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch
-0019-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch
-0020-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch
-0021-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch
-0022-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch
-0023-0.113-Fix-a-possible-NULL-dereference.patch
-0024-0.113-Remove-a-redundant-assignment.patch
-0025-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch
-0026-0.113-Fix-a-crash-when-two-authentication-requests-a.patch
-0027-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch
-0028-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch
-0029-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch
-0030-0.113-Fix-a-per-authorization-memory-leak.patch
-0031-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch
-0032-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch
-0033-0.113-Fix-use-after-free-in-polkitagentsession.c.patch
-0034-0.114-Fix-multi-line-pam-text-info.patch
-0035-0.114-Refactor-send_to_helper-usage.patch
-0036-0.114-Support-polkit-session-agent-running-outside-u.patch
-0037-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
-0038-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch
-0039-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch
-0040-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch
-0041-Build-against-libsystemd.patch
-0042-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
-0043-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch
+0002-0.107-Try-harder-to-look-up-the-right-localization.patch
+0003-0.108-build-Fix-.gir-generation-for-parallel-make.patch
+0004-0.108-PolkitAgent-Avoid-crashing-if-initializing-the.patch
+0005-0.110-Set-XAUTHORITY-environment-variable-if-is-unse.patch
+0006-0.110-Fix-build-on-GNU-Hurd.patch
+0007-0.111-pkexec-Set-process-environment-from-pam_getenv.patch
+0008-0.111-Fix-a-memory-leak.patch
+0009-0.112-Use-GOnce-for-interface-type-registration.patch
+0010-0.112-polkitunixprocess-Deprecate-racy-APIs.patch
+0011-0.112-pkcheck-Support-process-pid-start-time-uid-syn.patch
+0012-0.114-polkitpermission-Fix-a-memory-leak-on-authorit.patch
+0013-0.113-Port-internals-non-deprecated-PolkitProcess-AP.patch
+0014-0.113-pkexec-Work-around-systemd-injecting-broken-XD.patch
+0015-0.113-PolkitAgentSession-fix-race-between-child-and-.patch
+0016-0.113-polkitd-Fix-problem-with-removing-non-existent.patch
+0017-0.113-PolkitSystemBusName-Add-public-API-to-retrieve.patch
+0018-0.113-Fixed-compilation-problem-in-the-backend.patch
+0019-0.113-Don-t-discard-error-data-returned-by-polkit_sy.patch
+0020-0.113-sessionmonitor-systemd-Deduplicate-code-paths.patch
+0021-0.113-PolkitSystemBusName-Retrieve-both-pid-and-uid.patch
+0022-0.113-sessionmonitor-systemd-prepare-for-D-Bus-user-.patch
+0023-0.113-Refuse-duplicate-user-arguments-to-pkexec.patch
+0024-0.113-authority-Fix-memory-leak-in-EnumerateActions-.patch
+0025-0.113-CVE-2015-3218-backend-Handle-invalid-object-pa.patch
+0026-0.113-sessionmonitor-systemd-Use-sd_uid_get_state-to.patch
+0027-0.113-Fix-a-possible-NULL-dereference.patch
+0028-0.113-Remove-a-redundant-assignment.patch
+0029-0.113-Fix-duplicate-GError-use-when-uid-is-missing.patch
+0030-0.113-Fix-a-crash-when-two-authentication-requests-a.patch
+0031-0.113-CVE-2015-4625-Use-unpredictable-cookie-values-.patch
+0032-0.113-CVE-2015-4625-Bind-use-of-cookies-to-specific-.patch
+0033-0.113-docs-Update-for-changes-to-uid-binding-Authent.patch
+0034-0.113-Fix-a-per-authorization-memory-leak.patch
+0035-0.113-Fix-a-memory-leak-when-registering-an-authenti.patch
+0036-0.113-CVE-2015-3255-Fix-GHashTable-usage.patch
+0037-0.113-Fix-use-after-free-in-polkitagentsession.c.patch
+0038-0.114-Fix-multi-line-pam-text-info.patch
+0039-0.114-Refactor-send_to_helper-usage.patch
+0040-0.114-Support-polkit-session-agent-running-outside-u.patch
+0041-0.115-Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
+0042-0.116-Possible-resource-leak-found-by-static-analyze.patch
+0043-0.116-Fix-a-critical-warning-on-calling-polkit_permi.patch
+0044-0.116-Allow-negative-uids-gids-in-PolkitUnixUser-and.patch
+0045-0.116-backend-Compare-PolkitUnixProcess-uids-for-tem.patch
+0046-0.116-Allow-uid-of-1-for-a-PolkitUnixProcess.patch
+0047-0.116-pkttyagent-PolkitAgentTextListener-leaves-echo.patch
+0048-Revert-Default-to-AdminIdentities-unix-group-wheel-f.patch
+0049-Build-against-libsystemd.patch
+0050-Move-D-Bus-policy-file-to-usr-share-dbus-1-system.d.patch
+0051-CVE-2021-3560.patch
+0052-Local-Privilege-Escalation-in-polkit-s-pkexec-CVE-20.patch
#tag:ptxdist --start-number 100
0100-automake-add-missing-conditional-HAVE_INTROSPECTION.patch
0101-Add-a-systemd-.service-file.patch
-# 6f0039b018c1c5a63bb80b750d1301dd - git-ptx-patches magic
+# 7afe6c1435d400fee3792c45276427a1 - git-ptx-patches magic
diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
deleted file mode 100644
index 97498dc22..000000000
--- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Mon, 3 Dec 2018 13:55:02 +0100
-Subject: [PATCH] Makefile: fix installation to empty DESTDIR
-
-When DESTDIR is empty, or at least does not contain usr/bin or
-usr/include, the installation fails, because install does not create
-those intermediate directories:
-
-$ make DESTDIR=/tmp/koin install
-install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install: failed to access '/tmp/koin/usr/bin': No such file or directory
-
-Using the -D option of install fixes this:
-
-$ make DESTDIR=/tmp/koin install
-install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
-Signed-off-by: Roland Hieber <rhi@pengutronix.de>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 939466885e9f..30672f79585c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,8 +19,8 @@ include .depend
- endif
-
- install : all
-- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-
- uninstall :
- for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
deleted file mode 100644
index 7b3c77623..000000000
--- a/patches/pps-tools-1.0.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Makefile-fix-installation-to-empty-DESTDIR.patch
-# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
diff --git a/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch
new file mode 100644
index 000000000..6bb31aff6
--- /dev/null
+++ b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch
@@ -0,0 +1,29 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Sat, 29 Jan 2022 19:22:44 +0100
+Subject: [PATCH] Makefile: Remove obstructive use of SYSROOT variable.
+
+Ptxdist declares a SYSROOT env variable which is picked up here.
+But it is used as a cc --sysroot variable.
+This offsets searches for std headers and causes breakage.
+Remove it. Not needed.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ Makefile | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a57a325bc133..30672f79585c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,6 @@ TARGETS = ppstest ppsctl ppswatch ppsldisc
+ CFLAGS += -Wall -O2 -D_GNU_SOURCE
+ CFLAGS += -ggdb
+ CFLAGS += -fPIC
+-ifdef SYSROOT
+-CFLAGS += --sysroot $(SYSROOT)
+-endif
+-
+ LDLIBS += -lm
+
+ # -- Actions section --
diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
new file mode 100644
index 000000000..8376d9c98
--- /dev/null
+++ b/patches/pps-tools-1.0.3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch
+# 7d2c06910f16bd177a79768e6f4195f6 - git-ptx-patches magic
diff --git a/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch b/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
new file mode 100644
index 000000000..325e9cfd8
--- /dev/null
+++ b/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
@@ -0,0 +1,21 @@
+From: Yureka Lilian <yuka@yuka.dev>
+Date: Fri, 22 Oct 2021 09:09:55 +0000
+Subject: [PATCH] Make gio-2.0 optional when gsettings is disabled
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d7e468cabec7..92f2d20bdca0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -614,7 +614,7 @@ if dbus_dep.found()
+ cdata.set('HAVE_DBUS', 1)
+ endif
+
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
++gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+ if get_option('gsettings').enabled()
+ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
+ cdata.set('HAVE_GSETTINGS', 1)
diff --git a/patches/pulseaudio-15.0/series b/patches/pulseaudio-15.0/series
new file mode 100644
index 000000000..c35c4f4bf
--- /dev/null
+++ b/patches/pulseaudio-15.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
+# 8dc8cea3523d86737ae0b361f252f5d6 - git-ptx-patches magic
diff --git a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
index 27fea6364..27fea6364 100644
--- a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
+++ b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
diff --git a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
index 0de2e99f3..5df864c39 100644
--- a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 401c623a65f8..36a0557d2aa8 100644
+index 74c5b46d38b5..4b3e390e8947 100644
--- a/Makefile
+++ b/Makefile
-@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
+@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
diff --git a/patches/qemu-6.1.0/series b/patches/qemu-6.2.0/series
index 1391c59a3..1391c59a3 100644
--- a/patches/qemu-6.1.0/series
+++ b/patches/qemu-6.2.0/series
diff --git a/patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch b/patches/qt-everywhere-opensource-src-5.15.3/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
index 218dc7e79..218dc7e79 100644
--- a/patches/qt-everywhere-src-5.15.2/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0001-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch b/patches/qt-everywhere-opensource-src-5.15.3/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
index f17db71aa..f17db71aa 100644
--- a/patches/qt-everywhere-src-5.15.2/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0002-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-opensource-src-5.15.3/0003-qt3d-link-with-latomic-if-necessary.patch
index 6445dc4f4..6445dc4f4 100644
--- a/patches/qt-everywhere-src-5.15.2/0003-qt3d-link-with-latomic-if-necessary.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0003-qt3d-link-with-latomic-if-necessary.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch b/patches/qt-everywhere-opensource-src-5.15.3/0004-eglfs_kms-device-ordering-robustness.patch
index 0532aa660..0532aa660 100644
--- a/patches/qt-everywhere-src-5.15.2/0004-eglfs_kms-device-ordering-robustness.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0004-eglfs_kms-device-ordering-robustness.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-opensource-src-5.15.3/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
index ce0652dc7..ce0652dc7 100644
--- a/patches/qt-everywhere-src-5.15.2/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch b/patches/qt-everywhere-opensource-src-5.15.3/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
index ebbb05a24..ebbb05a24 100644
--- a/patches/qt-everywhere-src-5.15.2/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch b/patches/qt-everywhere-opensource-src-5.15.3/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
index be6f6378d..be6f6378d 100644
--- a/patches/qt-everywhere-src-5.15.2/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
diff --git a/patches/qt-everywhere-opensource-src-5.15.3/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-opensource-src-5.15.3/0008-qtbase-include-limits-where-necessary.patch
new file mode 100644
index 000000000..ff9732d62
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0008-qtbase-include-limits-where-necessary.patch
@@ -0,0 +1,42 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Sat, 1 May 2021 00:57:24 +0200
+Subject: [PATCH] qtbase: include limits where necessary
+
+Upstream fixes:
+https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
+https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2b2b3155d9f6ba1e
+
+Fixes build with GCC11, which changed internal includes so that
+limits isn't implicitly pulled in some cases.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+---
+ qtbase/src/corelib/text/qbytearraymatcher.h | 2 ++
+ qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d2035..f5f9bef7b87c 100644
+--- a/qtbase/src/corelib/text/qbytearraymatcher.h
++++ b/qtbase/src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+
+ #include <QtCore/qbytearray.h>
+
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+
+
+diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
+index 4dd9e9603bc1..e26a57ff4320 100644
+--- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h
++++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
+@@ -55,6 +55,7 @@
+
+ #include <tuple>
+ #include <array>
++#include <limits>
+
+ QT_BEGIN_NAMESPACE
+
diff --git a/patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch b/patches/qt-everywhere-opensource-src-5.15.3/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
index 05a0b6726..05a0b6726 100644
--- a/patches/qt-everywhere-src-5.15.2/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0009-qtdeclarative-Add-missing-limits-include-to-fix-buil.patch
diff --git a/patches/qt-everywhere-src-5.15.2/0010-qtwebengine-include-limits-where-necessary.patch b/patches/qt-everywhere-opensource-src-5.15.3/0010-qtwebengine-include-limits-where-necessary.patch
index 1262fe60c..a4ecc125a 100644
--- a/patches/qt-everywhere-src-5.15.2/0010-qtwebengine-include-limits-where-necessary.patch
+++ b/patches/qt-everywhere-opensource-src-5.15.3/0010-qtwebengine-include-limits-where-necessary.patch
@@ -7,9 +7,22 @@ limits isn't implicitly pulled in some cases.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
+ .../third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc | 1 +
.../third_party/perfetto/src/trace_processor/containers/string_pool.h | 1 +
- 1 file changed, 1 insertion(+)
+ 2 files changed, 2 insertions(+)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+index 19f9aab5b1a5..27fec21681dc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
++++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+@@ -37,6 +37,7 @@
+
+ #include <algorithm>
+ #include <array>
++#include <limits>
+ #include "absl/base/internal/hide_ptr.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/internal/spinlock.h"
diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
index 11ae91cfeca5..558ff00e8feb 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-opensource-src-5.15.3/series
index 63b9a750c..63b9a750c 100644
--- a/patches/qt-everywhere-src-5.15.2/series
+++ b/patches/qt-everywhere-opensource-src-5.15.3/series
diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
deleted file mode 100644
index a7b82435a..000000000
--- a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Sat, 1 May 2021 00:57:24 +0200
-Subject: [PATCH] qtbase: include limits where necessary
-
-Upstream fixes:
-https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
-https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-
-Fixes build with GCC11, which changed internal includes so that
-limits isn't implicitly pulled in some cases.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- qtbase/src/corelib/global/qendian.h | 2 ++
- qtbase/src/corelib/global/qfloat16.h | 1 +
- qtbase/src/corelib/text/qbytearraymatcher.h | 2 ++
- qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 +
- qtdeclarative/src/3rdparty/masm/yarr/Yarr.h | 2 ++
- 5 files changed, 8 insertions(+)
-
-diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
-index 257efbbdbecf..a97776c761b7 100644
---- a/qtbase/src/corelib/global/qendian.h
-+++ b/qtbase/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
-
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
-diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
-index c7a9c87af322..5302be072ed8 100644
---- a/qtbase/src/corelib/global/qfloat16.h
-+++ b/qtbase/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
-
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
-
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
-diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
-index 0eedfc1d2035..f5f9bef7b87c 100644
---- a/qtbase/src/corelib/text/qbytearraymatcher.h
-+++ b/qtbase/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
-
- #include <QtCore/qbytearray.h>
-
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
-
-
-diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
-index 4dd9e9603bc1..8b3fbfe55985 100644
---- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h
-+++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
-@@ -53,6 +53,7 @@
-
- #include "private/qglobal_p.h"
-
-+#include <limits>
- #include <tuple>
- #include <array>
-
-diff --git a/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h b/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
-index ccf78f988000..cd745256e9e1 100644
---- a/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
-+++ b/qtdeclarative/src/3rdparty/masm/yarr/Yarr.h
-@@ -27,6 +27,8 @@
-
- #pragma once
-
-+#include <limits>
-+
- #include <limits.h>
- #include "YarrErrorCode.h"
-
diff --git a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch b/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
deleted file mode 100644
index 54cc81f0d..000000000
--- a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] fix_screen_utf8_nfd
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- ansi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ansi.c b/ansi.c
-index 2a52eddd32d4..83b266d6f777 100644
---- a/ansi.c
-+++ b/ansi.c
-@@ -692,10 +692,6 @@ register int len;
- }
- curr->w_rend.font = 0;
- }
--# ifdef DW_CHARS
-- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-- curr->w_mbcs = 0xff;
--# endif
- if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
- {
- int ox, oy;
-@@ -730,6 +726,10 @@ register int len;
- }
- break;
- }
-+# ifdef DW_CHARS
-+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-+ curr->w_mbcs = 0xff;
-+# endif
- font = curr->w_rend.font;
- # endif
- # ifdef DW_CHARS
diff --git a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch b/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
deleted file mode 100644
index 8cbfc6d2f..000000000
--- a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
-Date: Fri, 21 Feb 2020 14:02:51 +0100
-Subject: [PATCH] Expand-d_xtermosc-array-in-struct-display
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit c5db181 expands index range of "typ2" by one without expanding
-affected arrays. d_xtermosc in struct display is one of these.
-
-Related: c5db181b6e017cfccb8d7842ce140e59294d9f62
- (ansi: add support for xterm OSC 11)
-Related: 68386dfb1fa33471372a8cd2e74686758a2f527b
- (Fix out of bounds access when setting w_xtermosc after OSC 49)
-
-Signed-off-by: Václav Doležal <vdolezal@redhat.com>
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/display.h b/display.h
-index 459cc5dc1543..4fc206189b4b 100644
---- a/display.h
-+++ b/display.h
-@@ -112,7 +112,7 @@ struct display
- int d_mousetrack; /* set when user wants to use mouse even when the window
- does not */
- #ifdef RXVT_OSC
-- int d_xtermosc[4]; /* osc used */
-+ int d_xtermosc[5]; /* osc used */
- #endif
- struct mchar d_lpchar; /* missing char */
- struct timeval d_status_time; /* time of status display */
diff --git a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch b/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
deleted file mode 100644
index 1152cb522..000000000
--- a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 27 Apr 2020 18:12:56 +0200
-Subject: [PATCH] TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- termcap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/termcap.c b/termcap.c
-index ed9e838c4c9d..29684cf974f7 100644
---- a/termcap.c
-+++ b/termcap.c
-@@ -1066,7 +1066,7 @@ int aflag;
- {
- if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
- continue; /* - makes it too big */
--#if (TERMCAP_BUF < 1024)
-+#if (TERMCAP_BUFSIZE < 1024)
- if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
- continue;
- if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
diff --git a/patches/screen-4.8.0/0104-CVE-2021-26937.patch b/patches/screen-4.8.0/0104-CVE-2021-26937.patch
deleted file mode 100644
index 9f4e879af..000000000
--- a/patches/screen-4.8.0/0104-CVE-2021-26937.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] CVE-2021-26937
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- encoding.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/encoding.c b/encoding.c
-index e5db3e708126..79f5d14024c4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *));
- # ifdef UTF8
- static int recode_char __P((int, int, int));
- static int recode_char_to_encoding __P((int, int));
--static void comb_tofront __P((int, int));
-+static void comb_tofront __P((int));
- # ifdef DW_CHARS
- static int recode_char_dw __P((int, int *, int, int));
- static int recode_char_dw_to_encoding __P((int, int *, int));
-@@ -1263,6 +1263,8 @@ int c;
- {0x30000, 0x3FFFD},
- };
-
-+ if (c >= 0xdf00 && c <= 0xdfff)
-+ return 1; /* dw combining sequence */
- return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
- (cjkwidth &&
- bisearch(c, ambiguous,
-@@ -1330,11 +1332,12 @@ int c;
- }
-
- static void
--comb_tofront(root, i)
--int root, i;
-+comb_tofront(i)
-+int i;
- {
- for (;;)
- {
-+ int root = i >= 0x700 ? 0x801 : 0x800;
- debug1("bring to front: %x\n", i);
- combchars[combchars[i]->prev]->next = combchars[i]->next;
- combchars[combchars[i]->next]->prev = combchars[i]->prev;
-@@ -1396,9 +1399,9 @@ struct mchar *mc;
- {
- /* full, recycle old entry */
- if (c1 >= 0xd800 && c1 < 0xe000)
-- comb_tofront(root, c1 - 0xd800);
-+ comb_tofront(c1 - 0xd800);
- i = combchars[root]->prev;
-- if (c1 == i + 0xd800)
-+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
- {
- /* completely full, can't recycle */
- debug("utf8_handle_comp: completely full!\n");
-@@ -1422,7 +1425,7 @@ struct mchar *mc;
- mc->font = (i >> 8) + 0xd8;
- mc->fontx = 0;
- debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
-- comb_tofront(root, i);
-+ comb_tofront(i);
- }
-
- #else /* !UTF8 */
diff --git a/patches/screen-4.8.0/autogen.sh b/patches/screen-4.8.0/autogen.sh
deleted file mode 100755
index 9e73c8d20..000000000
--- a/patches/screen-4.8.0/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-autoconf \
- --force \
- --warnings=cross \
- --warnings=syntax \
- --warnings=obsolete \
- --warnings=unsupported
-
diff --git a/patches/screen-4.8.0/series b/patches/screen-4.8.0/series
deleted file mode 100644
index c9b8d7197..000000000
--- a/patches/screen-4.8.0/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:buildroot --start-number 1
-0001-comm.h-now-depends-on-term.h.patch
-0002-comm.h-needed-for-list_-display-generic-.o.patch
-#tag:debian --start-number 100
-0100-suppress_remap.patch
-0101-fix_screen_utf8_nfd.patch
-0102-Expand-d_xtermosc-array-in-struct-display.patch
-0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
-0104-CVE-2021-26937.patch
-# d92ac31ab347a013a74ca7f4001696ec - git-ptx-patches magic
diff --git a/patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch b/patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
index 6a6fbb867..6a6fbb867 100644
--- a/patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch
+++ b/patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
diff --git a/patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch b/patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
index 12e551a7d..12e551a7d 100644
--- a/patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
+++ b/patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
diff --git a/patches/screen-4.8.0/0100-suppress_remap.patch b/patches/screen-4.9.0/0003-suppress_remap.patch
index 7da242564..fda63e90c 100644
--- a/patches/screen-4.8.0/0100-suppress_remap.patch
+++ b/patches/screen-4.9.0/0003-suppress_remap.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 deletions(-)
diff --git a/termcap.c b/termcap.c
-index 26cba62fd7c1..ed9e838c4c9d 100644
+index 26c8f5a96589..29684cf974f7 100644
--- a/termcap.c
+++ b/termcap.c
@@ -553,8 +553,6 @@ int map;
diff --git a/patches/libtremor-1.0.3/autogen.sh b/patches/screen-4.9.0/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/libtremor-1.0.3/autogen.sh
+++ b/patches/screen-4.9.0/autogen.sh
diff --git a/patches/screen-4.9.0/series b/patches/screen-4.9.0/series
new file mode 100644
index 000000000..bf7060df3
--- /dev/null
+++ b/patches/screen-4.9.0/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-comm.h-now-depends-on-term.h.patch
+0002-comm.h-needed-for-list_-display-generic-.o.patch
+0003-suppress_remap.patch
+# 086ac9b43abed5bb61eef564f1ac00d9 - git-ptx-patches magic
diff --git a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch b/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
new file mode 100644
index 000000000..8f021e236
--- /dev/null
+++ b/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
@@ -0,0 +1,45 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Fri, 17 Dec 2021 13:46:40 +0100
+Subject: [PATCH] wayland: fix build against version 1.20
+
+Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and
+wl_proxy_marshal_array_flags, which need to be wrapped as well.
+
+Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76
+Link: https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/106
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ src/waffle/wayland/wayland_sym.h | 10 ++++++++++
+ src/waffle/wayland/wayland_wrapper.h | 2 ++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h
+index 3d486255508f..ada78ddf47a0 100644
+--- a/src/waffle/wayland/wayland_sym.h
++++ b/src/waffle/wayland/wayland_sym.h
+@@ -26,3 +26,13 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor,
+ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned,
+ (struct wl_proxy *proxy, uint32_t opcode,
+ const struct wl_interface *interface, uint32_t version, ...))
++
++WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags,
++ (struct wl_proxy *p, uint32_t opcode,
++ const struct wl_interface *interface, uint32_t version,
++ uint32_t flags, ...))
++
++WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_array_flags,
++ (struct wl_proxy *p, uint32_t opcode,
++ const struct wl_interface *interface, uint32_t version,
++ uint32_t flags, union wl_argument *args))
+diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h
+index 4af2f64f2890..6addf4ff4c1f 100644
+--- a/src/waffle/wayland/wayland_wrapper.h
++++ b/src/waffle/wayland/wayland_wrapper.h
+@@ -65,5 +65,7 @@ struct wl_display;
+ #define wl_proxy_marshal (*wfl_wl_proxy_marshal)
+ #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor)
+ #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned)
++#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags)
++#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags)
+
+ #include <wayland-client-protocol.h>
diff --git a/patches/waffle-1.7.0/series b/patches/waffle-1.7.0/series
new file mode 100644
index 000000000..1106ee64a
--- /dev/null
+++ b/patches/waffle-1.7.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-wayland-fix-build-against-version-1.20.patch
+# 2ea95c3f6d7514be3a2fefe02b81c232 - git-ptx-patches magic
diff --git a/patches/xkeyboard-config-2.33/0001-rules-merge.py-make-it-compatible-with-Python-3.5.patch b/patches/xkeyboard-config-2.33/0001-rules-merge.py-make-it-compatible-with-Python-3.5.patch
deleted file mode 100644
index 55611265f..000000000
--- a/patches/xkeyboard-config-2.33/0001-rules-merge.py-make-it-compatible-with-Python-3.5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 23 Jul 2021 10:11:02 +0200
-Subject: [PATCH] rules/merge.py: make it compatible with Python 3.5
-
-Path objects as argument for open() are only supported since Python 3.6.
-But Path objects have their own open() function, so use that instead.
-
-Otherwise, building with Python 3.5 fails with:
-
-Traceback (most recent call last):
- File "./merge.py", line 96, in <module>
- merge(fd, [find_file(f) for f in ns.files])
- File "./merge.py", line 61, in merge
- with open(f) as fd:
-TypeError: invalid file: PosixPath('0000-hdr.part')
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- rules/merge.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rules/merge.py b/rules/merge.py
-index 3e395d5077f6..4b6958f24894 100755
---- a/rules/merge.py
-+++ b/rules/merge.py
-@@ -10,7 +10,7 @@ def handle_file(path):
- Return a tuple of (header, path) for the file at path.
- If the file does not have a header, the header is the empty string.
- '''
-- with open(path) as fd:
-+ with path.open() as fd:
- header = fd.readline()
- if header.startswith('! '):
- return header, path
-@@ -58,7 +58,7 @@ def merge(dest, files):
- dest.write('\n')
- dest.write(header)
- for f in sections[header]:
-- with open(f) as fd:
-+ with f.open() as fd:
- if header:
- fd.readline() # drop the header
- dest.write(fd.read())
diff --git a/patches/xkeyboard-config-2.33/series b/patches/xkeyboard-config-2.33/series
deleted file mode 100644
index a8c5c1a81..000000000
--- a/patches/xkeyboard-config-2.33/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-rules-merge.py-make-it-compatible-with-Python-3.5.patch
-# d67a3e25ca542d8b517e11634c37a1aa - git-ptx-patches magic
diff --git a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
new file mode 100644
index 000000000..63bdb67c0
--- /dev/null
+++ b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
@@ -0,0 +1,23 @@
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 28 Mar 2022 18:34:10 -0700
+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04ea89..3fa3e8618f9c 100755
+--- a/configure
++++ b/configure
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
+ else
+ cc=${CROSS_PREFIX}cc
+ fi
++else
++ cc=${CC}
+ fi
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in
diff --git a/patches/zlib-1.2.12/series b/patches/zlib-1.2.12/series
new file mode 100644
index 000000000..ac92b3ba7
--- /dev/null
+++ b/patches/zlib-1.2.12/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
+# 5dfc5088b94416c3eb59b1a207bdec70 - git-ptx-patches magic
diff --git a/platforms/Kconfig b/platforms/Kconfig
index 0bfe34cdc..d9adc4931 100644
--- a/platforms/Kconfig
+++ b/platforms/Kconfig
@@ -40,3 +40,7 @@ source "generated/hosttools_noprompt.in"
source "generated/hosttools_platform.in"
source "generated/platform_project_specific.in"
+
+menu "non-free firmware blobs "
+source "generated/non_free_firmware.in"
+endmenu
diff --git a/platforms/barebox.firmware.in b/platforms/barebox.firmware.in
new file mode 100644
index 000000000..c7275e6d3
--- /dev/null
+++ b/platforms/barebox.firmware.in
@@ -0,0 +1,7 @@
+## SECTION=barebox_firmware
+
+#
+# This file does only exist to create a defined entry in the "barebox_firmware"
+# section, so that the toplevel Kconfig can include generated/barebox_firmware.in
+# even if no package is in that category.
+#
diff --git a/platforms/barebox.in b/platforms/barebox.in
index d35d16501..c8192f0c9 100644
--- a/platforms/barebox.in
+++ b/platforms/barebox.in
@@ -8,7 +8,12 @@ config BAREBOX_ARCH_STRING
default "ppc" if ARCH_PPC
default "x86" if ARCH_X86
+config BAREBOX_DEPENDENCIES
+ tristate
+ select VIRTUAL
+
menuconfig BAREBOX
+ select BAREBOX_DEPENDENCIES
select BOOTLOADER
select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB
select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL
@@ -55,6 +60,14 @@ config BAREBOX_CONFIG
This entry specifies the .config file used to compile
barebox.
+menuconfig BAREBOX_FIRMWARE
+ bool
+ prompt "integrate firmware blobs "
+
+if BAREBOX_FIRMWARE
+source "generated/barebox_firmware.in"
+endif
+
config BAREBOX_EXTRA_ENV
prompt "extend the builtin barebox environment"
bool
@@ -99,6 +112,8 @@ config BAREBOX_BAREBOXIMD
The tool 'bareboximd' can be used to extract metadata from
the (flashed) barebox image.
+comment "build dependencies"
+
config BAREBOX_NEEDS_HOST_LIBUSB
prompt "barebox needs libusb"
bool
diff --git a/platforms/image-root-cpio-gz.in b/platforms/image-root-cpio-gz.in
deleted file mode 100644
index e1feb5f9b..000000000
--- a/platforms/image-root-cpio-gz.in
+++ /dev/null
@@ -1,10 +0,0 @@
-## SECTION=image
-
-config IMAGE_ROOT_CPIO_GZ
- tristate
- select HOST_GENIMAGE
- select IMAGE_ROOT_TGZ
- prompt "Generate images/root.cpio.gz"
- help
- Build the traditionally initrd RAM disk to be used
- as initramfs by the kernel.
diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in
index f5ee4c1d8..0338175a0 100644
--- a/platforms/image-root-cpio.in
+++ b/platforms/image-root-cpio.in
@@ -1,10 +1,90 @@
## SECTION=image
-config IMAGE_ROOT_CPIO
+menuconfig IMAGE_ROOT_CPIO
tristate
select HOST_GENIMAGE
select IMAGE_ROOT_TGZ
- prompt "Generate images/root.cpio"
+ select HOST_ZSTD if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD
+ select HOST_XZ if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ
+ select HOST_LZOP if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP
+ prompt "Generate images/root.cpio "
help
- Build the traditionally initrd RAM disk to be used
- as initramfs by the kernel.
+ Build the traditional rootfs to be used as initramfs
+ by the kernel.
+ The compression choices are for external initramfs use.
+ When including a cpio archive inside the kernel blob,
+ the kernel build system can manage compressing the cpio
+ archive itself.
+ Beware, not all compressors are inherently deterministic
+ when using them in a multithreaded fashion.
+
+if IMAGE_ROOT_CPIO
+
+choice
+ prompt "CPIO compression mode"
+ default IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE
+
+config IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE
+ bool
+ prompt "no compression"
+ help
+ No compression.
+
+config IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ
+ bool
+ prompt "gz"
+ help
+ Compress root.cpio with gz.
+ Uses default compression level.
+
+config IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD
+ bool
+ prompt "zstd"
+ help
+ Compress root.cpio with zstd.
+ Uses multithreaded, compression level 19.
+
+config IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ
+ bool
+ prompt "xz"
+ help
+ Compress root.cpio with xz.
+ Uses default compression level and
+ crc32 checksum for kernel cpio compatibility.
+
+config IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP
+ bool
+ prompt "lzop"
+ help
+ Compress root.cpio with lzop.
+ Uses default compression level.
+
+endchoice
+
+config IMAGE_ROOT_CPIO_CUSTOM_COMPRESSION
+ bool
+ prompt "customize compression command"
+ help
+ This allows specifying additional arguments to the compressor
+ command. Note that the command itself should not be changed.
+ Otherwise ptxdist cannot ensure that the tool is available.
+
+config IMAGE_ROOT_CPIO_COMPRESSION_SUFFIX
+ string
+ prompt "compression suffix" if IMAGE_ROOT_CPIO_CUSTOM_COMPRESSION
+ default "" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE
+ default ".gz" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ
+ default ".zst" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD
+ default ".xz" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ
+ default ".lzo" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP
+
+config IMAGE_ROOT_CPIO_COMPRESSION_UTIL
+ string
+ prompt "compression tool" if IMAGE_ROOT_CPIO_CUSTOM_COMPRESSION
+ default "" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE
+ default "gzip" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ
+ default "zstd -T0 -19" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD
+ default "xz --check=crc32" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ
+ default "lzop" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP
+
+endif
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 9f355f5dc..7afda4026 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -129,6 +129,7 @@ choice
help
This is the target to get the kernel image as an raw uncompressed
binary file.
+
config KERNEL_IMAGE_SIMPLE
bool
prompt "simpleImage"
diff --git a/platforms/non_free_firmware.in b/platforms/non_free_firmware.in
new file mode 100644
index 000000000..c0635859a
--- /dev/null
+++ b/platforms/non_free_firmware.in
@@ -0,0 +1,7 @@
+## SECTION=non_free_firmware
+
+#
+# This file does only exist to create a defined entry in the "non_free_firmware"
+# section, so that the toplevel Kconfig can include generated/non_free_firmware.in
+# even if no package is in that category.
+#
diff --git a/platforms/optee.in b/platforms/optee.in
index 49925d0e4..4e2b4eb25 100644
--- a/platforms/optee.in
+++ b/platforms/optee.in
@@ -3,8 +3,9 @@
menuconfig OPTEE
prompt "OP-TEE "
bool
- select HOST_SYSTEM_PYTHON
- select HOST_SYSTEM_PYTHON_CRYPTO
+ select HOST_SYSTEM_PYTHON3
+ select HOST_SYSTEM_PYTHON3_PYELFTOOLS
+ select HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
depends on ARCH_ARM || ARCH_ARM64
depends on !ARCH_ARM64 || BROKEN
help
diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index d5410e4a1..ba117b089 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -20,6 +20,16 @@ config U_BOOT_MD5
string
prompt "U-Boot source md5"
+config U_BOOT_BUILD_OOT
+ prompt "Out of tree build"
+ default y
+ bool
+ help
+ U-Boot is usually built out of tree.
+ But for some builds, f.ex. with firmware blobs, out of tree builds
+ can break because of vendors using source paths to files.
+ Disable OOT build if you need a workaround for those type of builds.
+
choice
prompt "config system"
default U_BOOT_CONFIGSYSTEM_LEGACY
@@ -160,6 +170,13 @@ endif
comment "target install"
+config U_BOOT_INSTALL_U_BOOT_BIN
+ prompt "install u-boot.bin"
+ bool
+ default y
+ help
+ Installing the U-Boot default binary target.
+
config U_BOOT_INSTALL_SREC
prompt "install u-boot.srec"
bool
@@ -248,6 +265,14 @@ config U_BOOT_INSTALL_U_BOOT_STM32
platform image directory. Say yes if you are building for STM32MP1
SOCs.
+config U_BOOT_INSTALL_U_BOOT_FLASH_BIN
+ prompt "install flash.bin"
+ bool
+ help
+ Installing the U-Boot image to Gateworks.
+
+comment "build dependencies"
+
config U_BOOT_NEEDS_HOST_OPENSSL
prompt "needs host OpenSSL"
bool
diff --git a/projectroot/etc/group b/projectroot/etc/group
index 69d650510..b1965e6c2 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -34,4 +34,6 @@ pulse:x:210:
chrony:x:211:
rauc-hawkbit:x:212:
redis:x:213:
+sgx:x:214:
+seat:x:215:
nogroup:x:65534:
diff --git a/projectroot/usr/lib/systemd/system/seatd.service b/projectroot/usr/lib/systemd/system/seatd.service
index 59137e67c..4ffb5d114 100644
--- a/projectroot/usr/lib/systemd/system/seatd.service
+++ b/projectroot/usr/lib/systemd/system/seatd.service
@@ -5,4 +5,4 @@ Description=Seat management daemon
Restart=always
# Do not require a VT
Environment=SEATD_VTBOUND=0
-ExecStart=/usr/bin/seatd
+ExecStart=/usr/bin/seatd -g seat
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 7fb6a1287..c503315c7 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
#
# Paths and names
#
-ALSA_LIB_VERSION := 1.2.5.1
-ALSA_LIB_MD5 := c8335793e7828803311edc48fb71662e
+ALSA_LIB_VERSION := 1.2.6.1
+ALSA_LIB_MD5 := 039aae4a55e4a33f4c39b274fcc1dc5e
ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
ALSA_LIB_SUFFIX := tar.bz2
ALSA_LIB_URL := \
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 2693336a1..a71744d7e 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils
#
# Paths and names
#
-ALSA_UTILS_VERSION := 1.2.5.1
-ALSA_UTILS_MD5 := 8f142bebff84ff05438b46a0e896f53a
+ALSA_UTILS_VERSION := 1.2.6
+ALSA_UTILS_MD5 := fc109b2fa4517caeae1697d936ca78ff
ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION)
ALSA_UTILS_SUFFIX := tar.bz2
ALSA_UTILS_URL := \
diff --git a/rules/aml.in b/rules/aml.in
new file mode 100644
index 000000000..897028c61
--- /dev/null
+++ b/rules/aml.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config AML
+ tristate
+ select HOST_MESON
+ prompt "aml"
+ help
+ Andri's Main Loop
diff --git a/rules/aml.make b/rules/aml.make
new file mode 100644
index 000000000..f083fe29a
--- /dev/null
+++ b/rules/aml.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_AML) += aml
+
+#
+# Paths and names
+#
+AML_VERSION := 0.2.1
+AML_MD5 := 8416dc2bdcd4c8c56d5e246468a30c2d
+AML := aml-$(AML_VERSION)
+AML_SUFFIX := tar.gz
+AML_URL := https://github.com/any1/aml/archive/refs/tags/v$(AML_VERSION).$(AML_SUFFIX)
+AML_SOURCE := $(SRCDIR)/$(AML).$(AML_SUFFIX)
+AML_DIR := $(BUILDDIR)/$(AML)
+AML_LICENSE := ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+AML_CONF_TOOL := meson
+AML_CONF_OPT := \
+ $(CROSS_MESON_USR) \
+ -Dexamples=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/aml.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, aml)
+ @$(call install_fixup, aml,PRIORITY,optional)
+ @$(call install_fixup, aml,SECTION,base)
+ @$(call install_fixup, aml,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
+ @$(call install_fixup, aml,DESCRIPTION,missing)
+
+ @$(call install_lib, aml, 0, 0, 0644, libaml)
+
+ @$(call install_finish, aml)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/atkmm.in b/rules/atkmm.in
index 1c17c69e3..a13c64a32 100644
--- a/rules/atkmm.in
+++ b/rules/atkmm.in
@@ -1,4 +1,6 @@
-## SECTION=multimedia_gtk
+## SECTION=staging
+## old section:
+### SECTION=multimedia_gtk
config ATKMM
tristate
@@ -9,3 +11,6 @@ config ATKMM
atkmm is the official C++ interface for the ATK accessibility
toolkit library. It may be used, for instance, by user interfaces
implemented with gtkmm.
+
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and glibmm was move to staging.
diff --git a/rules/aumix.in b/rules/aumix.in
index a3df52201..593e39b30 100644
--- a/rules/aumix.in
+++ b/rules/aumix.in
@@ -1,4 +1,6 @@
-## SECTION=multimedia_sound
+## SECTION=staging
+## old section:
+### SECTION=multimedia_sound
config AUMIX
tristate
@@ -15,3 +17,6 @@ config AUMIX
can read default settings from a file, and it can also
automatically save and restore the mixer settings at
shutdown and boot.
+
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain.
diff --git a/rules/barebox.make b/rules/barebox.make
index bea9f3adc..753a47b59 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -34,6 +34,8 @@ BAREBOX_CONFIG := $(call ptx/in-platformconfigdir, \
# Prepare
# ----------------------------------------------------------------------------
+BAREBOX_INJECT_PATH := ${PTXDIST_SYSROOT_TARGET}/usr/lib/firmware
+
# use host pkg-config for host tools
BAREBOX_PATH := PATH=$(HOST_PATH)
@@ -94,6 +96,10 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
@rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env
endif
+ifdef PTXCONF_BAREBOX_FIRMWARE
+ @$(call world/inject, BAREBOX)
+endif
+
@$(call touch)
# ----------------------------------------------------------------------------
@@ -172,28 +178,31 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),)
@$(call install_finish, barebox)
endif
- @rm -f $(IMAGEDIR)/barebox-image
+ @$(call world/image-clean, BAREBOX)
@if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \
find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort | while read image; do \
- install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \
+ $(call ptx/image-install, BAREBOX, $$image); \
if [ ! -e $(IMAGEDIR)/barebox-image ]; then \
- ln -sf `basename $$image` $(IMAGEDIR)/barebox-image; \
+ $(call ptx/image-install-link, BAREBOX, `basename $$image`, barebox-image); \
fi; \
done; \
fi
@if [ -e $(IMAGEDIR)/barebox-image ]; then \
:; \
elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \
- install -D -m644 $(BAREBOX_BUILD_DIR)/barebox-flash-image $(IMAGEDIR)/barebox-image; \
+ $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox-flash-image, barebox-image); \
else \
- install -D -m644 $(BAREBOX_BUILD_DIR)/barebox.bin $(IMAGEDIR)/barebox-image; \
+ $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox.bin, barebox-image); \
fi
@if [ -e $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env ]; then \
- install -D -m644 $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-default-environment; \
+ $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env, \
+ barebox-default-environment); \
elif [ -e $(BAREBOX_BUILD_DIR)/common/barebox_default_env ]; then \
- install -D -m644 $(BAREBOX_BUILD_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
+ $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/common/barebox_default_env, \
+ barebox-default-environment); \
elif [ -e $(BAREBOX_BUILD_DIR)/barebox_default_env ]; then \
- install -D -m644 $(BAREBOX_BUILD_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
+ $(call ptx/image-install, BAREBOX, $(BAREBOX_BUILD_DIR)/barebox_default_env, \
+ barebox-default-environment); \
fi
@$(call touch)
@@ -206,7 +215,6 @@ $(STATEDIR)/barebox.clean:
@$(call clean_pkg, BAREBOX)
@$(foreach prog, $(BAREBOX_PROGS_HOST), \
rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl))
- @rm -vf $(IMAGEDIR)/barebox-image $(IMAGEDIR)/barebox-default-environment
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
index 83e01ef0b..a3ee4a3ba 100644
--- a/rules/barebox_mlo.make
+++ b/rules/barebox_mlo.make
@@ -68,18 +68,18 @@ $(STATEDIR)/barebox_mlo.install:
$(STATEDIR)/barebox_mlo.targetinstall:
@$(call targetinfo)
+ @$(call world/image-clean, BAREBOX_MLO)
# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift
- @rm -f $(IMAGEDIR)/MLO
@for image in `ls $(BAREBOX_MLO_DIR)/images/barebox-*.img`; do \
- install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \
+ $(call ptx/image-install, BAREBOX_MLO, $$image); \
if [ ! -e "$(IMAGEDIR)/MLO" ]; then \
- ln -sf `basename $$image` $(IMAGEDIR)/MLO; \
+ $(call ptx/image-install-link, BAREBOX_MLO, `basename $$image`, MLO); \
fi; \
done
@if [ ! -e "$(IMAGEDIR)/MLO" ]; then \
ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \
"$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \
- install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO"; \
+ $(call ptx/image-install, BAREBOX_MLO, "$${ptxd_reply}", MLO); \
fi
@$(call touch)
@@ -91,7 +91,6 @@ $(STATEDIR)/barebox_mlo.targetinstall:
$(STATEDIR)/barebox_mlo.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_MLO)
- rm -rf $(IMAGEDIR)/MLO
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
diff --git a/rules/bash.make b/rules/bash.make
index 881ba55fd..8213aafad 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -13,8 +13,8 @@ PACKAGES-$(PTXCONF_BASH) += bash
#
# Paths and names
#
-BASH_VERSION := 5.1.8
-BASH_MD5 := 23eee6195b47318b9fd878e590ccb38c
+BASH_VERSION := 5.1.16
+BASH_MD5 := c17b20a09fc38d67fb303aeb6c130b4e
BASH := bash-$(BASH_VERSION)
BASH_SUFFIX := tar.gz
BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
diff --git a/rules/bonniexx.in b/rules/bonniexx.in
index 36928fece..2a2c74a72 100644
--- a/rules/bonniexx.in
+++ b/rules/bonniexx.in
@@ -1,4 +1,6 @@
-## SECTION=test_suites
+## SECTION=staging
+## old section:
+### SECTION=test_suites
config BONNIEXX
tristate
prompt "bonnie++"
@@ -10,3 +12,6 @@ config BONNIEXX
This program also tests performance by creating large numbers
of files.
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and fails to build with a current
+ toolchain (gcc 11).
diff --git a/rules/boost.make b/rules/boost.make
index c18c290e8..e15c8891a 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -129,10 +129,10 @@ ifdef PTXCONF_BOOST_MPI
endif
ifdef PTXCONF_BOOST_PYTHON3
- @echo "using python : $(PYTHON3_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+ @echo "using python : $(PYTHON3_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
endif
ifdef PTXCONF_BOOST_PYTHON2
- @echo "using python : $(PYTHON_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+ @echo "using python : $(PYTHON_MAJORMINOR) : $(PTXDIST_SYSROOT_CROSS)/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR) : $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
endif
@echo "all:" > $(BOOST_DIR)/Makefile
diff --git a/rules/busybox.in b/rules/busybox.in
index 3f2116d4e..6bb60145d 100644
--- a/rules/busybox.in
+++ b/rules/busybox.in
@@ -11,7 +11,6 @@ menuconfig BUSYBOX
select PAM if GLOBAL_PAM
select BUSYBOX_PAM if GLOBAL_PAM
select LIBTIRPC if BUSYBOX_NEED_LIBTIRPC
- select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_INSTALL_NO_USR
help
BusyBox is the Swiss Army Knife of embedded Linux. It is a
diff --git a/rules/busybox.make b/rules/busybox.make
index 46486dfe3..413ad735c 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
#
# Paths and names
#
-BUSYBOX_VERSION := 1.31.1
-BUSYBOX_MD5 := 70913edaf2263a157393af07565c17f0
+BUSYBOX_VERSION := 1.35.0
+BUSYBOX_MD5 := 585949b1dd4292b604b7d199866e9913
BUSYBOX := busybox-$(BUSYBOX_VERSION)
BUSYBOX_SUFFIX := tar.bz2
BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
diff --git a/rules/cbmbasic.in b/rules/cbmbasic.in
index 3714afed0..83d492132 100644
--- a/rules/cbmbasic.in
+++ b/rules/cbmbasic.in
@@ -1,4 +1,6 @@
-## SECTION=scripting_languages
+## SECTION=staging
+## old section:
+### SECTION=scripting_languages
config CBMBASIC
tristate
@@ -7,3 +9,5 @@ config CBMBASIC
This application is a recompiled version of the original
Commodore 64 binary.
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain (gcc 11).
diff --git a/rules/chrony.make b/rules/chrony.make
index 7e51714bc..eb700134d 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
#
# Paths and names
#
-CHRONY_VERSION := 4.1
-CHRONY_MD5 := 7133880806887b629678c36a48217806
+CHRONY_VERSION := 4.2
+CHRONY_MD5 := 07282f8e76a4399d6c17009bb6345614
CHRONY := chrony-$(CHRONY_VERSION)
CHRONY_SUFFIX := tar.gz
CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX)
diff --git a/rules/classpath.in b/rules/classpath.in
index 271a91728..eb32f5948 100644
--- a/rules/classpath.in
+++ b/rules/classpath.in
@@ -1,4 +1,6 @@
-## SECTION=bytecode_engines
+## SECTION=staging
+## old section:
+### SECTION=bytecode_engines
config CLASSPATH
tristate
@@ -11,3 +13,7 @@ config CLASSPATH
free core class libraries for use with virtual machines and compilers
for the java programming language.
+ STAGING: remove in ptxdist-2019.04.0
+ Old, obsolete package and needs javah to build, which is not
+ available on any current distribution.
+
diff --git a/rules/cog.make b/rules/cog.make
index a59f5a114..3185a0e9c 100644
--- a/rules/cog.make
+++ b/rules/cog.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
#
# Paths and names
#
-COG_VERSION := 0.10.0
-COG_MD5 := 1b0407b6163a3a01afdfc0fb454a7570
+COG_VERSION := 0.12.1
+COG_MD5 := 25a80a5a8a52b8873933a128151b8928
COG := cog-$(COG_VERSION)
COG_SUFFIX := tar.xz
COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
@@ -35,16 +35,21 @@ COG_CONF_TOOL := cmake
COG_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-G Ninja \
+ -DBUILD_DOCS=OFF \
-DCOG_APPID= \
-DCOG_BUILD_PROGRAMS=ON \
-DCOG_DBUS_OWN_USER= \
-DCOG_DBUS_SYSTEM_BUS=$(call ptx/onoff,PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS) \
-DCOG_HOME_URI=https://ptxdist.org/ \
+ -DCOG_MODULEDIR=/usr/lib/cog/modules \
-DCOG_PLATFORM_DRM=OFF \
- -DCOG_PLATFORM_FDO=ON \
- -DCOG_USE_WEBKITGTK=OFF \
+ -DCOG_PLATFORM_GTK4=OFF \
+ -DCOG_PLATFORM_HEADLESS=OFF \
+ -DCOG_PLATFORM_WL=ON \
+ -DCOG_PLATFORM_X11=OFF \
-DCOG_WESTON_DIRECT_DISPLAY=OFF \
-DINSTALL_MAN_PAGES=OFF \
+ -DUSE_SOUP2=ON \
-DWAYLAND_PROTOCOLS=$(PTXDIST_SYSROOT_TARGET)/usr/share/wayland-protocols
# ----------------------------------------------------------------------------
@@ -61,7 +66,7 @@ $(STATEDIR)/cog.targetinstall:
@$(call install_fixup, cog,DESCRIPTION,"WPE launcher and webapp container")
@$(call install_copy, cog, 0, 0, 0755, -, /usr/bin/cog)
- @$(call install_lib, cog, 0, 0, 0644, libcogplatform-fdo)
+ @$(call install_lib, cog, 0, 0, 0644, cog/modules/libcogplatform-wl)
@$(call install_lib, cog, 0, 0, 0644, libcogcore)
ifdef PTXCONF_COG_REMOTE_DBUS_SYSTEM_BUS
diff --git a/rules/crda.in b/rules/crda.in
index b0008e7f5..48d952555 100644
--- a/rules/crda.in
+++ b/rules/crda.in
@@ -1,12 +1,26 @@
## SECTION=networking
-config CRDA
+menuconfig CRDA
tristate
select LIBNL3
select OPENSSL
- prompt "crda"
+ select HOST_SYSTEM_PYTHON3
+ prompt "crda "
help
CRDA acts as the udev helper for communication between the kernel and
userspace for regulatory compliance. It relies on nl80211 for communication.
CRDA is intended to be run only through udev communication from the kernel.
The user should never have to run it manually except if debugging udev issues.
+
+if CRDA
+
+config CRDA_ONLY_REGULATORY_DB
+ bool
+ prompt "Install only regulatory db"
+ help
+ CRDA is a legacy option for kernels older than 4.15.
+ Newer kernels can use the regulatory db as a firmware file,
+ without external help.
+ If enabled, the CRDA package only installs the regulatory.db file.
+
+endif
diff --git a/rules/crda.make b/rules/crda.make
index 9cbb7af93..c3048c760 100644
--- a/rules/crda.make
+++ b/rules/crda.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CRDA) += crda
#
# Paths and names
#
-CRDA_VERSION := 3.18
-CRDA_MD5 := 0431fef3067bf503dfb464069f06163a
+CRDA_VERSION := 4.14
+CRDA_MD5 := cac7ba8de3e2e6aa46918e0c76df7d67
CRDA := crda-$(CRDA_VERSION)
-CRDA_SUFFIX := tar.xz
-CRDA_URL := $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX))
+CRDA_SUFFIX := tar.gz
+CRDA_URL := https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/$(CRDA).$(CRDA_SUFFIX)
CRDA_SOURCE := $(SRCDIR)/$(CRDA).$(CRDA_SUFFIX)
CRDA_DIR := $(BUILDDIR)/$(CRDA)
CRDA_LICENSE := ISC AND copyleft-next-0.3.0
@@ -26,8 +26,8 @@ CRDA_LICENSE_FILES := \
file://LICENSE;md5=ef8b69b43141352d821fd66b64ff0ee7 \
file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe
-CRDA_REGDB_VERSION := 2019.06.03
-CRDA_REGDB_MD5 := e16f223ec2ecb4937b1a8ef9ce8dda99
+CRDA_REGDB_VERSION := 2021.08.28
+CRDA_REGDB_MD5 := 54db6062be38311b07bf9fd039c95e5d
CRDA_REGDB := wireless-regdb-$(CRDA_REGDB_VERSION)
CRDA_REGDB_SUFFIX := tar.gz
CRDA_REGDB_URL := \
@@ -97,6 +97,7 @@ $(STATEDIR)/crda.targetinstall:
@$(call install_fixup, crda,AUTHOR,"Jan Luebbe <jlu@pengutronix.de>")
@$(call install_fixup, crda,DESCRIPTION,missing)
+ifndef PTXCONF_CRDA_ONLY_REGULATORY_DB
@$(call install_copy, crda, 0, 0, 0755, -, /usr/sbin/crda)
@$(call install_copy, crda, 0, 0, 0755, -, /usr/sbin/regdbdump)
@$(call install_copy, crda, 0, 0, 0644, -, \
@@ -107,6 +108,8 @@ $(STATEDIR)/crda.targetinstall:
/usr/lib/crda/pubkeys)
@$(call install_alternative, crda, 0, 0, 0644, \
/usr/lib/crda/regulatory.bin)
+endif
+
@$(call install_alternative, crda, 0, 0, 0644, \
/lib/firmware/regulatory.db)
@$(call install_alternative, crda, 0, 0, 0644, \
diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make
index 2d6dbb0ca..4ad4407e8 100644
--- a/rules/cross-nasm.make
+++ b/rules/cross-nasm.make
@@ -15,9 +15,9 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_NASM) += cross-nasm
#
# Paths and names
#
-CROSS_NASM_VERSION := 2.15
+CROSS_NASM_VERSION := 2.15.05
ifdef PTXCONF_ARCH_X86
-CROSS_NASM_MD5 := 986015a82980f5719e1d56108d26256b
+CROSS_NASM_MD5 := 1c9802446d7341c41c21eb98c7859064
CROSS_NASM := nasm-$(CROSS_NASM_VERSION)
CROSS_NASM_SUFFIX := tar.xz
CROSS_NASM_URL := http://www.nasm.us/pub/nasm/releasebuilds/$(CROSS_NASM_VERSION)/$(CROSS_NASM).$(CROSS_NASM_SUFFIX)
diff --git a/rules/cups-filters.in b/rules/cups-filters.in
index e54984ce0..6f28325d9 100644
--- a/rules/cups-filters.in
+++ b/rules/cups-filters.in
@@ -39,6 +39,7 @@ menuconfig CUPS_FILTERS
if CUPS_FILTERS
config CUPS_FILTERS_POPPLER
+ depends on STAGING
bool "build with poppler support"
help
Build with poppler support, needed for pdfto* filters and banners.
diff --git a/rules/dbus.make b/rules/dbus.make
index 168c58956..90a0347fe 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
#
# Paths and names
#
-DBUS_VERSION := 1.12.20
-DBUS_MD5 := dfe8a71f412e0b53be26ed4fbfdc91c4
+DBUS_VERSION := 1.14.0
+DBUS_MD5 := ddd5570aff05191dbee8e42d751f1b7d
DBUS := dbus-$(DBUS_VERSION)
-DBUS_SUFFIX := tar.gz
+DBUS_SUFFIX := tar.xz
DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
DBUS_SOURCE := $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
DBUS_DIR := $(BUILDDIR)/$(DBUS)
@@ -61,6 +61,7 @@ DBUS_CONF_OPT := \
--disable-console-owner-file \
--disable-launchd \
--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-systemd \
+ --enable-traditional-activation \
--disable-embedded-tests \
--disable-modular-tests \
--disable-tests \
@@ -70,13 +71,14 @@ DBUS_CONF_OPT := \
--$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \
--disable-compile-warnings \
--disable-Werror \
+ --disable-qt-help \
--disable-relocation \
--disable-stats \
--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \
--with-system-socket=/run/dbus/system_bus_socket \
--with-dbus-user=messagebus \
--without-valgrind \
- --$(call ptx/wwo, PTXCONF_DBUS_X)-x$(call ptx/ifdef,PTXCONF_DBUS_X,=$(SYSROOT)/usr,) \
+ --with-x=$(call ptx/ifdef,PTXCONF_DBUS_X,auto,no) \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-systemduserunitdir=/usr/lib/systemd/user
diff --git a/rules/dropwatch.make b/rules/dropwatch.make
index 479437f77..3bf7190b7 100644
--- a/rules/dropwatch.make
+++ b/rules/dropwatch.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_DROPWATCH) += dropwatch
#
# Paths and names
#
-DROPWATCH_VERSION := 1.5.3
-DROPWATCH_MD5 := 64527bb669393e45b9b21f0b91c574c0
+DROPWATCH_VERSION := 1.5.4
+DROPWATCH_MD5 := 94d03b47f424924cf24f21dad941a473
DROPWATCH := dropwatch-$(DROPWATCH_VERSION)
DROPWATCH_SUFFIX := tar.gz
DROPWATCH_URL := https://github.com/nhorman/dropwatch/archive/v$(DROPWATCH_VERSION).${DROPWATCH_SUFFIX}
diff --git a/rules/dump1090fa.make b/rules/dump1090fa.make
index c22e11c40..6e63edeef 100644
--- a/rules/dump1090fa.make
+++ b/rules/dump1090fa.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
#
# Paths and names
#
-DUMP1090FA_VERSION := 6.1
-DUMP1090FA_MD5 := a7cb661bc23974f8bf7650ce26b6e0be
+DUMP1090FA_VERSION := 7.2
+DUMP1090FA_MD5 := 86c64b1a6d76d0c2fb5d048791ff52e5
DUMP1090FA := dump1090fa-$(DUMP1090FA_VERSION)
DUMP1090FA_SUFFIX := tar.gz
DUMP1090FA_URL := https://github.com/flightaware/dump1090/archive/refs/tags/v$(DUMP1090FA_VERSION).$(DUMP1090FA_SUFFIX)
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 8a153f3b2..a7718d26a 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
#
# Paths and names
#
-E2FSPROGS_VERSION := 1.46.4
-E2FSPROGS_MD5 := 128f5b0f0746b28d1e3ca7e263c57094
+E2FSPROGS_VERSION := 1.46.5
+E2FSPROGS_MD5 := 3da91854c960ad8a819b48b2a404eb43
E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_SUFFIX := tar.gz
E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
diff --git a/rules/efibootmgr.make b/rules/efibootmgr.make
index 98b9aa97e..1fbdaff8b 100644
--- a/rules/efibootmgr.make
+++ b/rules/efibootmgr.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIBOOTMGR) += efibootmgr
#
# Paths and names
#
-EFIBOOTMGR_VERSION := 16
-EFIBOOTMGR_MD5 := ab7cf46774fda951a0e8a40beb65a90e
+EFIBOOTMGR_VERSION := 17
+EFIBOOTMGR_MD5 := 9ac3f45dba5a2608148876763e54723c
EFIBOOTMGR := efibootmgr-$(EFIBOOTMGR_VERSION)
EFIBOOTMGR_SUFFIX := tar.bz2
EFIBOOTMGR_URL := https://github.com/rhboot/efibootmgr/releases/download/$(EFIBOOTMGR_VERSION)/$(EFIBOOTMGR).$(EFIBOOTMGR_SUFFIX)
diff --git a/rules/efivar.make b/rules/efivar.make
index db0ed001f..95a759f94 100644
--- a/rules/efivar.make
+++ b/rules/efivar.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar
#
# Paths and names
#
-EFIVAR_VERSION := 37
-EFIVAR_MD5 := 9f067275c5f7aafdd75bfb364280ac9c
+EFIVAR_VERSION := 38
+EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f
EFIVAR := efivar-$(EFIVAR_VERSION)
EFIVAR_SUFFIX := tar.bz2
EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX)
@@ -28,7 +28,11 @@ EFIVAR_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
EFIVAR_CONF_TOOL := NO
-EFIVAR_MAKE_ENV := $(CROSS_ENV) PTXDIST_ICECC=$(PTXDIST_ICERUN)
+EFIVAR_MAKE_ENV := \
+ $(CROSS_ENV) \
+ ERRORS="-Wno-error" \
+ PTXDIST_ICECC=$(PTXDIST_ICERUN)
+
EFIVAR_INSTALL_OPT := libdir="/usr/$(CROSS_LIB_DIR)/" install
EFIVAR_CFLAGS := \
diff --git a/rules/ethtool.make b/rules/ethtool.make
index 19d554893..5c9f897a5 100644
--- a/rules/ethtool.make
+++ b/rules/ethtool.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool
#
# Paths and names
#
-ETHTOOL_VERSION := 5.15
-ETHTOOL_MD5 := 967f92926a453d3eb9bf41f73223f173
+ETHTOOL_VERSION := 5.17
+ETHTOOL_MD5 := 9bb991ffd87184b74d2d0fda3ba6ed02
ETHTOOL_SUFFIX := tar.xz
ETHTOOL := ethtool-$(ETHTOOL_VERSION)
ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX))
diff --git a/rules/expat.make b/rules/expat.make
index 1fa8221fc..ccea2d6ba 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat
#
# Paths and names
#
-EXPAT_VERSION := 2.4.2
-EXPAT_MD5 := 58780ad6944d02f6cf6ba332838694b2
+EXPAT_VERSION := 2.4.8
+EXPAT_MD5 := 0aa62f74c097c96ecbe62e656f352c3b
EXPAT := expat-$(EXPAT_VERSION)
EXPAT_SUFFIX := tar.bz2
EXPAT_URL := $(call ptx/mirror, SF, expat/$(EXPAT).$(EXPAT_SUFFIX))
diff --git a/rules/freeglut.in b/rules/freeglut.in
index 2de74f51f..24b9f593f 100644
--- a/rules/freeglut.in
+++ b/rules/freeglut.in
@@ -1,4 +1,6 @@
-## SECTION=multimedia_xorg_support_libs
+## SECTION=staging
+## old section:
+### SECTION=multimedia_xorg_support_libs
config FREEGLUT
tristate
@@ -19,3 +21,6 @@ config FREEGLUT
of platforms and also read the mouse, keyboard and
joystick functions.
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and fails to build with a current
+ toolchain (gcc 11).
diff --git a/rules/freetype.make b/rules/freetype.make
index ed6d22379..7008ebb78 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -15,18 +15,18 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
#
# Paths and names
#
-FREETYPE_VERSION := 2.10.4
-FREETYPE_MD5 := 0e6c0e9b218be3ba3e26e1d23b1c80dd
+FREETYPE_VERSION := 2.12.1
+FREETYPE_MD5 := 7f7cd7c706d8e402354305c1c59e3ff2
FREETYPE := freetype-$(FREETYPE_VERSION)
FREETYPE_SUFFIX := tar.xz
FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
FREETYPE_DIR := $(BUILDDIR)/$(FREETYPE)
FREETYPE_LICENSE := BSD-2-Clause AND FTL AND GPL-2.0-or-later
FREETYPE_LICENSE_FILES := \
- file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
+ file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
- file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \
+ file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \
file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34
FREETYPE_URL := \
@@ -37,14 +37,12 @@ FREETYPE_URL := \
# Prepare
# ----------------------------------------------------------------------------
-#
-# autoconf
-#
+# freetype's top level configure is handcrafted
+
FREETYPE_CONF_TOOL := autoconf
FREETYPE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-static \
- --disable-biarch-config \
--enable-freetype-config \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-mmap \
@@ -52,6 +50,7 @@ FREETYPE_CONF_OPT := \
--without-bzip2 \
--without-png \
--without-harfbuzz \
+ --without-brotli \
--without-old-mac-fonts \
--without-fsspec \
--without-fsref \
diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in
index 74ede3085..00c7ef436 100644
--- a/rules/gdb-menu.in
+++ b/rules/gdb-menu.in
@@ -18,12 +18,12 @@ if !GDB_TOOLCHAIN_VERSION
config GDB_VERSION
string "gdb version"
- default "11.1"
+ default "11.2"
endif
config GDB_MD5
string "gdb source md5sum"
- default "257cb0f67927f79acf636d8c01e19990" if !GDB_TOOLCHAIN_VERSION
+ default "433bd0904caa31c247b1b1867f2f911d" if !GDB_TOOLCHAIN_VERSION
help
md5sum for the gdb source archive. If the version is provided by
the toolchain and the toolchain is an OSELAS.Toolchain then this
diff --git a/rules/gdb.make b/rules/gdb.make
index ca0e7dbe5..8d2c7ffdb 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -37,10 +37,21 @@ GDB_WRAPPER_BLACKLIST := \
TARGET_HARDEN_PIE
endif
-GDB_ENV := \
+GDB_CONF_OPT_HOST := \
+ --disable-tui \
+ --disable-rpath \
+ --without-expat
+
+ifneq ($(filter 1%,$(GDBSERVER_VERSION)),)
+# version >= 10
+GDB_CONF_OPT_HOST += \
+ --without-xxhash
+endif
+
+GDB_CONF_ENV := \
$(CROSS_ENV) \
$(CROSS_ENV_FLAGS_FOR_TARGET) \
- host_configargs='--disable-tui --disable-rpath --without-expat'
+ host_configargs='$(GDB_CONF_OPT_HOST)'
ifndef PTXCONF_GDB_SHARED
GDB_MAKEVARS := LDFLAGS=-static
@@ -49,13 +60,12 @@ endif
#
# autoconf
#
-GDB_AUTOCONF := \
+GDB_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--target=$(PTXCONF_GNU_TARGET) \
--with-build-sysroot=$(SYSROOT) \
--disable-werror
-
GDB_BUILD_OOT := YES
# ----------------------------------------------------------------------------
diff --git a/rules/glib-networking.make b/rules/glib-networking.make
index 0b4408198..c6f616d14 100644
--- a/rules/glib-networking.make
+++ b/rules/glib-networking.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLIB_NETWORKING) += glib-networking
#
# Paths and names
#
-GLIB_NETWORKING_VERSION := 2.68.1
-GLIB_NETWORKING_MD5 := 182ae3263763160a2cf0bd4f854448c3
+GLIB_NETWORKING_VERSION := 2.72.0
+GLIB_NETWORKING_MD5 := ff149a669ea3d1d193a468472bcdc696
GLIB_NETWORKING := glib-networking-$(GLIB_NETWORKING_VERSION)
GLIB_NETWORKING_SUFFIX := tar.xz
GLIB_NETWORKING_URL := $(call ptx/mirror, GNOME, glib-networking/$(basename $(GLIB_NETWORKING_VERSION))/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX))
diff --git a/rules/glib.make b/rules/glib.make
index 783288b95..3679362e8 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
#
# Paths and names
#
-GLIB_VERSION := 2.70.1
-GLIB_MD5 := fb613d21fabce3d3d8520f37d12bd473
+GLIB_VERSION := 2.72.0
+GLIB_MD5 := 46a8e04b1b42b64cbef2ea434923e704
GLIB := glib-$(GLIB_VERSION)
GLIB_SUFFIX := tar.xz
GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
diff --git a/rules/glibmm.in b/rules/glibmm.in
index 6de0a213e..e8f99523c 100644
--- a/rules/glibmm.in
+++ b/rules/glibmm.in
@@ -1,4 +1,6 @@
-## SECTION=multimedia_gtk
+## SECTION=staging
+## old section:
+### SECTION=multimedia_gtk
config GLIBMM
tristate
@@ -10,3 +12,6 @@ config GLIBMM
help
glibmm is the C++ interface to the glib library.
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and fails to build with a current
+ toolchain (gcc 11).
diff --git a/rules/glslang.make b/rules/glslang.make
index e031d6f89..b147e54f1 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
#
# Paths and names
#
-GLSLANG_VERSION := 11.7.1
-GLSLANG_MD5 := 0855c7b65da1e9be5ff89eeddeda691a
+GLSLANG_VERSION := 1.3.211.0
+GLSLANG_MD5 := 08472667c9721157feb9bf025f8719f6
GLSLANG := glslang-$(GLSLANG_VERSION)
GLSLANG_SUFFIX := tar.gz
-GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
+GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
-GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2)
-GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229
+GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND custom
+GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/gnupg.make b/rules/gnupg.make
index cdf70e9ed..25d267769 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -19,7 +19,9 @@ GNUPG_VERSION := 2.2.23
GNUPG_MD5 := a094ff856a53a9a9fd5465657d998079
GNUPG := gnupg-$(GNUPG_VERSION)
GNUPG_SUFFIX := tar.bz2
-GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
+GNUPG_URL := \
+ https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) \
+ ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_DIR := $(BUILDDIR)/$(GNUPG)
GNUPG_LICENSE := GPL-3.0-or-later
diff --git a/rules/gnutls.in b/rules/gnutls.in
index 8b9443652..11fd963da 100644
--- a/rules/gnutls.in
+++ b/rules/gnutls.in
@@ -4,6 +4,7 @@ menuconfig GNUTLS
tristate
select LIBTASN1
select NETTLE
+ select LIBKCAPI if GNUTLS_AFALG
select GCCLIBS_CXX if GNUTLS_CXX
select CRYPTODEV_API if GNUTLS_CRYPTODEV && BUILDTIME
prompt "gnutls "
@@ -28,6 +29,16 @@ config GNUTLS_CRYPTODEV
help
Enable the BSD cryptodev engine even if we are not using BSD.
+config GNUTLS_AFALG
+ bool
+ prompt "enable AFALG support"
+
+config GNUTLS_KTLS
+ bool
+ prompt "enable KTLS support"
+ help
+ Kernel TLS offload. Sufficiently moderen kernel headers are needed.
+
config GNUTLS_OPENSSL
bool
prompt "openssl compatibility"
diff --git a/rules/gnutls.make b/rules/gnutls.make
index 43aa90b8d..785522c2a 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
#
# Paths and names
#
-GNUTLS_VERSION := 3.6.16
-GNUTLS_MD5 := 5db1678931fa6bbd40beed235c6a0a37
+GNUTLS_VERSION := 3.7.4
+GNUTLS_MD5 := 4bce06332c525eae540bb237433d4225
GNUTLS := gnutls-$(GNUTLS_VERSION)
GNUTLS_SUFFIX := tar.xz
-GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/$(GNUTLS).$(GNUTLS_SUFFIX)
+GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
GNUTLS_LICENSE := LGPL-3.0-or-later
@@ -27,6 +27,11 @@ GNUTLS_LICENSE := LGPL-3.0-or-later
# Prepare
# ----------------------------------------------------------------------------
+ifdef PTXCONF_KERNEL_HEADER
+GNUTLS_CPPFLAGS := \
+ -isystem $(KERNEL_HEADERS_INCLUDE_DIR)
+endif
+
#
# autoconf
#
@@ -41,12 +46,14 @@ GNUTLS_CONF_OPT := \
--disable-manpages \
--disable-tools \
--enable-cxx \
+ --disable-dyn-ncrypt \
--enable-hardware-acceleration \
--enable-tls13-interop \
--enable-padlock \
--enable-strict-der-time \
--enable-sha1-support \
--disable-ssl3-support \
+ --disable-strict-x509 \
--enable-ssl2-support \
--enable-dtls-srtp-support \
--enable-alpn-support \
@@ -58,13 +65,12 @@ GNUTLS_CONF_OPT := \
--enable-ecdhe \
--enable-gost \
--$(call ptx/endis, PTXCONF_GNUTLS_CRYPTODEV)-cryptodev \
+ --$(call ptx/endis, PTXCONF_GNUTLS_AFALG)-afalg \
+ --$(call ptx/endis, PTXCONF_GNUTLS_KTLS)-ktls \
--enable-ocsp \
--$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
--disable-tests \
--disable-fuzzer-target \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
--disable-nls \
--disable-rpath \
--disable-seccomp-tests \
@@ -78,19 +84,19 @@ GNUTLS_CONF_OPT := \
--disable-fips140-mode \
--enable-non-suiteb-curves \
--disable-libdane \
- --enable-local-libopts \
- --disable-libopts-install \
- --enable-optional-args \
--disable-guile \
--with-nettle-mini \
--without-included-libtasn1 \
--with-included-unistring \
+ --without-libbrotli \
--without-fips140-key \
--without-idn \
--without-p11-kit \
+ --without-tpm2 \
--without-tpm \
--without-trousers-lib \
- --without-libregex \
+ --without-zlib \
+ --without-libzstd \
--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
# ----------------------------------------------------------------------------
diff --git a/rules/gpgme.make b/rules/gpgme.make
index 1f909519d..1508fcd12 100644
--- a/rules/gpgme.make
+++ b/rules/gpgme.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GPGME) += gpgme
#
# Paths and names
#
-GPGME_VERSION := 1.11.1
-GPGME_MD5 := 129c46fb85a7ffa41e43345e48aee884
+GPGME_VERSION := 1.17.0
+GPGME_MD5 := 47eced250be5992da38b6c113f6fe3e7
GPGME := gpgme-$(GPGME_VERSION)
GPGME_SUFFIX := tar.bz2
GPGME_URL := https://www.gnupg.org/ftp/gcrypt/gpgme/$(GPGME).$(GPGME_SUFFIX)
@@ -34,6 +34,10 @@ GPGME_LANG-$(PTXCONF_GPGME_CPP) += cpp
GPGME_LANG := $(subst $(space),$(comma),$(strip $(GPGME_LANG-y)))
+GPGME_CONF_ENV := \
+ $(CROSS_ENV) \
+ LIBASSUAN_CONFIG="$(PTXDIST_SYSROOT_CROSS)/bin/libassuan-config"
+
#
# autoconf
#
diff --git a/rules/graphene.make b/rules/graphene.make
index 412a74f7f..5e5971b00 100644
--- a/rules/graphene.make
+++ b/rules/graphene.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_GRAPHENE) += graphene
#
# Paths and names
#
-GRAPHENE_VERSION := 1.10.6
-GRAPHENE_MD5 := 390139e704772b915ff2b7cac56c24ae
+GRAPHENE_VERSION := 1.10.8
+GRAPHENE_MD5 := 32660faa6ab717ee1600566ede027e9d
GRAPHENE := graphene-$(GRAPHENE_VERSION)
-GRAPHENE_SUFFIX := tar.xz
-GRAPHENE_URL := https://github.com/ebassi/graphene/releases/download/$(GRAPHENE_VERSION)/$(GRAPHENE).$(GRAPHENE_SUFFIX)
+GRAPHENE_SUFFIX := tar.gz
+GRAPHENE_URL := https://github.com/ebassi/graphene/archive/refs/tags/$(GRAPHENE_VERSION).$(GRAPHENE_SUFFIX)
GRAPHENE_SOURCE := $(SRCDIR)/$(GRAPHENE).$(GRAPHENE_SUFFIX)
GRAPHENE_DIR := $(BUILDDIR)/$(GRAPHENE)
GRAPHENE_LICENSE := MIT
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index cf50eed45..3214ff45e 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -41,10 +41,6 @@ menu "framebuffer "
source "generated/multimedia_framebuffer.in"
endmenu
-menu "gstreamer 0.10 "
-source "generated/multimedia_gstreamer.in"
-endmenu
-
menu "gstreamer 1.0 "
source "generated/multimedia_gstreamer1.in"
endmenu
@@ -56,6 +52,10 @@ endmenu
# moved to staging
#source "generated/multimedia_mplayer.in"
+menu "pipewire "
+source "generated/multimedia_pipewire.in"
+endmenu
+
menu "qt "
source "generated/qt.in"
endmenu
diff --git a/rules/gst-devtools1.make b/rules/gst-devtools1.make
index 0307b938b..a54e65444 100644
--- a/rules/gst-devtools1.make
+++ b/rules/gst-devtools1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_DEVTOOLS1) += gst-devtools1
#
# Paths and names
#
-GST_DEVTOOLS1_VERSION := 1.18.5
-GST_DEVTOOLS1_MD5 := 12656dc06805c4de8e3ee48d80545785
+GST_DEVTOOLS1_VERSION := 1.20.2
+GST_DEVTOOLS1_MD5 := 9282adeb375405f5e3b9c21c0d982fe0
GST_DEVTOOLS1 := gst-devtools-$(GST_DEVTOOLS1_VERSION)
GST_DEVTOOLS1_SUFFIX := tar.xz
GST_DEVTOOLS1_URL := http://gstreamer.freedesktop.org/data/src/gst-devtools/$(GST_DEVTOOLS1).$(GST_DEVTOOLS1_SUFFIX)
@@ -33,6 +33,7 @@ GST_DEVTOOLS1_LICENSE := LGPL-2.1-or-later
GST_DEVTOOLS1_CONF_TOOL := meson
GST_DEVTOOLS1_CONF_OPT := \
$(CROSS_MESON_USR) \
+ -Dcairo=$(call ptx/endis,PTXCONF_GST_DEVTOOLS1_VIDEO)d \
-Ddebug_viewer=disabled \
-Ddoc=disabled \
-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
@@ -69,8 +70,6 @@ $(STATEDIR)/gst-devtools1.targetinstall:
/usr/bin/gst-validate-1.0)
@$(call install_copy, gst-devtools1, 0, 0, 0755, -, \
/usr/bin/gst-validate-media-check-1.0)
- @$(call install_copy, gst-devtools1, 0, 0, 0755, -, \
- /usr/bin/gst-validate-transcoding-1.0)
@$(call install_tree, gst-devtools1, 0, 0, -, \
/usr/share/gstreamer-1.0/validate/scenarios)
diff --git a/rules/gst-libav1.make b/rules/gst-libav1.make
index 599e5d93e..d21563211 100644
--- a/rules/gst-libav1.make
+++ b/rules/gst-libav1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_LIBAV1) += gst-libav1
#
# Paths and names
#
-GST_LIBAV1_VERSION := 1.18.5
-GST_LIBAV1_MD5 := 9a49ce948d4e400b6e1b073d0e034080
+GST_LIBAV1_VERSION := 1.20.2
+GST_LIBAV1_MD5 := 30ec3fe428b9e2a6ba9326d34bd37a4d
GST_LIBAV1 := gst-libav-$(GST_LIBAV1_VERSION)
GST_LIBAV1_SUFFIX := tar.xz
GST_LIBAV1_URL := http://gstreamer.freedesktop.org/src/gst-libav/$(GST_LIBAV1).$(GST_LIBAV1_SUFFIX)
@@ -35,7 +35,8 @@ GST_LIBAV1_CONF_OPT := \
$(CROSS_MESON_USR) \
-Ddoc=disabled \
-Dpackage-name="GStreamer FFMPEG Plug-ins source release" \
- -Dpackage-origin=PTXdist
+ -Dpackage-origin=PTXdist \
+ -Dtests=disabled
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/gst-plugins-bad1.in b/rules/gst-plugins-bad1.in
index c19cc2252..578746df3 100644
--- a/rules/gst-plugins-bad1.in
+++ b/rules/gst-plugins-bad1.in
@@ -19,11 +19,13 @@ menuconfig GST_PLUGINS_BAD1
select LIBCURL_LIBSSH2 if GST_PLUGINS_BAD1_CURL_SSH2
select LIBXML2 if GST_PLUGINS_BAD1_DASH || GST_PLUGINS_BAD1_SMOOTHSTREAMING || GST_PLUGINS_BAD1_TTML
select LIBXML2_DOM if GST_PLUGINS_BAD1_DASH || GST_PLUGINS_BAD1_SMOOTHSTREAMING
+ select OPENSSL if GST_PLUGINS_BAD1_AES
select OPENSSL if GST_PLUGINS_BAD1_DTLS
select OPENSSL if GST_PLUGINS_BAD1_HLS
- select LIBMMS if GST_PLUGINS_BAD1_LIBMMS
select LIBDRM if GST_PLUGINS_BAD1_KMS || GST_PLUGINS_BAD1_WAYLAND
select OPUS if GST_PLUGINS_BAD1_OPUS
+ select JSON_GLIB if GST_PLUGINS_BAD1_QROVERLAY
+ select QRENCODE if GST_PLUGINS_BAD1_QROVERLAY
select RTMPDUMP if GST_PLUGINS_BAD1_RTMP
select LIBSNDFILE if GST_PLUGINS_BAD1_SNDFILE
select LIBSRTP if GST_PLUGINS_BAD1_SRTP
@@ -104,6 +106,10 @@ config GST_PLUGINS_BAD1_CAMERABIN2
bool
prompt "camerabin2"
+config GST_PLUGINS_BAD1_CODECALPHA
+ bool
+ prompt "codecalpha"
+
config GST_PLUGINS_BAD1_COLOREFFECTS
bool
prompt "coloreffects"
@@ -318,6 +324,12 @@ config GST_PLUGINS_BAD1_Y4M
comment "plugins with dependencies"
+config GST_PLUGINS_BAD1_AES
+ bool
+ prompt "aes"
+ help
+ AES encryption/decryption plugin
+
config GST_PLUGINS_BAD1_AOM
bool
# needs libaom
@@ -555,12 +567,6 @@ config GST_PLUGINS_BAD1_LIBDE265
help
HEVC/H.265 video decoder plugin
-config GST_PLUGINS_BAD1_LIBMMS
- bool
- prompt "libmms"
- help
- Microsoft multimedia server network source plugin
-
config GST_PLUGINS_BAD1_LV2
bool
# needs liblilv
@@ -633,14 +639,6 @@ config GST_PLUGINS_BAD1_NVCODEC
help
NVIDIA GPU codec plugin
-config GST_PLUGINS_BAD1_OFA
- bool
- # needs libofa
- depends on BROKEN
- prompt "ofa"
- help
- Open Fingerprint Architecture library plugin
-
config GST_PLUGINS_BAD1_OPENAL
bool
# needs OpenAL
@@ -709,6 +707,12 @@ config GST_PLUGINS_BAD1_OPUS
help
OPUS audio parser plugin
+config GST_PLUGINS_BAD1_QROVERLAY
+ bool
+ prompt "qroverlay"
+ help
+ QR code overlay plugin
+
config GST_PLUGINS_BAD1_RESINDVD
bool
# needs dvdnav & dvdread
diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make
index 0a30177d2..60686dda6 100644
--- a/rules/gst-plugins-bad1.make
+++ b/rules/gst-plugins-bad1.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD1) += gst-plugins-bad1
#
# Paths and names
#
-GST_PLUGINS_BAD1_VERSION := 1.18.5
-GST_PLUGINS_BAD1_MD5 := 4ab1c19c3cf1ba79c20c65f6be78e7fd
+GST_PLUGINS_BAD1_VERSION := 1.20.2
+GST_PLUGINS_BAD1_MD5 := 1c537891ea5c412f5e71a632e9e6d96c
GST_PLUGINS_BAD1 := gst-plugins-bad-$(GST_PLUGINS_BAD1_VERSION)
GST_PLUGINS_BAD1_SUFFIX := tar.xz
GST_PLUGINS_BAD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX)
@@ -33,6 +33,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ACCURIP) += accurip
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ADPCMDEC) += adpcmdec
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ADPCMENC) += adpcmenc
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AIFF) += aiff
+GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AES) += aes
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AOM) += aom
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AVTP) += avtp
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ASFMUX) += asfmux
@@ -49,6 +50,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BS2B) += bs2b
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BZ2) += bz2
GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_CAMERABIN2) += camerabin2
GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_CAMERABIN2) += camerabin
+GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CODECALPHA) += codecalpha
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CHROMAPRINT) += chromaprint
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CLOSEDCAPTION) += closedcaption
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_COLOREFFECTS) += coloreffects
@@ -99,8 +101,6 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_KATE) += kate
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_KMS) += kms
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LADSPA) += ladspa
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LIBDE265) += libde265
-GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_LIBMMS) += libmms
-GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_LIBMMS) += mms
GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_LIBRFB) += librfb
GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_LIBRFB) += rfbsrc
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LV2) += lv2
@@ -120,7 +120,6 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MXF) += mxf
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NEON) += neon
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NETSIM) += netsim
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NVCODEC) += nvcodec
-GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OFA) += ofa
GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_ONVIF) += onvif
GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_ONVIF) += rtponvif
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENAL) += openal
@@ -135,6 +134,7 @@ GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_OPUS) += opus
GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_OPUS) += opusparse
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PCAPPARSE) += pcapparse
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PNM) += pnm
+GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_QROVERLAY) += qroverlay
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PROXY) += proxy
GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_RAWPARSE) += rawparse
GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SWITCHBIN) += switchbin
@@ -210,16 +210,28 @@ GST_PLUGINS_BAD1_CONF_OPT = \
$(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Bad Plug-ins) \
-Dandroidmedia=disabled \
-Dapplemedia=disabled \
+ -Dasio=disabled \
+ -Dasio-sdk-path= \
-Dd3dvideosink=disabled \
-Dd3d11=disabled \
-Ddirectsound=disabled \
+ -Dexamples=disabled \
-Dextra-checks=disabled \
- -Dgst_player_tests=false \
+ -Dgs=disabled \
+ -Dgpl=disabled \
+ -Dgst_play_tests=false \
-Dhls-crypto=openssl \
-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
+ -Disac=disabled \
+ -Dldac=disabled \
-Dmagicleap=disabled \
-Dmediafoundation=disabled \
+ -Dmfx_api=auto \
+ -Donnx=disabled \
+ -Dopenaptx=disabled \
+ -Dnls=disabled \
-Dorc=enabled \
+ -Dsctp-internal-usrsctp=enabled \
-Dwasapi=disabled \
-Dwasapi2=disabled \
-Dwinks=disabled \
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make
index 19165227f..da12d8e29 100644
--- a/rules/gst-plugins-base1.make
+++ b/rules/gst-plugins-base1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BASE1) += gst-plugins-base1
#
# Paths and names
#
-GST_PLUGINS_BASE1_VERSION := 1.18.5
-GST_PLUGINS_BASE1_MD5 := 69b23213a6bb79d6d1b8371a9dd3e82e
+GST_PLUGINS_BASE1_VERSION := 1.20.2
+GST_PLUGINS_BASE1_MD5 := e29cc5c279851229b3fcc7b249b1497d
GST_PLUGINS_BASE1 := gst-plugins-base-$(GST_PLUGINS_BASE1_VERSION)
GST_PLUGINS_BASE1_SUFFIX := tar.xz
GST_PLUGINS_BASE1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX)
@@ -109,17 +109,21 @@ GST_PLUGINS_BASE1_CONF_OPT = \
$(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Base Plug-ins) \
-Daudioresample_format=auto \
-Degl_module_name=libEGL \
+ -Dexamples=disabled \
-Dgl-graphene=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_GL)d \
-Dgl-jpeg=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_OPENGL)d \
-Dgl-png=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_OPENGL)d \
-Dgl_api=$(GST_PLUGINS_BASE1_GL_API) \
-Dgl_platform=$(GST_PLUGINS_BASE1_GL_PLATFORM) \
-Dgl_winsys=$(GST_PLUGINS_BASE1_GL_WINSYS) \
- -Dgles2_module_name=libGLESv2 \
+ -Dgles2_module_name=libGLESv2.so \
+ -Dinstall_plugins_helper= \
-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
-Diso-codes=disabled \
+ -Dnls=disabled \
-Dopengl_module_name=libGL \
-Dorc=enabled \
+ -Dqt5=disabled \
-Dtools=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_INSTALL_TOOLS)d \
-Dx11=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_X11)d
diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in
index aeac2cbc8..ab1d382ac 100644
--- a/rules/gst-plugins-good1.in
+++ b/rules/gst-plugins-good1.in
@@ -27,6 +27,8 @@ menuconfig GST_PLUGINS_GOOD1
select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_GOOD1_QT5
select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2
select LIBSOUP if GST_PLUGINS_GOOD1_SOUP
+ select SYSTEMD if GST_PLUGINS_GOOD1_V4L2 && GST_PLUGINS_GOOD1_SYSTEMD && RUNTIME
+ select SYSTEMD_UDEV_PERSISTENT_V4L if GST_PLUGINS_GOOD1_V4L2 && GST_PLUGINS_GOOD1_SYSTEMD && RUNTIME
select SPEEX if GST_PLUGINS_GOOD1_SPEEX
select TWOLAME if GST_PLUGINS_GOOD1_TWOLAME
select LIBGUDEV if GST_PLUGINS_GOOD1_V4L2
@@ -356,6 +358,10 @@ config GST_PLUGINS_GOOD1_SPEEX
help
Speex audio codec plugin
+config GST_PLUGINS_GOOD1_SYSTEMD
+ bool
+ default INITMETHOD_SYSTEMD
+
config GST_PLUGINS_GOOD1_TAGLIB
bool
# needs libtag
diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make
index 07939c27e..a28c604c9 100644
--- a/rules/gst-plugins-good1.make
+++ b/rules/gst-plugins-good1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1
#
# Paths and names
#
-GST_PLUGINS_GOOD1_VERSION := 1.18.5
-GST_PLUGINS_GOOD1_MD5 := 1c8ec6b14d166d7affbb216e863c9e42
+GST_PLUGINS_GOOD1_VERSION := 1.20.2
+GST_PLUGINS_GOOD1_MD5 := bda229185364037d6ed1fabbdfdaca35
GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION)
GST_PLUGINS_GOOD1_SUFFIX := tar.xz
GST_PLUGINS_GOOD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX)
@@ -138,9 +138,14 @@ GST_PLUGINS_GOOD1_CONF_OPT = \
-Dasm=$(GST_PLUGINS_GOOD1_ASM) \
-Dbz2=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)d \
-Ddirectsound=disabled \
+ -Dexamples=disabled \
+ -Dnls=disabled \
-Dorc=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_ORC)d \
-Dosxaudio=disabled \
-Dosxvideo=disabled \
+ -Drpi-header-dir= \
+ -Drpi-lib-dir= \
+ -Drpicamsrc=disabled \
-Dv4l2-gudev=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_V4L2)d \
-Dv4l2-probe=$(call ptx/truefalse,PTXCONF_GST_PLUGINS_GOOD1_V4L2) \
-Dwaveform=disabled \
diff --git a/rules/gst-plugins-ugly1.make b/rules/gst-plugins-ugly1.make
index 0050c5178..9f42c2d03 100644
--- a/rules/gst-plugins-ugly1.make
+++ b/rules/gst-plugins-ugly1.make
@@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_UGLY1) += gst-plugins-ugly1
#
# Paths and names
#
-GST_PLUGINS_UGLY1_VERSION := 1.18.5
-GST_PLUGINS_UGLY1_MD5 := 049f90b7a3a72e241ad47564b5cd7a7a
+GST_PLUGINS_UGLY1_VERSION := 1.20.2
+GST_PLUGINS_UGLY1_MD5 := 62dcd0cb786ea10cc34c9927aa656aac
GST_PLUGINS_UGLY1 := gst-plugins-ugly-$(GST_PLUGINS_UGLY1_VERSION)
GST_PLUGINS_UGLY1_SUFFIX := tar.xz
GST_PLUGINS_UGLY1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX)
GST_PLUGINS_UGLY1_SOURCE := $(SRCDIR)/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX)
GST_PLUGINS_UGLY1_DIR := $(BUILDDIR)/$(GST_PLUGINS_UGLY1)
GST_PLUGINS_UGLY1_LICENSE := LGPL-2.1-or-later
+ifdef PTXCONF_GST_PLUGINS_UGLY1_MPEG2DEC
+GST_PLUGINS_UGLY1_LICENSE += AND $(LIBMPEG2_LICENSE)
+endif
# ----------------------------------------------------------------------------
# Prepare
@@ -53,7 +56,10 @@ GST_PLUGINS_UGLY1_ENABLEP-y += $(GST_PLUGINS_UGLY1_ENABLE-y)
GST_PLUGINS_UGLY1_CONF_TOOL := meson
GST_PLUGINS_UGLY1_CONF_OPT = \
$(CROSS_MESON_USR) \
- $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Ugly Plug-ins)
+ $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Ugly Plug-ins) \
+ -Dgpl=$(call ptx/endis,PTXCONF_GST_PLUGINS_UGLY1_MPEG2DEC)d \
+ -Dnls=disabled \
+ -Dx264_libraries=
ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY1_ENABLEC-y)),)
GST_PLUGINS_UGLY1_CONF_OPT += $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_UGLY1_ENABLEC-y)))
diff --git a/rules/gst-python1.make b/rules/gst-python1.make
index 327d20014..4c19388f5 100644
--- a/rules/gst-python1.make
+++ b/rules/gst-python1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PYTHON1) += gst-python1
#
# Paths and names
#
-GST_PYTHON1_VERSION := 1.18.5
-GST_PYTHON1_MD5 := eb19229f72f61506e33182a6fbce4a2e
+GST_PYTHON1_VERSION := 1.20.2
+GST_PYTHON1_MD5 := 9d3c538fbc7ce459ce7a1c35692f8ed9
GST_PYTHON1 := gst-python-$(GST_PYTHON1_VERSION)
GST_PYTHON1_SUFFIX := tar.xz
GST_PYTHON1_URL := http://gstreamer.freedesktop.org/src/gst-python/$(GST_PYTHON1).$(GST_PYTHON1_SUFFIX)
@@ -35,8 +35,10 @@ GST_PYTHON1_CONF_TOOL := meson
GST_PYTHON1_CONF_OPT = \
$(CROSS_MESON_USR) \
-Dlibpython-dir=/usr/lib \
+ -Dplugin=enabled \
-Dpygi-overrides-dir=$(PYTHON3_SITEPACKAGES)/gi \
- -Dpython=$(CROSS_PYTHON3)
+ -Dpython=$(CROSS_PYTHON3) \
+ -Dtests=disabled
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/gst-rtsp-server1.in b/rules/gst-rtsp-server1.in
index 5d1dacbce..8d24bf8cd 100644
--- a/rules/gst-rtsp-server1.in
+++ b/rules/gst-rtsp-server1.in
@@ -4,6 +4,7 @@ config GST_RTSP_SERVER1
tristate
select HOST_MESON
select GSTREAMER1
+ select GST_PLUGINS_BAD1
select GST_PLUGINS_BASE1
prompt "gst-rtsp-server"
help
diff --git a/rules/gst-rtsp-server1.make b/rules/gst-rtsp-server1.make
index 73e228918..f5e06a1a6 100644
--- a/rules/gst-rtsp-server1.make
+++ b/rules/gst-rtsp-server1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_RTSP_SERVER1) += gst-rtsp-server1
#
# Paths and names
#
-GST_RTSP_SERVER1_VERSION := 1.18.5
-GST_RTSP_SERVER1_MD5 := 7f9cc2f69d0cf401fb14fe73624a28fe
+GST_RTSP_SERVER1_VERSION := 1.20.2
+GST_RTSP_SERVER1_MD5 := 4f89a74dfe75cef2c15ca04bf905d65e
GST_RTSP_SERVER1 := gst-rtsp-server-$(GST_RTSP_SERVER1_VERSION)
GST_RTSP_SERVER1_SUFFIX := tar.xz
GST_RTSP_SERVER1_URL := http://gstreamer.freedesktop.org/src/gst-rtsp/$(GST_RTSP_SERVER1).$(GST_RTSP_SERVER1_SUFFIX)
@@ -33,7 +33,14 @@ GST_RTSP_SERVER1_LICENSE := LGPL-2.0-or-later
GST_RTSP_SERVER1_CONF_TOOL = meson
GST_RTSP_SERVER1_CONF_OPT = \
$(CROSS_MESON_USR) \
- $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer RTSP Server Library) \
+ -Ddoc=disabled \
+ -Dexamples=disabled \
+ -Dglib-asserts=enabled \
+ -Dglib-checks=enabled \
+ -Dgobject-cast-checks=enabled \
+ -Dpackage-name="GStreamer RTSP Server Library source release" \
+ -Dpackage-origin=PTXdist \
+ -Dtests=disabled \
-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
-Drtspclientsink=auto
diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make
index 92995d7d7..968fbfbd3 100644
--- a/rules/gstreamer-vaapi1.make
+++ b/rules/gstreamer-vaapi1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GSTREAMER_VAAPI1) += gstreamer-vaapi1
#
# Paths and names
#
-GSTREAMER_VAAPI1_VERSION := 1.18.5
-GSTREAMER_VAAPI1_MD5 := aae78428770dd3cc3673b2e3b50931f6
+GSTREAMER_VAAPI1_VERSION := 1.20.2
+GSTREAMER_VAAPI1_MD5 := e5fb2a8bdd7036e26f7975ea8bce567e
GSTREAMER_VAAPI1 := gstreamer-vaapi-$(GSTREAMER_VAAPI1_VERSION)
GSTREAMER_VAAPI1_SUFFIX := tar.xz
GSTREAMER_VAAPI1_URL := http://gstreamer.freedesktop.org/src/gstreamer-vaapi/$(GSTREAMER_VAAPI1).$(GSTREAMER_VAAPI1_SUFFIX)
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index d6c4eff10..3e595e347 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GSTREAMER1) += gstreamer1
#
# Paths and names
#
-GSTREAMER1_VERSION := 1.18.5
-GSTREAMER1_MD5 := d7e7ba88a1ccb431d754bd9474728c22
+GSTREAMER1_VERSION := 1.20.2
+GSTREAMER1_MD5 := 56d8b3abb3c593ddf0f77897860b3c9d
GSTREAMER1 := gstreamer-$(GSTREAMER1_VERSION)
GSTREAMER1_SUFFIX := tar.xz
GSTREAMER1_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER1).$(GSTREAMER1_SUFFIX)
@@ -33,11 +33,9 @@ GSTREAMER1_LICENSE := LGPL-2.1-or-later
#
GSTREAMER1_GENERIC_CONF_OPT = \
-Ddoc=disabled \
- -Dexamples=disabled \
-Dglib-asserts=$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)d \
-Dglib-checks=$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)d \
-Dgobject-cast-checks=$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)d \
- -Dnls=disabled \
-Dpackage-name="$(1) source release" \
-Dpackage-origin=PTXdist \
-Dtests=disabled
@@ -51,14 +49,15 @@ GSTREAMER1_CONF_OPT := \
-Dcheck=$(call ptx/endis,PTXCONF_GSTREAMER1_CHECK)d \
-Dcoretracers=$(call ptx/endis,PTXCONF_GSTREAMER1_DEBUG)d \
-Ddbghelp=disabled \
+ -Dexamples=disabled \
-Dextra-checks=disabled \
-Dgst_debug=$(call ptx/truefalse,PTXCONF_GSTREAMER1_DEBUG) \
-Dgst_parse=true \
- -Dgtk_doc=disabled \
-Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \
-Dlibdw=disabled \
-Dlibunwind=enabled \
-Dmemory-alignment=malloc \
+ -Dnls=disabled \
-Doption-parsing=true \
-Dpoisoning=false \
-Dptp-helper-permissions=setuid-root \
diff --git a/rules/hiredis.in b/rules/hiredis.in
new file mode 100644
index 000000000..d416d69c4
--- /dev/null
+++ b/rules/hiredis.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config HIREDIS
+ tristate
+ select HOST_CMAKE
+ prompt "hiredis "
+ help
+ Hiredis is a minimalistic C client library for the Redis database.
diff --git a/rules/hiredis.make b/rules/hiredis.make
new file mode 100644
index 000000000..c0d183a36
--- /dev/null
+++ b/rules/hiredis.make
@@ -0,0 +1,61 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 by Clemens Gruber <clemens.gruber@pqgruber.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_HIREDIS) += hiredis
+
+#
+# Paths and names
+#
+HIREDIS_VERSION := 1.0.2
+HIREDIS_MD5 := 58e8313188f66ed1be1c220d14a7752e
+HIREDIS := hiredis-$(HIREDIS_VERSION)
+HIREDIS_SUFFIX := tar.gz
+HIREDIS_URL := https://github.com/redis/hiredis/archive/v$(HIREDIS_VERSION).$(HIREDIS_SUFFIX)
+HIREDIS_SOURCE := $(SRCDIR)/$(HIREDIS).$(HIREDIS_SUFFIX)
+HIREDIS_DIR := $(BUILDDIR)/$(HIREDIS)
+HIREDIS_LICENSE := BSD-3-Clause
+HIREDIS_LICENSE_FILES := file://COPYING;md5=d84d659a35c666d23233e54503aaea51
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# cmake
+#
+HIREDIS_CONF_TOOL := cmake
+
+HIREDIS_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DDISABLE_TESTS=ON \
+ -DENABLE_SSL=OFF
+
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/hiredis.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, hiredis)
+ @$(call install_fixup, hiredis,PRIORITY,optional)
+ @$(call install_fixup, hiredis,SECTION,base)
+ @$(call install_fixup, hiredis,AUTHOR,"Clemens Gruber <clemens.gruber@pqgruber.com>")
+ @$(call install_fixup, hiredis,DESCRIPTION,"Minimalistic C client for Redis")
+
+ @$(call install_lib, hiredis, 0, 0, 0644, libhiredis)
+
+ @$(call install_finish, hiredis)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-autotools-autoconf-archive.make b/rules/host-autotools-autoconf-archive.make
index ed3be47da..bf9940a07 100644
--- a/rules/host-autotools-autoconf-archive.make
+++ b/rules/host-autotools-autoconf-archive.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOCONF_ARCHIVE) += host-autotools-autoc
#
# Paths and names
#
-HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_VERSION := 2019.01.06
-HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_MD5 := d46413c8b00a125b1529bae385bbec55
+HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_VERSION := 2022.02.11
+HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_MD5 := d140e95be64f0aa7369f82e3caae4730
HOST_AUTOTOOLS_AUTOCONF_ARCHIVE := autoconf-archive-$(HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_VERSION)
HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_SUFFIX := tar.xz
HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_URL := $(call ptx/mirror, GNU, autoconf-archive/$(HOST_AUTOTOOLS_AUTOCONF_ARCHIVE).$(HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_SUFFIX))
@@ -25,7 +25,7 @@ HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_LICENSE := GPL-3.0-or-later WITH Autoconf-except
HOST_AUTOTOOLS_AUTOCONF_ARCHIVE_LICENSE_FILES := \
file://COPYING;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
file://COPYING.EXCEPTION;md5=fdef168ebff3bc2f13664c365a5fb515 \
- file://README;startline=51;endline=67;md5=28397cd25dc41e1932e0d1127aaf1836
+ file://README;startline=51;endline=67;md5=e7e002fc8c304f9dfed77d46f6d8de24
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make
index a7fa29943..1ddc0c982 100644
--- a/rules/host-autotools-automake.make
+++ b/rules/host-autotools-automake.make
@@ -14,8 +14,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOMAKE) += host-autotools-automake
#
# Paths and names
#
-HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.16.1
-HOST_AUTOTOOLS_AUTOMAKE_MD5 := 53f38e7591fa57c3d2cee682be668e5b
+HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.16.5
+HOST_AUTOTOOLS_AUTOMAKE_MD5 := 4017e96f89fca45ca946f1c5db6be714
HOST_AUTOTOOLS_AUTOMAKE := automake-$(HOST_AUTOTOOLS_AUTOMAKE_VERSION)
HOST_AUTOTOOLS_AUTOMAKE_SUFFIX := tar.xz
HOST_AUTOTOOLS_AUTOMAKE_URL := $(call ptx/mirror, GNU, automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX))
diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make
index 2d6a3eb94..b131d0211 100644
--- a/rules/host-autotools-libtool.make
+++ b/rules/host-autotools-libtool.make
@@ -14,8 +14,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_LIBTOOL) += host-autotools-libtool
#
# Paths and names
#
-HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.6
-HOST_AUTOTOOLS_LIBTOOL_MD5 := addf44b646ddb4e3919805aa88fa7c5e
+HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.7
+HOST_AUTOTOOLS_LIBTOOL_MD5 := ed40528d8a066ee3fffd714588721cff
HOST_AUTOTOOLS_LIBTOOL := libtool-$(HOST_AUTOTOOLS_LIBTOOL_VERSION)
HOST_AUTOTOOLS_LIBTOOL_SUFFIX := tar.gz
HOST_AUTOTOOLS_LIBTOOL_URL := $(call ptx/mirror, GNU, libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX))
diff --git a/rules/host-cython3.make b/rules/host-cython3.make
index 50a497c52..55cbf5c3c 100644
--- a/rules/host-cython3.make
+++ b/rules/host-cython3.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CYTHON3) += host-cython3
#
# Paths and names
#
-HOST_CYTHON3_VERSION := 0.29.14
-HOST_CYTHON3_MD5 := 6e2f139e30bb08d68366f9370d87964c
+HOST_CYTHON3_VERSION := 0.29.28
+HOST_CYTHON3_MD5 := 0e98543dca816300a27e7d76146a6280
HOST_CYTHON3 := Cython-$(HOST_CYTHON3_VERSION)
HOST_CYTHON3_SUFFIX := tar.gz
HOST_CYTHON3_URL := $(call ptx/mirror-pypi, cython, $(HOST_CYTHON3).$(HOST_CYTHON3_SUFFIX))
diff --git a/rules/host-dtc.make b/rules/host-dtc.make
index 958eada01..19551203e 100644
--- a/rules/host-dtc.make
+++ b/rules/host-dtc.make
@@ -22,6 +22,7 @@ HOST_DTC_SUFFIX := tar.gz
HOST_DTC_URL := https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(HOST_DTC).$(HOST_DTC_SUFFIX)
HOST_DTC_SOURCE := $(SRCDIR)/$(HOST_DTC).$(HOST_DTC_SUFFIX)
HOST_DTC_DIR := $(HOST_BUILDDIR)/$(HOST_DTC)
+HOST_DTC_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/host-freetype.make b/rules/host-freetype.make
index d28362190..838cc8e84 100644
--- a/rules/host-freetype.make
+++ b/rules/host-freetype.make
@@ -28,13 +28,13 @@ HOST_FREETYPE_CONF_TOOL := autoconf
HOST_FREETYPE_CONF_OPT := \
$(HOST_AUTOCONF) \
--disable-static \
- --disable-biarch-config \
--enable-freetype-config \
--enable-mmap \
--without-zlib \
--without-bzip2 \
--without-png \
--without-harfbuzz \
+ --without-brotli \
--without-old-mac-fonts \
--without-fsspec \
--without-fsref \
diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make
index e08f720b7..b5387e7c3 100644
--- a/rules/host-libcurl.make
+++ b/rules/host-libcurl.make
@@ -81,7 +81,6 @@ HOST_LIBCURL_CONF_OPT := \
--without-gnutls \
--without-mbedtls \
--without-wolfssl \
- --without-mesalink \
--without-bearssl \
--without-rustls \
--without-nss \
diff --git a/rules/host-makedepend.make b/rules/host-makedepend.make
index 2bc104f34..28b12fad3 100644
--- a/rules/host-makedepend.make
+++ b/rules/host-makedepend.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MAKEDEPEND) += host-makedepend
#
# Paths and names
#
-HOST_MAKEDEPEND_VERSION := 1.0.4
-HOST_MAKEDEPEND_MD5 := 7acb9a831817fdd11ba7f7aaa3c74fd8
+HOST_MAKEDEPEND_VERSION := 1.0.6
+HOST_MAKEDEPEND_MD5 := b2ca7f2f21f1c04a88b6a254c19c9b68
HOST_MAKEDEPEND := makedepend-$(HOST_MAKEDEPEND_VERSION)
HOST_MAKEDEPEND_SUFFIX := tar.bz2
HOST_MAKEDEPEND_URL := $(call ptx/mirror, XORG, individual/util/$(HOST_MAKEDEPEND).$(HOST_MAKEDEPEND_SUFFIX))
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 2b4db2526..f2122c7f0 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -70,24 +70,21 @@ HOST_MESALIB_CONF_OPT := \
-Dplatform-sdk-version=25 \
-Dplatforms= \
-Dpower8=disabled \
- -Dprefer-crocus=false \
- -Dprefer-iris=true \
-Dselinux=false \
-Dshader-cache=disabled \
-Dshader-cache-default=true \
-Dshader-cache-max-size=1G \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
- -Dshared-swr=true \
-Dspirv-to-dxil=false \
-Dsse2=true \
-Dstatic-libclc=[] \
- -Dswr-arches=[] \
-Dtools=glsl \
-Dva-libs-path=/usr/lib/dri \
-Dvalgrind=disabled \
-Dvdpau-libs-path=/usr/lib/vdpau \
-Dvmware-mks-stats=false \
+ -Dvulkan-beta=false \
-Dvulkan-drivers=[] \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
-Dvulkan-layers=[] \
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 98c4e453b..cb9a07a3d 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
#
# Paths and names
#
-HOST_MESON_VERSION := 0.56.0
-HOST_MESON_MD5 := 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
+HOST_MESON_VERSION := 0.60.3
+HOST_MESON_MD5 := 03ddd7272d8cbb9f33269cb37a200d24
HOST_MESON := meson-$(HOST_MESON_VERSION)
HOST_MESON_SUFFIX := tar.gz
HOST_MESON_URL := https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
diff --git a/rules/host-mtools.make b/rules/host-mtools.make
index 7afde6db4..a205bd0f7 100644
--- a/rules/host-mtools.make
+++ b/rules/host-mtools.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MTOOLS) += host-mtools
#
# Paths and names
#
-HOST_MTOOLS_VERSION := 4.0.16
-HOST_MTOOLS_MD5 := e9b07f35272210f407012abaf5d1b9b5
+HOST_MTOOLS_VERSION := 4.0.39
+HOST_MTOOLS_MD5 := a02f48189aeab32370b9888351c8cb45
HOST_MTOOLS := mtools-$(HOST_MTOOLS_VERSION)
HOST_MTOOLS_SUFFIX := tar.bz2
HOST_MTOOLS_URL := $(call ptx/mirror, GNU, mtools/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX))
diff --git a/rules/host-python3-babel.in b/rules/host-python3-babel.in
new file mode 100644
index 000000000..82a398cf4
--- /dev/null
+++ b/rules/host-python3-babel.in
@@ -0,0 +1,8 @@
+## SECTION=hosttools_noprompt
+
+config HOST_PYTHON3_BABEL
+ tristate
+ default y if ALLYES
+ select HOST_PYTHON3
+ select HOST_PYTHON3_TZ
+ select HOST_PYTHON3_SETUPTOOLS
diff --git a/rules/host-python3-babel.make b/rules/host-python3-babel.make
new file mode 100644
index 000000000..d59346512
--- /dev/null
+++ b/rules/host-python3-babel.make
@@ -0,0 +1,73 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Robin van der Gracht <robin@protonic.nl>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_BABEL) += host-python3-babel
+
+#
+# Paths and names
+#
+HOST_PYTHON3_BABEL_VERSION := v2.10.1
+HOST_PYTHON3_BABEL_MD5 := 9483ad57043776324459e7f000aec7f0
+HOST_PYTHON3_BABEL := babel-$(HOST_PYTHON3_BABEL_VERSION)
+HOST_PYTHON3_BABEL_SUFFIX := tar.gz
+HOST_PYTHON3_BABEL_URL := https://github.com/python-babel/babel/archive/$(HOST_PYTHON3_BABEL_VERSION).$(HOST_PYTHON3_BABEL_SUFFIX)
+HOST_PYTHON3_BABEL_SOURCE := $(SRCDIR)/$(HOST_PYTHON3_BABEL).$(HOST_PYTHON3_BABEL_SUFFIX)
+HOST_PYTHON3_BABEL_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_BABEL)
+HOST_PYTHON3_BABEL_LICENSE := BSD-3-Clause
+HOST_PYTHON3_BABEL_LICENSE_FILES := file://LICENSE;md5=1b3f4650099e6d6a73e5a7fc8774ff18
+
+
+HOST_PYTHON3_BABEL_CLDR_VERSION := 33
+HOST_PYTHON3_BABEL_CLDR_MD5 := 39bf16711836c23e386189c3cbd2f344
+HOST_PYTHON3_BABEL_CLDR_URL := https://unicode.org/Public/cldr/$(HOST_PYTHON3_BABEL_CLDR_VERSION)/core.zip
+HOST_PYTHON3_BABEL_CLDR_SOURCE := $(SRCDIR)/cldr-core-$(HOST_PYTHON3_BABEL_CLDR_VERSION).0.zip
+HOST_PYTHON3_BABEL_CLDR_DIR := $(HOST_PYTHON3_BABEL_DIR)/cldr
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-python3-babel.get:
+ @$(call targetinfo)
+ @$(call world/get, HOST_PYTHON3_BABEL)
+ @$(call world/check_src, HOST_PYTHON3_BABEL)
+ @$(call world/get, HOST_PYTHON3_BABEL_CLDR)
+ @$(call world/check_src, HOST_PYTHON3_BABEL_CLDR)
+ @$(call touch)
+
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-python3-babel.extract:
+ @$(call targetinfo)
+ @$(call extract, HOST_PYTHON3_BABEL)
+ @$(call patchin, HOST_PYTHON3_BABEL)
+ @$(call extract, HOST_PYTHON3_BABEL_CLDR)
+ @$(call touch)
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_PYTHON3_BABEL_CONF_TOOL := python3
+
+$(STATEDIR)/host-python3-babel.prepare:
+ @$(call targetinfo)
+ @cd $(HOST_PYTHON3_BABEL_DIR) && \
+ python$(PYTHON3_MAJORMINOR) scripts/import_cldr.py $(HOST_PYTHON3_BABEL_CLDR_DIR)
+ @$(call world/prepare, HOST_PYTHON3_BABEL)
+ @$(call touch)
+
+
+# vim: syntax=make
diff --git a/rules/host-python3-pip.in b/rules/host-python3-pip.in
new file mode 100644
index 000000000..c7868b863
--- /dev/null
+++ b/rules/host-python3-pip.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+
+config HOST_PYTHON3_PIP
+ tristate
+ select HOST_SYSTEM_PYTHON3
+ default ALLYES
diff --git a/rules/host-python3-pip.make b/rules/host-python3-pip.make
new file mode 100644
index 000000000..a3ecab84a
--- /dev/null
+++ b/rules/host-python3-pip.make
@@ -0,0 +1,23 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_PIP) += host-python3-pip
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# python3
+#
+HOST_PYTHON3_PIP_CONF_TOOL := python3
+
+# vim: syntax=make
diff --git a/rules/host-python3-tz.in b/rules/host-python3-tz.in
new file mode 100644
index 000000000..fc0cba845
--- /dev/null
+++ b/rules/host-python3-tz.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+
+config HOST_PYTHON3_TZ
+ tristate
+ default y if ALLYES
+ select HOST_PYTHON3
diff --git a/rules/host-python3-tz.make b/rules/host-python3-tz.make
new file mode 100644
index 000000000..fddffcc90
--- /dev/null
+++ b/rules/host-python3-tz.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Robin van der Gracht <robin@protonic.nl>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_TZ) += host-python3-tz
+
+#
+# Paths and names
+#
+HOST_PYTHON3_TZ_VERSION := 2018.9
+HOST_PYTHON3_TZ_MD5 := 0f57d76c64d0965e7429c9b871f6b711
+HOST_PYTHON3_TZ := pytz-$(HOST_PYTHON3_TZ_VERSION)
+HOST_PYTHON3_TZ_SUFFIX := tar.gz
+HOST_PYTHON3_TZ_URL := $(call ptx/mirror-pypi, pytz, $(HOST_PYTHON3_TZ).$(PYTHON3_IFADDR_SUFFIX))
+HOST_PYTHON3_TZ_SOURCE := $(SRCDIR)/$(HOST_PYTHON3_TZ).$(HOST_PYTHON3_TZ_SUFFIX)
+HOST_PYTHON3_TZ_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_TZ)
+HOST_PYTHON3_TZ_LICENSE := MIT
+HOST_PYTHON3_TZ_LICENSE_FILES := file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_PYTHON3_TZ_CONF_TOOL := python3
+
+# vim: syntax=make
diff --git a/rules/host-qemu.make b/rules/host-qemu.make
index 885e76ba9..8c39722a9 100644
--- a/rules/host-qemu.make
+++ b/rules/host-qemu.make
@@ -60,99 +60,118 @@ HOST_QEMU_CONF_OPT := \
--audio-drv-list= \
--block-drv-rw-whitelist= \
--block-drv-ro-whitelist= \
- --enable-trace-backends=nop \
- --disable-tcg-interpreter \
- --enable-malloc-trim \
--with-coroutine= \
--tls-priority=NORMAL \
--disable-plugins \
--disable-containers \
+ --disable-capstone \
+ --disable-cfi \
+ --enable-fdt \
+ --disable-fuzzing \
+ --disable-tcg-interpreter \
+ --enable-trace-backends=nop \
+ --disable-alsa \
+ --enable-attr \
+ --disable-auth-pam \
+ --disable-bpf \
+ --disable-brlapi \
+ --disable-bzip2 \
+ --enable-cap-ng \
+ --disable-cocoa \
+ --disable-coreaudio \
+ --disable-curl \
+ --disable-curses \
+ --disable-docs \
+ --disable-dsound \
+ --disable-fuse \
+ --disable-fuse-lseek \
+ --disable-gcrypt \
+ --disable-gettext \
+ --disable-glusterfs \
+ --disable-gnutls \
+ --disable-gtk \
+ --disable-guest-agent-msi \
+ --disable-hax \
+ --disable-hvf \
+ --enable-iconv \
+ --disable-jack \
+ --enable-kvm \
+ --disable-l2tpv3 \
+ --disable-libdaxctl \
+ --disable-libiscsi \
+ --disable-libnfs \
+ --disable-libpmem \
+ --disable-libudev \
+ --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \
+ --disable-libxml2 \
+ --disable-linux-aio \
+ --disable-linux-io-uring \
+ --disable-lzfse \
+ --disable-lzo \
+ --enable-malloc-trim \
+ --disable-mpath \
+ --enable-multiprocess \
+ --disable-netmap \
+ --disable-nettle \
+ --disable-nvmm \
+ --disable-oss \
+ --disable-pa \
+ --disable-rbd \
+ --disable-sdl \
+ --disable-sdl-image \
+ --disable-seccomp \
+ --disable-selinux \
+ --disable-smartcard \
+ --disable-snappy \
+ --disable-sparse \
+ --disable-spice \
+ --disable-spice-protocol \
+ --enable-tcg \
+ --disable-u2f \
+ --disable-usb-redir \
+ --disable-vhost-user-blk-server \
+ --disable-virglrenderer \
+ --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \
+ --disable-virtiofsd \
+ --disable-vnc \
+ --disable-vnc-jpeg \
+ --disable-vnc-png \
+ --disable-vnc-sasl \
+ --disable-vte \
+ --disable-whpx \
+ --disable-xen \
+ --disable-xen-pci-passthrough \
+ --disable-xkbcommon \
+ --disable-zstd \
--$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-system \
--disable-user \
--$(call ptx/endis, PTXCONF_HOST_QEMU_USR)-linux-user \
--disable-bsd-user \
- --disable-docs \
--disable-guest-agent \
- --disable-guest-agent-msi \
--enable-pie \
--disable-modules \
--disable-module-upgrades \
--disable-debug-tcg \
--disable-debug-info \
--disable-lto \
- --disable-sparse \
--disable-safe-stack \
- --disable-cfi \
- --disable-gnutls \
- --disable-nettle \
- --disable-gcrypt \
- --disable-auth-pam \
- --disable-sdl \
- --disable-sdl-image \
- --disable-gtk \
- --disable-vte \
- --disable-curses \
- --enable-iconv \
- --disable-vnc \
- --disable-vnc-sasl \
- --disable-vnc-jpeg \
- --disable-vnc-png \
- --disable-cocoa \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \
- --disable-virtiofsd \
- --disable-libudev \
- --disable-mpath \
- --disable-xen \
- --disable-xen-pci-passthrough \
- --disable-brlapi \
- --disable-curl \
--enable-membarrier \
- --enable-fdt \
- --enable-kvm \
- --disable-hax \
- --disable-hvf \
- --disable-whpx \
--disable-rdma \
--disable-pvrdma \
- --disable-netmap \
- --disable-linux-aio \
- --disable-linux-io-uring \
- --enable-cap-ng \
- --enable-attr \
--enable-vhost-net \
--enable-vhost-vsock \
--enable-vhost-scsi \
--disable-vhost-crypto \
--enable-vhost-kernel \
--disable-vhost-user \
- --disable-vhost-user-blk-server \
--disable-vhost-vdpa \
- --disable-spice \
- --disable-rbd \
- --disable-libiscsi \
- --disable-libnfs \
- --disable-smartcard \
- --disable-u2f \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \
--disable-live-block-migration \
- --disable-usb-redir \
- --disable-lzo \
- --disable-snappy \
- --disable-bzip2 \
- --disable-lzfse \
- --disable-zstd \
- --disable-seccomp \
--enable-coroutine-pool \
- --disable-glusterfs \
--disable-tpm \
--disable-libssh \
--disable-numa \
- --disable-libxml2 \
- --disable-tcmalloc \
- --disable-jemalloc \
--enable-replication \
--disable-opengl \
- --disable-virglrenderer \
--disable-xfsctl \
--disable-qom-cast-debug \
--disable-tools \
@@ -165,17 +184,11 @@ HOST_QEMU_CONF_OPT := \
--disable-qed \
--disable-parallels \
--disable-crypto-afalg \
- --disable-capstone \
--disable-debug-mutex \
- --disable-libpmem \
- --disable-xkbcommon \
--disable-rng-none \
- --disable-libdaxctl \
- --disable-fuse \
- --enable-multiprocess \
--disable-gio \
+ --disable-slirp-smbd \
\
- --disable-fuzzing \
--disable-keyring
# Use '=' to delay $(shell ...) calls until this is needed
diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 50b6a6503..daacb3037 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -54,9 +54,48 @@ HOST_SHADERC_CONF_TOOL := cmake
HOST_SHADERC_CONF_OPT := \
$(HOST_CMAKE_OPT) \
-DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXTERNAL=ON \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DBUILD_TESTING=ON \
+ -DDISABLE_EXCEPTIONS=OFF \
+ -DDISABLE_RTTI=OFF \
+ -DENABLE_CODE_COVERAGE=OFF \
+ -DENABLE_CTEST=ON \
+ -DENABLE_EXCEPTIONS=OFF \
+ -DENABLE_EXCEPTIONS_ON_MSVC=ON \
+ -DENABLE_GLSLANG_BINARIES=ON \
+ -DENABLE_GLSLANG_JS=OFF \
+ -DENABLE_HLSL=ON \
+ -DENABLE_OPT=ON \
+ -DENABLE_PCH=ON \
+ -DENABLE_RTTI=OFF \
+ -DENABLE_SPVREMAPPER=ON \
+ -DSHADERC_ENABLE_WERROR_COMPILE=ON \
+ -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
+ -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+ -DSHADERC_SKIP_EXAMPLES=OFF \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
- -DSHADERC_ENABLE_WERROR_COMPILE=ON
+ -DSKIP_GLSLANG_INSTALL=OFF \
+ -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
+ -DSPIRV_ALLOW_TIMERS=ON \
+ -DSPIRV_BUILD_COMPRESSION=OFF \
+ -DSPIRV_BUILD_FUZZER=OFF \
+ -DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
+ -DSPIRV_CHECK_CONTEXT=ON \
+ -DSPIRV_COLOR_TERMINAL=ON \
+ -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
+ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+ -DSPIRV_HEADERS_SKIP_INSTALL=ON \
+ -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
+ -DSPIRV_LOG_DEBUG=OFF \
+ -DSPIRV_SKIP_EXECUTABLES=OFF \
+ -DSPIRV_SKIP_TESTS=ON \
+ -DSPIRV_TOOLS_BUILD_STATIC=ON \
+ -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+ -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_WERROR=ON \
+ -DUSE_CCACHE=OFF
# vim: syntax=make
diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
index baafc1572..4be968f43 100644
--- a/rules/host-system-python3.in
+++ b/rules/host-system-python3.in
@@ -23,4 +23,10 @@ config HOST_SYSTEM_PYTHON3_SETUPTOOLS
config HOST_SYSTEM_PYTHON3_SIX
bool
+config HOST_SYSTEM_PYTHON3_PYELFTOOLS
+ bool
+
+config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
+ bool
+
endif
diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
index a44767c50..02e9da141 100644
--- a/rules/host-system-python3.make
+++ b/rules/host-system-python3.make
@@ -60,6 +60,18 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX
ptxd_bailout "Python six module not found! \
Please install python3-six (debian)";
endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS
+ @echo "Checking for Python Pyelftools ..."
+ @$(SYSTEMPYTHON3) -c 'import elftools' 2>/dev/null || \
+ ptxd_bailout "Python elftools module not found! \
+ Please install python3-pyelftools (debian)";
+endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
+ @echo "Checking for Python Cryptography ..."
+ @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
+ ptxd_bailout "Python cryptography module not found! \
+ Please install python3-cryptography (debian)";
+endif
@$(call touch)
# vim: syntax=make
diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
index 006060496..9650e8ec4 100644
--- a/rules/host-tz-database.make
+++ b/rules/host-tz-database.make
@@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
#
HOST_TZ_DATABASE := tz-database
HOST_TZ_DATABASE_DIR := $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
-HOST_TZ_DATABASE_VERSION:= 2021e
+HOST_TZ_DATABASE_VERSION:= 2022a
TZCODE_VERSION := $(HOST_TZ_DATABASE_VERSION)
-TZCODE_MD5 := 5128fe397d65de8392c4bb0c806c10ed
+TZCODE_MD5 := fdc790effd7b01d29837fb27b3e81672
TZCODE := tzcode$(TZCODE_VERSION)
TZCODE_SUFFIX := tar.gz
TZCODE_URL := \
@@ -31,7 +31,7 @@ TZCODE_DIR := $(HOST_TZ_DATABASE_DIR)
TZCODE_STRIP_LEVEL := 0
TZDATA_VERSION := $(HOST_TZ_DATABASE_VERSION)
-TZDATA_MD5 := 4fdfad906ebc85fef30221c10964cce9
+TZDATA_MD5 := 081662184f3b902f8e5d96816568432e
TZDATA := tzdata$(TZDATA_VERSION)
TZDATA_SUFFIX := tar.gz
TZDATA_URL := \
diff --git a/rules/host-xorg-app-xkbcomp.make b/rules/host-xorg-app-xkbcomp.make
index 8f95acb39..f423eee09 100644
--- a/rules/host-xorg-app-xkbcomp.make
+++ b/rules/host-xorg-app-xkbcomp.make
@@ -15,21 +15,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_APP_XKBCOMP) += host-xorg-app-xkbcomp
# Prepare
# ----------------------------------------------------------------------------
-#HOST_XORG_APP_XKBCOMP_CONF_ENV := $(HOST_ENV)
-
#
# autoconf
#
HOST_XORG_APP_XKBCOMP_CONF_TOOL := autoconf
-#HOST_XORG_APP_XKBCOMP_CONF_OPT := $(HOST_AUTOCONF)
-
-#$(STATEDIR)/host-xorg-app-xkbcomp.prepare:
-# @$(call targetinfo)
-# @$(call clean, $(HOST_XORG_APP_XKBCOMP_DIR)/config.cache)
-# cd $(HOST_XORG_APP_XKBCOMP_DIR) && \
-# $(HOST_XORG_APP_XKBCOMP_PATH) $(HOST_XORG_APP_XKBCOMP_ENV) \
-# ./configure $(HOST_XORG_APP_XKBCOMP_CONF_OPT)
-# @$(call touch)
+HOST_XORG_APP_XKBCOMP_MAKE_ENV := \
+ ICECC_REMOTE_CPP=0
# vim: syntax=make
diff --git a/rules/host-yasm.make b/rules/host-yasm.make
index 860ee6e9a..4612b5e17 100644
--- a/rules/host-yasm.make
+++ b/rules/host-yasm.make
@@ -27,5 +27,16 @@ HOST_YASM_DIR := $(HOST_BUILDDIR)/$(HOST_YASM)
# ----------------------------------------------------------------------------
HOST_YASM_CONF_TOOL := autoconf
+HOST_YASM_CONF_OPT := \
+ $(HOST_AUTOCONF) \
+ --disable-debug \
+ --disable-warnerror \
+ --disable-profiling \
+ --disable-gcov \
+ --disable-python \
+ --disable-python-bindings \
+ --disable-nls \
+ --disable-rpath \
+ --without-dmalloc
# vim: syntax=make
diff --git a/rules/hostapd.make b/rules/hostapd.make
index 243303ccc..2d061b5d4 100644
--- a/rules/hostapd.make
+++ b/rules/hostapd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_HOSTAPD) += hostapd
# Paths and names
#
HOSTAPD_NAME := hostapd
-HOSTAPD_VERSION := 2.9
-HOSTAPD_MD5 := f188fc53a495fe7af3b6d77d3c31dee8
+HOSTAPD_VERSION := 2.10
+HOSTAPD_MD5 := 0be43e9e09ab94a7ebf82de0d1c57761
HOSTAPD := $(HOSTAPD_NAME)-$(HOSTAPD_VERSION)
HOSTAPD_SUFFIX := tar.gz
HOSTAPD_URL := http://w1.fi/releases/$(HOSTAPD).$(HOSTAPD_SUFFIX)
@@ -29,8 +29,8 @@ HOSTAPD_CONFIG = $(call ptx/get-alternative, config/hostapd, defconfig)
HOSTAPD_DOTCONFIG := $(BUILDDIR)/$(HOSTAPD)/$(HOSTAPD_SUBDIR)/.config
HOSTAPD_LICENSE := BSD-3-Clause
HOSTAPD_LICENSE_FILES := \
- file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \
- file://README;md5=e7d3dbb01f75f0b9799e192731d1e1ff
+ file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \
+ file://README;md5=e3d2f6c2948991e37c1ca4960de84747
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/hping.in b/rules/hping.in
index 58b637542..1b8bd2fbe 100644
--- a/rules/hping.in
+++ b/rules/hping.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
config HPING
tristate
select LIBPCAP
@@ -10,3 +12,5 @@ config HPING
ICMP and RAW-IP protocols, has a traceroute mode, the ability to
send files between a covered channel, and many other features.
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain.
diff --git a/rules/hwdata.make b/rules/hwdata.make
index 5d09b6c81..e0fbcb55e 100644
--- a/rules/hwdata.make
+++ b/rules/hwdata.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata
#
# Paths and names
#
-HWDATA_VERSION := 0.355
-HWDATA_MD5 := ee30c73571b9392a7b2d77619a6842a5
+HWDATA_VERSION := 0.359
+HWDATA_MD5 := 0d0429db17c95deaf2d03b3cc378221f
HWDATA := hwdata-$(HWDATA_VERSION)
HWDATA_SUFFIX := tar.gz
HWDATA_URL := https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)
diff --git a/rules/image-root-cpio-gz.make b/rules/image-root-cpio-gz.make
deleted file mode 100644
index 52a6a4bd9..000000000
--- a/rules/image-root-cpio-gz.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO_GZ) += image-root-cpio-gz
-
-#
-# Paths and names
-#
-IMAGE_ROOT_CPIO_GZ := image-root-cpio-gz
-IMAGE_ROOT_CPIO_GZ_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO_GZ)
-IMAGE_ROOT_CPIO_GZ_IMAGE := $(IMAGEDIR)/root.cpio.gz
-IMAGE_ROOT_CPIO_GZ_FILES := $(IMAGEDIR)/root.tgz
-IMAGE_ROOT_CPIO_GZ_CONFIG := cpio.config
-
-# ----------------------------------------------------------------------------
-# Image
-# ----------------------------------------------------------------------------
-
-IMAGE_ROOT_CPIO_GZ_ENV := \
- FORMAT="newc" \
- COMPRESS=gzip
-
-ifdef PTXCONF_IMAGE_ROOT_CPIO_GZ
-$(IMAGE_ROOT_CPIO_GZ_IMAGE):
- @$(call targetinfo)
- @$(call image/genimage, IMAGE_ROOT_CPIO_GZ)
- @$(call finish)
-endif
-
-# vim: syntax=make
diff --git a/rules/image-root-cpio.make b/rules/image-root-cpio.make
index ab6afdd42..447a649c8 100644
--- a/rules/image-root-cpio.make
+++ b/rules/image-root-cpio.make
@@ -16,7 +16,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO) += image-root-cpio
#
IMAGE_ROOT_CPIO := image-root-cpio
IMAGE_ROOT_CPIO_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO)
-IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio
+IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio$(call remove_quotes, $(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_SUFFIX))
IMAGE_ROOT_CPIO_FILES := $(IMAGEDIR)/root.tgz
IMAGE_ROOT_CPIO_CONFIG := cpio.config
@@ -26,7 +26,7 @@ IMAGE_ROOT_CPIO_CONFIG := cpio.config
IMAGE_ROOT_CPIO_ENV := \
FORMAT="newc" \
- COMPRESS=
+ COMPRESS=$(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_UTIL)
ifdef PTXCONF_IMAGE_ROOT_CPIO
$(IMAGE_ROOT_CPIO_IMAGE):
diff --git a/rules/intel-gmmlib.make b/rules/intel-gmmlib.make
index 3f2b2616a..fa9018963 100644
--- a/rules/intel-gmmlib.make
+++ b/rules/intel-gmmlib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_INTEL_GMMLIB) += intel-gmmlib
#
# Paths and names
#
-INTEL_GMMLIB_VERSION := 21.2.1
-INTEL_GMMLIB_MD5 := e4068a4fc2289b2067c381bdea153a48
+INTEL_GMMLIB_VERSION := 22.1.2
+INTEL_GMMLIB_MD5 := a51a5cf33cc95bb2363b4e0b175d6121
INTEL_GMMLIB := intel-gmmlib-$(INTEL_GMMLIB_VERSION)
INTEL_GMMLIB_SUFFIX := tar.gz
INTEL_GMMLIB_URL := https://github.com/intel/gmmlib/archive/$(INTEL_GMMLIB).$(INTEL_GMMLIB_SUFFIX)
diff --git a/rules/intel-media-driver.make b/rules/intel-media-driver.make
index 873eea8aa..4359a0c5f 100644
--- a/rules/intel-media-driver.make
+++ b/rules/intel-media-driver.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_INTEL_MEDIA_DRIVER) += intel-media-driver
#
# Paths and names
#
-INTEL_MEDIA_DRIVER_VERSION := 21.3.0
-INTEL_MEDIA_DRIVER_MD5 := 69180a3a7f3cf8296fd53b04b1f31961
+INTEL_MEDIA_DRIVER_VERSION := 22.3.1
+INTEL_MEDIA_DRIVER_MD5 := 84645667677927fdb2a3bf10e2814658
INTEL_MEDIA_DRIVER := intel-media-$(INTEL_MEDIA_DRIVER_VERSION)
INTEL_MEDIA_DRIVER_SUFFIX := tar.gz
INTEL_MEDIA_DRIVER_URL := https://github.com/intel/media-driver/archive/$(INTEL_MEDIA_DRIVER).$(INTEL_MEDIA_DRIVER_SUFFIX)
diff --git a/rules/iproute2.in b/rules/iproute2.in
index 25a5ae347..65077149c 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -65,14 +65,6 @@ config IPROUTE2_IP
comment "busybox' ip is selected"
depends on BUSYBOX_IP
-config IPROUTE2_IFCFG
- bool
- prompt "ifcfg"
- help
- ifcfg is a script wrapping ip, written as replacement for
- ifconfig.
- Needs arping and rdisk programs from the iputils package.
-
config IPROUTE2_IFSTAT
bool
prompt "ifstat"
@@ -94,12 +86,6 @@ config IPROUTE2_NSTAT
help
handy utility to read counters /proc/net/netstat and snmp
-config IPROUTE2_ROUTEF
- bool
- prompt "routef"
- help
- Component of ip route for flushing the routing tables
-
config IPROUTE2_ROUTEL
bool
prompt "routel"
@@ -118,12 +104,6 @@ config IPROUTE2_RTMON
help
Route monitoring
-config IPROUTE2_RTPR
- bool
- prompt "rtpr"
- help
- A tool to make the output of "ip -o" readable
-
config IPROUTE2_RTSTAT
bool
prompt "rtstat"
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 6643d9e22..5d630050e 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
#
# Paths and names
#
-IPROUTE2_VERSION := 5.9.0
-IPROUTE2_MD5 := 3966f12374e1beb70f1c21f30a350673
+IPROUTE2_VERSION := 5.17.0
+IPROUTE2_MD5 := 8ade96ee93f37fba7e1beec89f1a54bf
IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -28,8 +28,9 @@ IPROUTE2_LICENSE := GPL-2.0-only
# Prepare
# ----------------------------------------------------------------------------
-# iproute2's configure is handcrafted and doesn't take standard configure options
-IPROUTE2_CONF_OPT := ''
+# iproute2's configure is handcrafted
+IPROUTE2_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR)
$(STATEDIR)/iproute2.prepare:
@$(call targetinfo)
@@ -61,15 +62,12 @@ IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_CTSTAT) += ctstat
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_DEVLINK) += devlink
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_GENL) += genl
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_IP) += ip
-IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_IFCFG) += ifcfg
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_IFSTAT) += ifstat
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_LNSTAT) += lnstat
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_NSTAT) += nstat
-IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_ROUTEF) += routef
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_ROUTEL) += routel
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_RTACCT) += rtacct
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_RTMON) += rtmon
-IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_RTPR) += rtpr
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_RTSTAT) += rtstat
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_SS) += ss
IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_TC) += tc
diff --git a/rules/json-c.make b/rules/json-c.make
index f2a990bf4..dc53d0fd3 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
#
# Paths and names
#
-JSON_C_VERSION := 0.14
-JSON_C_MD5 := 72cbb065b43376d825cd521d115ae1f6
+JSON_C_VERSION := 0.16
+JSON_C_MD5 := 8110782cb2a996da5517f1f27a4bed8e
JSON_C := json-c-$(JSON_C_VERSION)
JSON_C_SUFFIX := tar.gz
JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX)
@@ -33,8 +33,10 @@ JSON_C_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DBUILD_DOCUMENTATION:BOOL=OFF \
-DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_STATIC_LIBS:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF \
-DDISABLE_BSYMBOLIC:BOOL=ON \
+ -DDISABLE_EXTRA_LIBS:BOOL=ON \
-DDISABLE_WERROR:BOOL=ON \
-DENABLE_RDRAND:BOOL=OFF \
-DENABLE_THREADING:BOOL=OFF
diff --git a/rules/json-glib.in b/rules/json-glib.in
index 03e374369..9230f4001 100644
--- a/rules/json-glib.in
+++ b/rules/json-glib.in
@@ -3,6 +3,7 @@
config JSON_GLIB
tristate
prompt "json-glib"
+ select HOST_MESON
select GLIB
select HOST_GLIB # for glib-mkenums
select GOBJECT_INTROSPECTION if JSON_GLIB_INTROSPECTION
diff --git a/rules/json-glib.make b/rules/json-glib.make
index 507560e28..d36edc7d2 100644
--- a/rules/json-glib.make
+++ b/rules/json-glib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_GLIB) += json-glib
#
# Paths and names
#
-JSON_GLIB_VERSION := 1.2.8
-JSON_GLIB_MD5 := ff31e7d0594df44318e12facda3d086e
+JSON_GLIB_VERSION := 1.6.6
+JSON_GLIB_MD5 := 9c40fcd8cdbf484dd1704480afefae14
JSON_GLIB := json-glib-$(JSON_GLIB_VERSION)
JSON_GLIB_SUFFIX := tar.xz
JSON_GLIB_URL := $(call ptx/mirror, GNOME, json-glib/$(basename $(JSON_GLIB_VERSION))/$(JSON_GLIB).$(JSON_GLIB_SUFFIX))
@@ -28,25 +28,15 @@ JSON_GLIB_LICENSE := LGPL-2.1-only
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-JSON_GLIB_CONF_TOOL := autoconf
+JSON_GLIB_CONF_TOOL := meson
JSON_GLIB_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-glibtest \
- --enable-debug=minimum \
- --enable-maintainer-flags=no \
- --disable-installed-tests \
- --disable-always-build-tests \
- --disable-gcov \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-man \
- --$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)-introspection \
- --disable-nls \
- --disable-rpath
-
+ $(CROSS_MESON_USR) \
+ -Dintrospection=$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)d \
+ -Dgtk_doc=disabled \
+ -Dman=false \
+ -Dtests=false
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/kernel.make b/rules/kernel.make
index 1b70faf21..09bfc4491 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -31,8 +31,8 @@ KERNEL_DTS_PATH := $(call remove_quotes,$(PTXCONF_KERNEL_DTS_PATH))
KERNEL_DTS := $(call remove_quotes,$(PTXCONF_KERNEL_DTS))
KERNEL_DTSO_PATH := $(call remove_quotes,$(PTXCONF_KERNEL_DTSO_PATH))
KERNEL_DTSO := $(call remove_quotes,$(PTXCONF_KERNEL_DTSO))
-KERNEL_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_DTS)))
-KERNEL_DTBO_FILES := $(addsuffix .dtbo,$(basename $(KERNEL_DTSO)))
+KERNEL_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_DTS))))
+KERNEL_DTBO_FILES := $(addsuffix .dtbo,$(basename $(notdir $(KERNEL_DTSO))))
KERNEL_DTBO_DIR := /boot/overlays
KERNEL_LICENSE := GPL-2.0-only
KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make
index 252f06562..feb21f3f2 100644
--- a/rules/kexec-tools.make
+++ b/rules/kexec-tools.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools
#
# Paths and names
#
-KEXEC_TOOLS_VERSION := 2.0.21
-KEXEC_TOOLS_MD5 := 4a0bbced84e46162d8f8e2c17a0b1466
+KEXEC_TOOLS_VERSION := 2.0.23
+KEXEC_TOOLS_MD5 := 483f3d35de59b3fffeab10d386cb7364
KEXEC_TOOLS := kexec-tools-$(KEXEC_TOOLS_VERSION)
KEXEC_TOOLS_SUFFIX := tar.xz
KEXEC_TOOLS_URL := $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX))
diff --git a/rules/libarchive.make b/rules/libarchive.make
index 11a7586cc..e75034d74 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
#
# Paths and names
#
-LIBARCHIVE_VERSION := 3.5.1
-LIBARCHIVE_MD5 := c96040b75a14c8ba73238c284147e87f
+LIBARCHIVE_VERSION := 3.6.1
+LIBARCHIVE_MD5 := 802a56ef9eaa0b8776296ba78a6d0c2c
LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION)
LIBARCHIVE_SUFFIX := tar.gz
LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index ccd650b79..530af64ef 100644
--- a/rules/libcap-ng.make
+++ b/rules/libcap-ng.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP_NG) += libcap-ng
#
# Paths and names
#
-LIBCAP_NG_VERSION := 0.8.2
-LIBCAP_NG_MD5 := faf1ef766cf068ad1aba4008ced665f7
+LIBCAP_NG_VERSION := 0.8.3
+LIBCAP_NG_MD5 := cdfc750af32f681293e43c5c1bd427c8
LIBCAP_NG := libcap-ng-$(LIBCAP_NG_VERSION)
LIBCAP_NG_SUFFIX := tar.gz
LIBCAP_NG_URL := http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
diff --git a/rules/libcap.make b/rules/libcap.make
index df1eeef16..3c51092a5 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap
#
# Paths and names
#
-LIBCAP_VERSION := 2.62
-LIBCAP_MD5 := 342c7560ed2103899f6914d1de75a89f
+LIBCAP_VERSION := 2.64
+LIBCAP_MD5 := 14fb1fa596f58596bdef0bb5033d2586
LIBCAP := libcap-$(LIBCAP_VERSION)
LIBCAP_SUFFIX := tar.xz
LIBCAP_URL := \
diff --git a/rules/libcurl.make b/rules/libcurl.make
index fcf042f9d..8faa948bf 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -15,14 +15,15 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
#
# Paths and names
#
-LIBCURL_VERSION := 7.80.0
-LIBCURL_MD5 := cf9f8553762150ef0ebcd5ee412737f5
+LIBCURL_VERSION := 7.83.1
+LIBCURL_MD5 := 08c6d9c25d9cf8d17be28363753e42ca
LIBCURL := curl-$(LIBCURL_VERSION)
LIBCURL_SUFFIX := tar.xz
LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX)
LIBCURL_DIR := $(BUILDDIR)/$(LIBCURL)
-LIBCURL_LICENSE := MIT
+LIBCURL_LICENSE := curl
+LIBCURL_LICENSE_FILES := file://COPYING;md5=190c514872597083303371684954f238
# ----------------------------------------------------------------------------
# Prepare
@@ -44,6 +45,7 @@ LIBCURL_CONF_OPT := \
--enable-rt \
--disable-ech \
--disable-code-coverage \
+ --disable-headers-api \
$(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http \
--$(call ptx/endis, PTXCONF_LIBCURL_FTP)-ftp \
@@ -95,7 +97,6 @@ LIBCURL_CONF_OPT := \
--with-gnutls=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \
--without-mbedtls \
--without-wolfssl \
- --without-mesalink \
--without-bearssl \
--without-rustls \
--without-nss \
@@ -119,6 +120,7 @@ LIBCURL_CONF_OPT := \
--without-libidn2 \
--without-nghttp2 \
--without-ngtcp2 \
+ --without-msh3 \
--without-nghttp3 \
--without-quiche \
--without-zsh-functions-dir \
diff --git a/rules/libdrm.make b/rules/libdrm.make
index c8f4002b2..033192468 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
#
# Paths and names
#
-LIBDRM_VERSION := 2.4.109
-LIBDRM_MD5 := 376523fcbba8b9e194bcb5adff142d5d
+LIBDRM_VERSION := 2.4.110
+LIBDRM_MD5 := ef6449de30a41ecdf69dc7ae78e676a9
LIBDRM := libdrm-$(LIBDRM_VERSION)
LIBDRM_SUFFIX := tar.xz
LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
diff --git a/rules/libevdev.in b/rules/libevdev.in
index 3cdc372db..4d90db437 100644
--- a/rules/libevdev.in
+++ b/rules/libevdev.in
@@ -2,6 +2,7 @@
config LIBEVDEV
tristate
+ select HOST_SYSTEM_PYTHON3
prompt "libevdev"
help
libevdev is a wrapper library for evdev devices. it moves the
diff --git a/rules/libevdev.make b/rules/libevdev.make
index 95d5b6ea9..98b403ab5 100644
--- a/rules/libevdev.make
+++ b/rules/libevdev.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBEVDEV) += libevdev
#
# Paths and names
#
-LIBEVDEV_VERSION := 1.11.0
-LIBEVDEV_MD5 := b09838ec120dabeebc08fa6a1943594f
+LIBEVDEV_VERSION := 1.12.1
+LIBEVDEV_MD5 := f7801fd13801f6a2cb7cb7ab5b204639
LIBEVDEV := libevdev-$(LIBEVDEV_VERSION)
LIBEVDEV_SUFFIX := tar.xz
LIBEVDEV_URL := http://www.freedesktop.org/software/libevdev/$(LIBEVDEV).$(LIBEVDEV_SUFFIX)
diff --git a/rules/libfsl-vpu.in b/rules/libfsl-vpu.in
index d6eea6eaa..dd9a16260 100644
--- a/rules/libfsl-vpu.in
+++ b/rules/libfsl-vpu.in
@@ -1,7 +1,13 @@
-## SECTION=multimedia_gstreamer
+## SECTION=staging
+## old section:
+### SECTION=multimedia_gstreamer
config LIBFSL_VPU
tristate
prompt "libfsl-vpu"
help
FIXME
+
+ STAGING: remove in PTXdist 2023.04.0
+ Old library for imx downstream driver. Fails to build with a
+ current toolchain (gcc 11).
diff --git a/rules/libgudev.make b/rules/libgudev.make
index 820387f30..b48cf82ba 100644
--- a/rules/libgudev.make
+++ b/rules/libgudev.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBGUDEV) += libgudev
#
# Paths and names
#
-LIBGUDEV_VERSION := 236
-LIBGUDEV_MD5 := ad5a63bd88fe97189fec7b7afb2d4150
+LIBGUDEV_VERSION := 237
+LIBGUDEV_MD5 := a7783083cd74957d3a727ddc4737ee84
LIBGUDEV := libgudev-$(LIBGUDEV_VERSION)
LIBGUDEV_SUFFIX := tar.xz
LIBGUDEV_URL := $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX))
@@ -23,7 +23,7 @@ LIBGUDEV_SOURCE := $(SRCDIR)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
LIBGUDEV_DIR := $(BUILDDIR)/$(LIBGUDEV)
LIBGUDEV_LICENSE := LGPL-2.1-or-later
LIBGUDEV_LICENSE_FILES := \
- file://gudev/gudevclient.c;startline=3;endline=17;md5=9b5faada7cee1391bdd7c4af9a0acd34 \
+ file://gudev/gudevclient.c;startline=3;endline=17;md5=829bbbdef46b2ae9fc89115aea26f119 \
file://COPYING;md5=4fbd65380cdd255951079008b364516c
# ----------------------------------------------------------------------------
diff --git a/rules/libid3tag.make b/rules/libid3tag.make
index 0b36f03b8..e2bfde16b 100644
--- a/rules/libid3tag.make
+++ b/rules/libid3tag.make
@@ -18,7 +18,7 @@ LIBID3TAG_VERSION := 0.15.1b
LIBID3TAG_MD5 := e5808ad997ba32c498803822078748c3
LIBID3TAG := libid3tag-$(LIBID3TAG_VERSION)
LIBID3TAG_SUFFIX := tar.gz
-LIBID3TAG_URL := ftp://ftp.mars.org/pub/mpeg/$(LIBID3TAG).$(LIBID3TAG_SUFFIX)
+LIBID3TAG_URL := $(call ptx/mirror, SF, mad/libid3tag/$(LIBID3TAG_VERSION)/$(LIBID3TAG).$(LIBID3TAG_SUFFIX))
LIBID3TAG_SOURCE := $(SRCDIR)/$(LIBID3TAG).$(LIBID3TAG_SUFFIX)
LIBID3TAG_DIR := $(BUILDDIR)/$(LIBID3TAG)
LIBID3TAG_LICENSE := GPL-2.0-or-later
diff --git a/rules/libiio.make b/rules/libiio.make
index c630e92b9..0cbc77004 100644
--- a/rules/libiio.make
+++ b/rules/libiio.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBIIO) += libiio
#
# Paths and names
#
-LIBIIO_VERSION := 0.17
-LIBIIO_MD5 := 05a45aad2d50ef8c8a015d0caaf3802d
+LIBIIO_VERSION := 0.23
+LIBIIO_MD5 := d23393bf1eefa0cd6fd4859efc453e95
LIBIIO := libiio-$(LIBIIO_VERSION)
LIBIIO_SUFFIX := tar.gz
LIBIIO_URL := https://github.com/analogdevicesinc/libiio/archive/v$(LIBIIO_VERSION).$(LIBIIO_SUFFIX)
@@ -30,19 +30,23 @@ LIBIIO_LICENSE := LGPL-2.1-only
LIBIIO_CONF_TOOL := cmake
LIBIIO_CONF_OPT := \
$(CROSS_CMAKE_USR) \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCSHARP_BINDINGS=OFF \
-DENABLE_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) \
+ -DENABLE_PACKAGING=OFF \
+ -DPYTHON_BINDINGS=OFF \
-DWITH_DOC=OFF \
+ -DWITH_EXAMPLES=OFF \
+ -DWITH_GCOV=OFF \
-DWITH_IIOD=OFF \
-DWITH_LOCAL_BACKEND=ON \
-DWITH_LOCAL_CONFIG=OFF \
- -DWITH_XML_BACKEND=OFF \
- -DWITH_USB_BACKEND=OFF \
- -DWITH_SERIAL_BACKEND=OFF \
+ -DWITH_MAN=OFF \
-DWITH_NETWORK_BACKEND=OFF \
- -DWITH_MATLAB_BINDINGS_API=OFF \
- -DPYTHON_BINDINGS=OFF \
- -DCSHARP_BINDINGS=OFF \
+ -DWITH_SERIAL_BACKEND=OFF \
-DWITH_TESTS=$(call ptx/onoff, PTXCONF_LIBIIO_TEST_TOOLS) \
+ -DWITH_USB_BACKEND=OFF \
+ -DWITH_XML_BACKEND=OFF \
\
-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON
diff --git a/rules/libinput.make b/rules/libinput.make
index 016cea8b6..8d30858c3 100644
--- a/rules/libinput.make
+++ b/rules/libinput.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBINPUT) += libinput
#
# Paths and names
#
-LIBINPUT_VERSION := 1.18.0
-LIBINPUT_MD5 := 847a3c24383e1a937d1d46c46332e710
+LIBINPUT_VERSION := 1.20.1
+LIBINPUT_MD5 := e4b559f8b799a4c5bda9aa98841753a9
LIBINPUT := libinput-$(LIBINPUT_VERSION)
-LIBINPUT_SUFFIX := tar.xz
-LIBINPUT_URL := http://www.freedesktop.org/software/libinput/$(LIBINPUT).$(LIBINPUT_SUFFIX)
+LIBINPUT_SUFFIX := tar.gz
+LIBINPUT_URL := https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION)/$(LIBINPUT).$(LIBINPUT_SUFFIX)
LIBINPUT_SOURCE := $(SRCDIR)/$(LIBINPUT).$(LIBINPUT_SUFFIX)
LIBINPUT_DIR := $(BUILDDIR)/$(LIBINPUT)
LIBINPUT_LICENSE := MIT
diff --git a/rules/libjpeg.in b/rules/libjpeg.in
index 53a9d9e09..3304c6ac8 100644
--- a/rules/libjpeg.in
+++ b/rules/libjpeg.in
@@ -19,4 +19,11 @@ config LIBJPEG_BIN
cjpeg and djpeg are simple bineries to convert some basic image
formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
+config LIBJPEG_TURBO
+ bool
+ prompt "Build and install libturbojpeg"
+ help
+ In addition to the traditional libjpeg API, also provide the less
+ powerful but more straightforward TurboJPEG API.
+
endif
diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index 559a6d08d..06307e635 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
#
# Paths and names
#
-LIBJPEG_VERSION := 2.1.2
-LIBJPEG_MD5 := e181bd78884dd5392a869209bfa41d4a
+LIBJPEG_VERSION := 2.1.3
+LIBJPEG_MD5 := 85244dedeaf06f636a9e7ddea6d236d8
LIBJPEG_SUFFIX := tar.gz
LIBJPEG := libjpeg-turbo-$(LIBJPEG_VERSION)
LIBJPEG_TARBALL := $(LIBJPEG).$(LIBJPEG_SUFFIX)
@@ -26,7 +26,7 @@ LIBJPEG_SOURCE := $(SRCDIR)/$(LIBJPEG_TARBALL)
LIBJPEG_DIR := $(BUILDDIR)/$(LIBJPEG)
LIBJPEG_LICENSE := IJG, BSD-3-Clause, Zlib
LIBJPEG_LICENSE_FILES := \
- file://LICENSE.md;md5=970f17d51650fe54e4f839c6e6121f79 \
+ file://LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 \
file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=839b9ed7df5168976efc071bee29a76e
@@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
-DWITH_JPEG8=ON \
-DWITH_MEM_SRCDST=ON \
-DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
- -DWITH_TURBOJPEG=OFF
+ -DWITH_TURBOJPEG=$(call ptx/onoff,PTXCONF_LIBJPEG_TURBO)
# ----------------------------------------------------------------------------
# Target-Install
@@ -76,6 +76,9 @@ $(STATEDIR)/libjpeg.targetinstall:
@$(call install_fixup, libjpeg,DESCRIPTION,missing)
@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
+ifdef PTXCONF_LIBJPEG_TURBO
+ @$(call install_lib, libjpeg, 0, 0, 0644, libturbojpeg)
+endif
ifdef PTXCONF_LIBJPEG_BIN
@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)
diff --git a/rules/libksba.make b/rules/libksba.make
index 554440cbe..0604beb1f 100644
--- a/rules/libksba.make
+++ b/rules/libksba.make
@@ -18,7 +18,9 @@ LIBKSBA_VERSION := 1.3.5
LIBKSBA_MD5 := 8302a3e263a7c630aa7dea7d341f07a2
LIBKSBA := libksba-$(LIBKSBA_VERSION)
LIBKSBA_SUFFIX := tar.bz2
-LIBKSBA_URL := ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
+LIBKSBA_URL := \
+ https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) \
+ ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
LIBKSBA_SOURCE := $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX)
LIBKSBA_DIR := $(BUILDDIR)/$(LIBKSBA)
LIBKSBA_LICENSE := GPL-2.0-only AND GPL-3.0-only AND LGPL-3.0-only
diff --git a/rules/libmad.make b/rules/libmad.make
index 7f7ced6dd..847a4d161 100644
--- a/rules/libmad.make
+++ b/rules/libmad.make
@@ -18,7 +18,7 @@ LIBMAD_VERSION := 0.15.1b
LIBMAD_MD5 := 1be543bc30c56fb6bea1d7bf6a64e66c
LIBMAD := libmad-$(LIBMAD_VERSION)
LIBMAD_SUFFIX := tar.gz
-LIBMAD_URL := ftp://ftp.mars.org/pub/mpeg/$(LIBMAD).$(LIBMAD_SUFFIX)
+LIBMAD_URL := $(call ptx/mirror, SF, mad/libmad/$(LIBMAD_VERSION)/$(LIBMAD).$(LIBMAD_SUFFIX))
LIBMAD_SOURCE := $(SRCDIR)/$(LIBMAD).$(LIBMAD_SUFFIX)
LIBMAD_DIR := $(BUILDDIR)/$(LIBMAD)
LIBMAD_LICENSE := GPL-2.0-or-later
diff --git a/rules/libmbim.make b/rules/libmbim.make
index ba9941653..781f9c0ce 100644
--- a/rules/libmbim.make
+++ b/rules/libmbim.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
#
# Paths and names
#
-LIBMBIM_VERSION := 1.26.2
-LIBMBIM_MD5 := 8893edbfd16e1198c018277cd2ad487e
+LIBMBIM_VERSION := 1.26.4
+LIBMBIM_MD5 := 58dea20cad346f31d2873b68385a9973
LIBMBIM := libmbim-$(LIBMBIM_VERSION)
LIBMBIM_SUFFIX := tar.xz
LIBMBIM_URL := http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index 6955449a7..68952eb8d 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBMICROHTTPD) += libmicrohttpd
#
# Paths and names
#
-LIBMICROHTTPD_VERSION := 0.9.73
-LIBMICROHTTPD_MD5 := 2b15949b1633e4fa487e08cdcc97f0e3
+LIBMICROHTTPD_VERSION := 0.9.75
+LIBMICROHTTPD_MD5 := aff64581937b53f3a23b05216ad2cd02
LIBMICROHTTPD := libmicrohttpd-$(LIBMICROHTTPD_VERSION)
LIBMICROHTTPD_SUFFIX := tar.gz
LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
@@ -49,7 +49,6 @@ LIBMICROHTTPD_CONF_OPT := \
--disable-rpath \
--enable-gcc-hardening \
--enable-linker-hardening \
- --disable-sanitizer \
--disable-thread-names \
--disable-doc \
--disable-examples \
@@ -68,6 +67,7 @@ LIBMICROHTTPD_CONF_OPT := \
--disable-httpupgrade \
--disable-coverage \
--enable-asserts \
+ --disable-sanitizers \
--disable-experimental
# ----------------------------------------------------------------------------
diff --git a/rules/libmnl.make b/rules/libmnl.make
index f2ce45178..9106a5bf4 100644
--- a/rules/libmnl.make
+++ b/rules/libmnl.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBMNL) += libmnl
#
# Paths and names
#
-LIBMNL_VERSION := 1.0.4
-LIBMNL_MD5 := be9b4b5328c6da1bda565ac5dffadb2d
+LIBMNL_VERSION := 1.0.5
+LIBMNL_MD5 := 0bbb70573119ec5d49435114583e7a49
LIBMNL := libmnl-$(LIBMNL_VERSION)
LIBMNL_SUFFIX := tar.bz2
LIBMNL_URL := http://ftp.netfilter.org/pub/libmnl/$(LIBMNL).$(LIBMNL_SUFFIX)
diff --git a/rules/libnetpbm.in b/rules/libnetpbm.in
index 76ca9a03b..3ef542b9f 100644
--- a/rules/libnetpbm.in
+++ b/rules/libnetpbm.in
@@ -1,4 +1,6 @@
-## SECTION=multimedia_libs
+## SECTION=staging
+## old section:
+### SECTION=multimedia_libs
# netpbm configuration
menuconfig LIBNETPBM
@@ -12,6 +14,10 @@ menuconfig LIBNETPBM
contains a few general graphics manipulation tools,
but it is not intended to be a graphics tools library.
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and fails to build with a current
+ toolchain (gcc 11).
+
if LIBNETPBM
config LIBNETPBM_BUILD_FIASCO
diff --git a/rules/libnice.in b/rules/libnice.in
index 8aeb56f3c..ab10b43a9 100644
--- a/rules/libnice.in
+++ b/rules/libnice.in
@@ -3,9 +3,7 @@
config LIBNICE
tristate
prompt "libnice"
- # for autogen.sh
- select HOST_GTK_DOC
-
+ select HOST_MESON
select GLIB
select GSTREAMER1
select OPENSSL
diff --git a/rules/libnice.make b/rules/libnice.make
index f9efde424..a3d944a45 100644
--- a/rules/libnice.make
+++ b/rules/libnice.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBNICE) += libnice
#
# Paths and names
#
-LIBNICE_VERSION := 0.1.16
-LIBNICE_MD5 := 5ad936c43d3c6d33117b2c64982f2fd9
+LIBNICE_VERSION := 0.1.18
+LIBNICE_MD5 := 408482fa4bab7c6b884b0fb9ad57a038
LIBNICE := libnice-$(LIBNICE_VERSION)
LIBNICE_SUFFIX := tar.gz
LIBNICE_URL := https://libnice.freedesktop.org/releases/$(LIBNICE).$(LIBNICE_SUFFIX)
@@ -28,23 +28,18 @@ LIBNICE_LICENSE := MPL-1.1 OR LGPL-2.1-only
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-LIBNICE_CONF_TOOL := autoconf
+LIBNICE_CONF_TOOL := meson
LIBNICE_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --enable-assert \
- --enable-compile-warnings=yes \
- --disable-gupnp \
- --disable-coverage \
- --disable-static-plugins \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-introspection \
- --with-crypto-library=openssl \
- --with-gstreamer \
- --without-gstreamer-0.10
+ $(CROSS_MESON_USR) \
+ -Dcrypto-library=openssl \
+ -Dexamples=disabled \
+ -Dgstreamer=enabled \
+ -Dgtk_doc=disabled \
+ -Dgupnp=disabled \
+ -Dintrospection=disabled \
+ -Dtests=disabled
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/libnl3.make b/rules/libnl3.make
index 191e00126..df927878d 100644
--- a/rules/libnl3.make
+++ b/rules/libnl3.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBNL3) += libnl3
#
# Paths and names
#
-LIBNL3_VERSION := 3.5.0
-LIBNL3_MD5 := 74ba57b1b1d6f9f92268aa8141d8e8e4
+LIBNL3_VERSION := 3.6.0
+LIBNL3_MD5 := b3db700a55866b17036d0e035d88bb9d
LIBNL3 := libnl-$(LIBNL3_VERSION)
LIBNL3_RELEASE := libnl$(subst .,_,$(LIBNL3_VERSION))
LIBNL3_SUFFIX := tar.gz
diff --git a/rules/libpthread-stubs.make b/rules/libpthread-stubs.make
index 929660fb6..e33dc5566 100644
--- a/rules/libpthread-stubs.make
+++ b/rules/libpthread-stubs.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPTHREAD_STUBS) += libpthread-stubs
#
# Paths and names
#
-LIBPTHREAD_STUBS_VERSION := 0.1
-LIBPTHREAD_STUBS_MD5 := 774eabaf33440d534efe108ef9130a7d
+LIBPTHREAD_STUBS_VERSION := 0.4
+LIBPTHREAD_STUBS_MD5 := 48c1544854a94db0e51499cc3afd797f
LIBPTHREAD_STUBS := libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)
LIBPTHREAD_STUBS_SUFFIX := tar.bz2
LIBPTHREAD_STUBS_URL := http://xcb.freedesktop.org/dist/$(LIBPTHREAD_STUBS).$(LIBPTHREAD_STUBS_SUFFIX)
@@ -34,8 +34,7 @@ LIBPTHREAD_STUBS_ENV := $(CROSS_ENV)
# autoconf
#
LIBPTHREAD_STUBS_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --enable-shared=no
+ $(CROSS_AUTOCONF_USR)
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/libqmi.make b/rules/libqmi.make
index e28517205..2c4a61b5a 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
#
# Paths and names
#
-LIBQMI_VERSION := 1.30.2
-LIBQMI_MD5 := c0a656e06dccdd4fcd590f1d718a3b1c
+LIBQMI_VERSION := 1.30.6
+LIBQMI_MD5 := ddfe075d83c091a69f9e5e1c1c624af5
LIBQMI := libqmi-$(LIBQMI_VERSION)
LIBQMI_SUFFIX := tar.xz
LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
diff --git a/rules/libseccomp.make b/rules/libseccomp.make
index 5a6f45f1c..b3b99c189 100644
--- a/rules/libseccomp.make
+++ b/rules/libseccomp.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSECCOMP) += libseccomp
#
# Paths and names
#
-LIBSECCOMP_VERSION := 2.5.3
-LIBSECCOMP_MD5 := 5096d3912a605a72b27805fa0ef9886d
+LIBSECCOMP_VERSION := 2.5.4
+LIBSECCOMP_MD5 := 74008bb33234e0c2a0d998e7bee5c625
LIBSECCOMP := libseccomp-$(LIBSECCOMP_VERSION)
LIBSECCOMP_SUFFIX := tar.gz
LIBSECCOMP_URL := https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX)
diff --git a/rules/libsndfile.in b/rules/libsndfile.in
index 26cd8cb77..98f8874fd 100644
--- a/rules/libsndfile.in
+++ b/rules/libsndfile.in
@@ -3,6 +3,7 @@
menuconfig LIBSNDFILE
tristate
prompt "libsndfile "
+ select HOST_SYSTEM_PYTHON3
select LIBOGG if LIBSNDFILE_EXT_LIBS
select LIBVORBIS if LIBSNDFILE_EXT_LIBS
select FLAC if LIBSNDFILE_EXT_LIBS
diff --git a/rules/libsndfile.make b/rules/libsndfile.make
index b8b46e3ab..d69face8a 100644
--- a/rules/libsndfile.make
+++ b/rules/libsndfile.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBSNDFILE) += libsndfile
#
# Paths and names
#
-LIBSNDFILE_VERSION := 1.0.25
-LIBSNDFILE_MD5 := e2b7bb637e01022c7d20f95f9c3990a2
+LIBSNDFILE_VERSION := 1.1.0
+LIBSNDFILE_MD5 := e63dead2b4f0aaf323687619d007ee6a
LIBSNDFILE := libsndfile-$(LIBSNDFILE_VERSION)
-LIBSNDFILE_SUFFIX := tar.gz
-LIBSNDFILE_URL := http://www.mega-nerd.com/libsndfile/files/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
+LIBSNDFILE_SUFFIX := tar.xz
+LIBSNDFILE_URL := https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION)/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
LIBSNDFILE_SOURCE := $(SRCDIR)/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
LIBSNDFILE_DIR := $(BUILDDIR)/$(LIBSNDFILE)
LIBSNDFILE_LICENSE := LGPL-2.1-only
@@ -33,10 +33,19 @@ LIBSNDFILE_LICENSE := LGPL-2.1-only
LIBSNDFILE_CONF_TOOL := autoconf
LIBSNDFILE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --disable-octave \
+ --disable-experimental \
+ --disable-werror \
+ --disable-cpu-clip \
+ --disable-bow-docs \
+ --disable-sqlite \
--disable-alsa \
- --$(call ptx/endis,PTXCONF_LIBSNDFILE_EXT_LIBS)-external-libs
+ --$(call ptx/endis,PTXCONF_LIBSNDFILE_EXT_LIBS)-external-libs \
+ --disable-mpeg \
+ --disable-octave \
+ --enable-full-suite \
+ --disable-test-coverage \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --without-mkoctfile
# ----------------------------------------------------------------------------
# Target-Install
@@ -52,7 +61,6 @@ LIBSNDFILE_PROGS := \
sndfile-metadata-get \
sndfile-metadata-set \
sndfile-play \
- sndfile-regtest \
sndfile-salvage
$(STATEDIR)/libsndfile.targetinstall:
diff --git a/rules/libtasn1.make b/rules/libtasn1.make
index cd6a504c3..7e54635d2 100644
--- a/rules/libtasn1.make
+++ b/rules/libtasn1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTASN1) += libtasn1
#
# Paths and names
#
-LIBTASN1_VERSION := 4.17.0
-LIBTASN1_MD5 := c46f6eb3bd1287031ae5d36465094402
+LIBTASN1_VERSION := 4.18.0
+LIBTASN1_MD5 := 8203e72a2c0390515410b2ea2c032f04
LIBTASN1 := libtasn1-$(LIBTASN1_VERSION)
LIBTASN1_SUFFIX := tar.gz
LIBTASN1_URL := $(call ptx/mirror, GNU, libtasn1/$(LIBTASN1).$(LIBTASN1_SUFFIX))
diff --git a/rules/libtremor.make b/rules/libtremor.make
index 9d2c50939..bf56d2d11 100644
--- a/rules/libtremor.make
+++ b/rules/libtremor.make
@@ -11,11 +11,11 @@
#
PACKAGES-$(PTXCONF_LIBTREMOR) += libtremor
-LIBTREMOR_VERSION := 1.0.3
-LIBTREMOR_MD5 := 31074f67ca36a3f8e6c8225c9126cde0
+LIBTREMOR_VERSION := 2018-03-19-g7c30a6634619
+LIBTREMOR_MD5 := 927a8c737909e2176684fdf010fa1695
LIBTREMOR := libtremor-$(LIBTREMOR_VERSION)
LIBTREMOR_SUFFIX := tar.gz
-LIBTREMOR_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(LIBTREMOR).$(LIBTREMOR_SUFFIX)
+LIBTREMOR_URL := https://gitlab.xiph.org/xiph/tremor/-/archive/$(LIBTREMOR).$(LIBTREMOR_SUFFIX)
LIBTREMOR_SOURCE := $(SRCDIR)/$(LIBTREMOR).$(LIBTREMOR_SUFFIX)
LIBTREMOR_DIR := $(BUILDDIR)/$(LIBTREMOR)
diff --git a/rules/libusb.make b/rules/libusb.make
index 28df059ac..50e5c6333 100644
--- a/rules/libusb.make
+++ b/rules/libusb.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb
#
# Paths and names
#
-LIBUSB_VERSION := 1.0.24
-LIBUSB_MD5 := 5bc27df16155302f308d409e73589872
+LIBUSB_VERSION := 1.0.26
+LIBUSB_MD5 := 9c75660dfe1d659387c37b28c91e3160
LIBUSB := libusb-$(LIBUSB_VERSION)
LIBUSB_SUFFIX := tar.bz2
LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX))
diff --git a/rules/libuv.make b/rules/libuv.make
index 96f22a042..8a9cbacb6 100644
--- a/rules/libuv.make
+++ b/rules/libuv.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBUV) += libuv
#
# Paths and names
#
-LIBUV_VERSION := 1.34.0
-LIBUV_MD5 := 811ebe06c326e788ac7adf062328f3f1
+LIBUV_VERSION := 1.42.0
+LIBUV_MD5 := 484dec4a06e183c20be815019ce9ddd0
LIBUV := libuv-v$(LIBUV_VERSION)
LIBUV_SUFFIX := tar.gz
LIBUV_URL := https://dist.libuv.org/dist/v$(LIBUV_VERSION)/$(LIBUV).$(LIBUV_SUFFIX)
diff --git a/rules/libva.in b/rules/libva.in
index 8dd222903..b0ba96e5c 100644
--- a/rules/libva.in
+++ b/rules/libva.in
@@ -4,12 +4,9 @@ menuconfig LIBVA
tristate
select HOST_MESON
select LIBDRM
- select XORG_LIB_X11 if LIBVA_X11 || LIBVA_GLX
+ select XORG_LIB_X11 if LIBVA_X11
select XORG_LIB_XEXT if LIBVA_X11
select XORG_LIB_XFIXES if LIBVA_X11
- select MESALIB if LIBVA_GLX
- select MESALIB_GLX if LIBVA_GLX
- select MESALIB_OPENGL if LIBVA_GLX
select WAYLAND if LIBVA_WAYLAND
prompt "libva "
help
@@ -21,11 +18,6 @@ config LIBVA_X11
bool
prompt "X11 API support"
-config LIBVA_GLX
- bool
- select LIBVA_X11
- prompt "GLX API support"
-
config LIBVA_WAYLAND
bool
prompt "Wayland API support"
diff --git a/rules/libva.make b/rules/libva.make
index 3b91d7f25..4fb1873c3 100644
--- a/rules/libva.make
+++ b/rules/libva.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBVA) += libva
#
# Paths and names
#
-LIBVA_VERSION := 2.12.0
-LIBVA_MD5 := 602b7583ebab2a3ee7cfcd8f984b4a81
+LIBVA_VERSION := 2.14.0
+LIBVA_MD5 := f649ad25a82bdd0f23a4c89369afd94d
LIBVA := libva-$(LIBVA_VERSION)
LIBVA_SUFFIX := tar.bz2
LIBVA_URL := https://github.com/intel/libva/releases/download/$(LIBVA_VERSION)/$(LIBVA).$(LIBVA_SUFFIX)
@@ -31,7 +31,6 @@ LIBVA_LICENSE_FILES := \
LIBVA_ENABLE-y := drm
LIBVA_ENABLE-$(PTXCONF_LIBVA_X11) += x11
-LIBVA_ENABLE-$(PTXCONF_LIBVA_GLX) += glx
LIBVA_ENABLE-$(PTXCONF_LIBVA_WAYLAND) += wayland
LIBVA_CONF_TOOL := meson
@@ -41,7 +40,7 @@ LIBVA_CONF_OPT := \
-Ddriverdir='' \
-Denable_docs=false \
-Denable_va_messaging=true \
- -Dwith_glx=$(call ptx/yesno, PTXCONF_LIBVA_GLX) \
+ -Dwith_glx=no \
-Dwith_wayland=$(call ptx/yesno, PTXCONF_LIBVA_WAYLAND) \
-Dwith_x11=$(call ptx/yesno, PTXCONF_LIBVA_X11)
diff --git a/rules/libwpe.make b/rules/libwpe.make
index ef18468c4..ae77a739e 100644
--- a/rules/libwpe.make
+++ b/rules/libwpe.make
@@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_LIBWPE) += libwpe
#
# Paths and names
#
-LIBWPE_VERSION := 1.10.1
+LIBWPE_VERSION := 1.12.0
LIBWPE_LIBRARY_VERSION := 1.0
-LIBWPE_MD5 := f60fc13b519a66d262afb76c77441870
+LIBWPE_MD5 := 5a3f11789535d826370ba465ea141393
LIBWPE := libwpe-$(LIBWPE_VERSION)
LIBWPE_SUFFIX := tar.xz
LIBWPE_URL := https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX)
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
index 2a46ccd98..63ffd648a 100644
--- a/rules/libxkbcommon.make
+++ b/rules/libxkbcommon.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon
#
# Paths and names
#
-LIBXKBCOMMON_VERSION := 1.3.0
-LIBXKBCOMMON_MD5 := 00b5275ec1309a1d427a645de5861605
+LIBXKBCOMMON_VERSION := 1.4.0
+LIBXKBCOMMON_MD5 := e021899fe359240757684be08f22135f
LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION)
LIBXKBCOMMON_SUFFIX := tar.xz
LIBXKBCOMMON_URL := http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
@@ -47,7 +47,6 @@ LIBXKBCOMMON_CONF_OPT := \
-Dxkb-config-extra-path=/etc/xkb \
-Dxkb-config-root=$(XORG_DATADIR)/X11/xkb \
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
diff --git a/rules/libxml2.make b/rules/libxml2.make
index c87a088d0..d59d8f7dc 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.9.12
-LIBXML2_MD5 := f433a39be087a9f0b197eb2307ad9f75
+LIBXML2_VERSION := 2.9.14
+LIBXML2_MD5 := b7b3029ac6beb32a7925225515f83ca3
LIBXML2 := libxml2-$(LIBXML2_VERSION)
-LIBXML2_SUFFIX := tar.gz
+LIBXML2_SUFFIX := tar.xz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2)
LIBXML2_LICENSE := MIT AND ISC
@@ -29,10 +29,7 @@ LIBXML2_LICENSE_FILES := \
file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
LIBXML2_URL := \
- http://xmlsoft.org/sources/$(LIBXML2).$(LIBXML2_SUFFIX) \
- http://xmlsoft.org/sources/old/$(LIBXML2).$(LIBXML2_SUFFIX) \
- ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \
- ftp://xmlsoft.org/libxml2/old/$(LIBXML2).$(LIBXML2_SUFFIX)
+ https://download.gnome.org/sources/libxml2/$(basename $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX)
# ----------------------------------------------------------------------------
# Prepare
@@ -47,6 +44,7 @@ LIBXML2_ENV := $(CROSS_ENV)
LIBXML2_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--disable-static \
+ --disable-rebuild-docs \
$(GLOBAL_IPV6_OPTION) \
--oldincludedir=$(SYSROOT)/usr/include \
--$(call ptx/wwo, PTXCONF_LIBXML2_C14N)-c14n \
diff --git a/rules/libxslt.make b/rules/libxslt.make
index 7ef7d75b4..1ffe657a2 100644
--- a/rules/libxslt.make
+++ b/rules/libxslt.make
@@ -15,19 +15,19 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt
#
# Paths and names
#
-LIBXSLT_VERSION := 1.1.34
-LIBXSLT_MD5 := db8765c8d076f1b6caafd9f2542a304a
+LIBXSLT_VERSION := 1.1.35
+LIBXSLT_MD5 := 5b3a634b77effd8a6268c21173575053
LIBXSLT := libxslt-$(LIBXSLT_VERSION)
-LIBXSLT_SUFFIX := tar.gz
+LIBXSLT_SUFFIX := tar.xz
LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX)
LIBXSLT_DIR := $(BUILDDIR)/$(LIBXSLT)
LIBXSLT_LICENSE := MIT
+# The file 'COPYING' is just a symlink on the file 'Copyright'
+LIBXSLT_LICENSE_FILES := \
+ file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458
LIBXSLT_URL := \
- http://xmlsoft.org/sources/$(LIBXSLT).$(LIBXSLT_SUFFIX) \
- http://xmlsoft.org/sources/old/$(LIBXSLT).$(LIBXSLT_SUFFIX) \
- ftp://xmlsoft.org/libxslt/$(LIBXSLT).$(LIBXSLT_SUFFIX) \
- ftp://xmlsoft.org/libxslt/old/$(LIBXSLT).$(LIBXSLT_SUFFIX)
+ https://download.gnome.org/sources/libxslt/$(basename $(LIBXSLT_VERSION))/$(LIBXSLT).$(LIBXSLT_SUFFIX)
# ----------------------------------------------------------------------------
# Prepare
@@ -42,6 +42,7 @@ LIBXSLT_ENV := \
#
LIBXSLT_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
+ --disable-rebuild-docs \
--disable-static \
--without-python \
--$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 1f853c7fd..18827467f 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -15,7 +15,6 @@ menuconfig LIGHTTPD
select SQLITE if LIGHTTPD_WEBDAV_PROPS
select LIBUUID if LIGHTTPD_WEBDAV_LOCKS
select OPENSSL if LIGHTTPD_OPENSSL
- select LIBMEMCACHED if LIGHTTPD_MEMCACHED
select LUA if LIGHTTPD_LUA
select LUA_INSTALL_LIBLUA if LIGHTTPD_LUA
select BUSYBOX_START_STOP_DAEMON if LIGHTTPD_STARTSCRIPT
@@ -52,14 +51,6 @@ config LIGHTTPD_LUA
help
lua engine for mod_cml and mod_magnet
-config LIGHTTPD_MEMCACHED
- bool
- prompt "memcached storage"
- # fails to build with current libmemcached version
- depends on BROKEN
- help
- memcached storage for mod_trigger_b4_dl and mod_cml
-
config LIGHTTPD_OPENSSL
bool
prompt "openssl support"
@@ -72,6 +63,8 @@ config LIGHTTPD_PCRE
prompt "pcre support"
help
Enable pcre support.
+
+ WARNING: pcre is no longer maintained. Please move to pcre2 instead!
endmenu
@@ -104,13 +97,6 @@ config LIGHTTPD_MOD_AUTH
help
User authentication
-config LIGHTTPD_MOD_CML
- bool
- select LIGHTTPD_LUA
- prompt "mod_cml"
- help
- Cache Meta Language
-
config LIGHTTPD_MOD_DEFLATE
bool
prompt "mod_deflate"
@@ -167,16 +153,6 @@ config LIGHTTPD_MOD_REWRITE
help
Module for URL rewriting
-config LIGHTTPD_MOD_TRIGGER_B4_DL
- bool
- select LIGHTTPD_MEMCACHED
- select LIGHTTPD_PCRE
- # needs (currently broken) LIGHTTPD_MEMCACHED
- depends on BROKEN
- prompt "mod_trigger_b4_dl"
- help
- Module for Anti Hotlinking
-
config LIGHTTPD_MOD_WEBDAV
bool
prompt "mod_webdav"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 58a311404..98b80fea1 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
#
# Paths and names
#
-LIGHTTPD_VERSION := 1.4.63
-LIGHTTPD_MD5 := f4ad032b4b861f42a5df5f900ec6457b
+LIGHTTPD_VERSION := 1.4.64
+LIGHTTPD_MD5 := 02762422b074d0609db3d099d9d9e05c
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_SUFFIX := tar.xz
LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -26,7 +26,7 @@ LIGHTTPD_LICENSE := BSD-3-Clause AND OML AND RSA-MD
LIGHTTPD_LICENSE_FILES := \
file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 \
file://src/compat/fastcgi.h;startline=7;endline=15;md5=fe9ffe753772839aace9c90e814bc356 \
- file://src/algo_md5.c;startline=9;endline=29;md5=b5be3b6afd4afa7bb89b16361244f9b6
+ file://src/algo_md5.c;startline=12;endline=32;md5=b5be3b6afd4afa7bb89b16361244f9b6
# ----------------------------------------------------------------------------
# Prepare
@@ -57,8 +57,12 @@ LIGHTTPD_CONF_OPT := \
--without-krb5 \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
--without-wolfssl \
- --without-pcre2 \
+ --without-mbedtls \
+ --without-nettle \
+ --without-gnutls \
+ --without-nss \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
+ --without-pcre2 \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZSTD)-zstd \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
@@ -70,10 +74,7 @@ LIGHTTPD_CONF_OPT := \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \
--without-xxhash \
- --without-gdbm \
- --without-geoip \
--without-maxminddb \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHED)-memcached \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
# ----------------------------------------------------------------------------
@@ -96,13 +97,11 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG) += mod_accesslog
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS) += mod_alias
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_auth
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_authn_file
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_CML) += mod_cml
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE) += mod_deflate
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI) += mod_fastcgi
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET) += mod_magnet
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL) += mod_openssl
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE) += mod_rewrite
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_TRIGGER_B4_DL) += mod_trigger_b4_dl
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV) += mod_webdav
LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
diff --git a/rules/linux-firmware.in b/rules/linux-firmware.in
new file mode 100644
index 000000000..30dc3faf7
--- /dev/null
+++ b/rules/linux-firmware.in
@@ -0,0 +1,32 @@
+## SECTION=system_libraries
+
+menuconfig LINUX_FIRMWARE
+ tristate
+ prompt "linux-firmware "
+ help
+ Linux firmware is a collection of firmwares that are used for various hardware.
+
+if LINUX_FIRMWARE
+
+config LINUX_FIRMWARE_SELECTED_LICENSES
+ string
+ prompt "Linux-firmware license files to include"
+ help
+ Set the firmware license files use.
+ Since there is no strict match between firmware files
+ and license files, this must be provided by the user.
+ Multiple license files are separated by space.
+ For example "LICENSE.amd-ucode LICENSE.amdgpu"
+
+config LINUX_FIRMWARE_SELECTED_FIRMWARES
+ string
+ prompt "Linux-firmware files to copy to target"
+ help
+ Set the firmware files to copy, with globs.
+ Since the firmware files can be large, this makes
+ it possible to do a fine grained copy.
+ Multiple firmware files are separated by space.
+ Rembember that the glob MUST match the full path.
+ For example "*amd-ucode/* *amdgpu/*raven_* *amdgpu/*raven2*
+
+endif
diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make
new file mode 100644
index 000000000..1c9082c8b
--- /dev/null
+++ b/rules/linux-firmware.make
@@ -0,0 +1,144 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Christian Melki <christian.melki@t2data.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware
+
+#
+# Paths and names
+#
+LINUX_FIRMWARE_VERSION := 20220509
+LINUX_FIRMWARE_MD5 := ebf38affb619bc02dc64ebcba61a1ab9
+LINUX_FIRMWARE := linux-firmware-$(LINUX_FIRMWARE_VERSION)
+LINUX_FIRMWARE_SUFFIX := tar.gz
+LINUX_FIRMWARE_URL := $(call ptx/mirror, KERNEL, kernel/firmware/$(LINUX_FIRMWARE).$(LINUX_FIRMWARE_SUFFIX))
+LINUX_FIRMWARE_SOURCE := $(SRCDIR)/$(LINUX_FIRMWARE).$(LINUX_FIRMWARE_SUFFIX)
+LINUX_FIRMWARE_DIR := $(BUILDDIR)/$(LINUX_FIRMWARE)
+LINUX_FIRMWARE_DEVPKG := NO
+LINUX_FIRMWARE_LICENSE := proprietary
+
+# Order: find -type f \( -name "*LICENSE*" -o -name "*LICENCE*" \)
+LINUX_FIRMWARE_LICENSE_FILES := \
+ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
+ file://LICENCE.iwlwifi_firmware;md5=2ce6786e0fc11ac6e36b54bb9b799f1b \
+ file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \
+ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
+ file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \
+ file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \
+ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \
+ file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \
+ file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \
+ file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \
+ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \
+ file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \
+ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \
+ file://LICENSE.ice_enhanced;md5=f305cfc31b64f95f774f9edd9df0224d \
+ file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \
+ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \
+ file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \
+ file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \
+ file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \
+ file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \
+ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \
+ file://LICENSE.ipu3_firmware;md5=38fe8238c06bf7dcfd0eedbebf452c3b \
+ file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \
+ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \
+ file://LICENCE.cavium_liquidio;md5=ff2c835a7bb99e8e9048ab13b94e43eb \
+ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \
+ file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \
+ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \
+ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
+ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
+ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \
+ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \
+ file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \
+ file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \
+ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \
+ file://LICENSE.amd-sev;md5=e750538791a8be0b7249c579edefb035 \
+ file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \
+ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
+ file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \
+ file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \
+ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \
+ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \
+ file://LICENSE.QualcommAtheros_ath10k;md5=cb42b686ee5f5cb890275e4321db60a8 \
+ file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \
+ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \
+ file://LICENCE.microchip;md5=db753b00305675dfbf120e3f24a47277 \
+ file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \
+ file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0 \
+ file://LICENCE.wl1251;md5=ad3f81922bb9e197014bb187289d3b5b \
+ file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \
+ file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \
+ file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \
+ file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \
+ file://LICENCE.rockchip;md5=5fd70190c5ed39734baceada8ecced26 \
+ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
+ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \
+ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \
+ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \
+ file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \
+ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \
+ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \
+ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \
+ file://LICENCE.ca0132;md5=209b33e66ee5be0461f13d31da392198 \
+ file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
+ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
+ file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \
+ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \
+ file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \
+ file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \
+ file://wfx/LICENCE.wf200;md5=4d1beff00d902c05c9c7e95a5d8eb52d \
+ file://LICENSE.nxp_mc_firmware;md5=9dc97e4b279b3858cae8879ae2fe5dd7 \
+ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \
+ file://LICENCE.ti-tspa;md5=d1a0eb27d0020752040190b9d51ad9be
+
+
+LINUX_FIRMWARE_SELECTED_LICENSES := $(call remove_quotes, $(PTXCONF_LINUX_FIRMWARE_SELECTED_LICENSES))
+ifneq ($(LINUX_FIRMWARE_SELECTED_LICENSES),)
+LINUX_FIRMWARE_LICENSE_FILES := $(filter $(addsuffix %,$(addprefix file://,$(LINUX_FIRMWARE_SELECTED_LICENSES))),$(LINUX_FIRMWARE_LICENSE_FILES))
+endif
+
+LINUX_FIRMWARE_SELECTED_FIRMWARES = $(call remove_quotes, $(PTXCONF_LINUX_FIRMWARE_SELECTED_FIRMWARES))
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+LINUX_FIRMWARE_CONF_TOOL := NO
+
+$(STATEDIR)/linux-firmware.compile:
+ @$(call targetinfo)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/linux-firmware.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, linux-firmware)
+ @$(call install_fixup, linux-firmware,PRIORITY,optional)
+ @$(call install_fixup, linux-firmware,SECTION,base)
+ @$(call install_fixup, linux-firmware,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
+ @$(call install_fixup, linux-firmware,DESCRIPTION,missing)
+
+ifneq ($(LINUX_FIRMWARE_SELECTED_FIRMWARES),)
+ @$(foreach firmware, $(LINUX_FIRMWARE_SELECTED_FIRMWARES), \
+ $(call install_glob, linux-firmware, 0, 0, -, \
+ /lib/firmware, $(firmware),, n)$(ptx/nl))
+endif
+
+ @$(call install_finish, linux-firmware)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/lldpd.make b/rules/lldpd.make
index 58c91b29d..b6e321a7c 100644
--- a/rules/lldpd.make
+++ b/rules/lldpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd
#
# Paths and names
#
-LLDPD_VERSION := 1.0.12
-LLDPD_MD5 := 29955720e6252762b30957341d26613f
+LLDPD_VERSION := 1.0.13
+LLDPD_MD5 := 40fab1279e4203191dd32d2057f1c3fe
LLDPD := lldpd-$(LLDPD_VERSION)
LLDPD_SUFFIX := tar.gz
LLDPD_URL := http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX)
diff --git a/rules/lsh.in b/rules/lsh.in
index c744fa4bf..eb41e22c8 100644
--- a/rules/lsh.in
+++ b/rules/lsh.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
# lsh configuration
menuconfig LSH
@@ -10,6 +12,10 @@ menuconfig LSH
select ZLIB
help
lsh is an SSH implementation.
+
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain.
+
if LSH
config LSH_EXECUV
diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index 46d45fed3..ba7ff91fd 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_LUAEXPAT) += luaexpat
# Paths and names
#
LUAEXPAT_VERSION := 1.3.0
-LUAEXPAT_MD5 := 3c20b5795e7107f847f8da844fbfe2da
+LUAEXPAT_MD5 := 3c20b5795e7107f847f8da844fbfe2da 76ccc83114fc0c027f6cd45e0b4276d1
LUAEXPAT := luaexpat-$(LUAEXPAT_VERSION)
LUAEXPAT_SUFFIX := tar.gz
-LUAEXPAT_URL := http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
+LUAEXPAT_URL := https://github.com/lunarmodules/luaexpat/archive/refs/tags/$(LUAEXPAT_VERSION).$(LUAEXPAT_SUFFIX)
LUAEXPAT_SOURCE := $(SRCDIR)/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
LUAEXPAT_DIR := $(BUILDDIR)/$(LUAEXPAT)
LUAEXPAT_LICENSE := MIT
diff --git a/rules/madplay.make b/rules/madplay.make
index 512bec1da..6dcd01968 100644
--- a/rules/madplay.make
+++ b/rules/madplay.make
@@ -19,7 +19,7 @@ MADPLAY_VERSION := 0.15.2b
MADPLAY_MD5 := 6814b47ceaa99880c754c5195aa1aac1
MADPLAY := madplay-$(MADPLAY_VERSION)
MADPLAY_SUFFIX := tar.gz
-MADPLAY_URL := ftp://ftp.mars.org/pub/mpeg/$(MADPLAY).$(MADPLAY_SUFFIX)
+MADPLAY_URL := $(call ptx/mirror, SF, mad/madplay/$(MADPLAY_VERSION)/$(MADPLAY).$(MADPLAY_SUFFIX))
MADPLAY_SOURCE := $(SRCDIR)/$(MADPLAY).$(MADPLAY_SUFFIX)
MADPLAY_DIR := $(BUILDDIR)/$(MADPLAY)
diff --git a/rules/media-session.in b/rules/media-session.in
index 73fe521cc..c7670be58 100644
--- a/rules/media-session.in
+++ b/rules/media-session.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_libs
+## SECTION=multimedia_pipewire
menuconfig MEDIA_SESSION
tristate
diff --git a/rules/media-session.make b/rules/media-session.make
index cda641294..5a90bc273 100644
--- a/rules/media-session.make
+++ b/rules/media-session.make
@@ -78,13 +78,13 @@ ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER
/usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service)
endif
- @$(call install_copy, media-session, 0, 0, 644, -, \
+ @$(call install_alternative, media-session, 0, 0, 0644, \
/usr/share/pipewire/media-session.d/alsa-monitor.conf)
- @$(call install_copy, media-session, 0, 0, 644, -, \
+ @$(call install_alternative, media-session, 0, 0, 0644, \
/usr/share/pipewire/media-session.d/bluez-monitor.conf)
- @$(call install_copy, media-session, 0, 0, 644, -, \
+ @$(call install_alternative, media-session, 0, 0, 0644, \
/usr/share/pipewire/media-session.d/media-session.conf)
- @$(call install_copy, media-session, 0, 0, 644, -, \
+ @$(call install_alternative, media-session, 0, 0, 0644, \
/usr/share/pipewire/media-session.d/v4l2-monitor.conf)
@$(call install_finish, media-session)
diff --git a/rules/memtest86p.make b/rules/memtest86p.make
index 8a4ccde1a..3dc29d6a9 100644
--- a/rules/memtest86p.make
+++ b/rules/memtest86p.make
@@ -19,7 +19,7 @@ endif
MEMTEST86P_VERSION := 4.20
MEMTEST86P := memtest86+-$(MEMTEST86P_VERSION)
MEMTEST86P_SUFFIX := tar.gz
-MEMTEST86P_URL := http://www.memtest.org/download/$(MEMTEST86P_VERSION)/$(MEMTEST86P).$(MEMTEST86P_SUFFIX)
+MEMTEST86P_URL := http://www.memtest.org/download/archives/$(MEMTEST86P_VERSION)/$(MEMTEST86P).$(MEMTEST86P_SUFFIX)
MEMTEST86P_SOURCE := $(SRCDIR)/$(MEMTEST86P).$(MEMTEST86P_SUFFIX)
MEMTEST86P_DIR := $(BUILDDIR)/$(MEMTEST86P)
MEMTEST86P_LICENSE := GPL-2
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 6737828c7..1f505b9dc 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -12,14 +12,13 @@ menuconfig MESALIB
select GCCLIBS
select GCCLIBS_CXX
select LIBDRM
- select LIBDRM_INTEL if MESALIB_DRI_I915 || MESALIB_DRI_I965
+ select LIBVA if MESALIB_VA
select WAYLAND if MESALIB_EGL_WAYLAND
select WAYLAND_PROTOCOLS if MESALIB_EGL_WAYLAND
- select LIBDRM_RADEON if MESALIB_DRI_R200
select LIBDRM_RADEON if MESALIB_DRI_R300
select LIBDRM_RADEON if MESALIB_DRI_R600
select LIBDRM_RADEON if MESALIB_DRI_RADEONSI
- select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX
+ select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU
select VULKAN_LOADER if MESALIB_DRI_ZINK
select LM_SENSORS if MESALIB_LMSENSORS
select XORGPROTO if MESALIB_GLX
@@ -51,21 +50,6 @@ config MESALIB_DRI_SWRAST
bool
prompt "Software Rasterizer"
-config MESALIB_DRI_I915
- bool
- select MESALIB_OPENGL
- prompt "Intel i915"
-
-config MESALIB_DRI_I965
- bool
- select MESALIB_OPENGL
- prompt "Intel i965"
-
-config MESALIB_DRI_R200
- bool
- select MESALIB_OPENGL
- prompt "AMD R200"
-
config MESALIB_DRI_R300
bool
prompt "AMD R300"
@@ -80,11 +64,6 @@ config MESALIB_DRI_RADEONSI
depends on BROKEN
prompt "AMD RadeonSI"
-config MESALIB_DRI_NOUVEAU_VIEUX
- bool
- select MESALIB_OPENGL
- prompt "Nvidia <= GForce4"
-
config MESALIB_DRI_NOUVEAU
bool
prompt "Nvidia > GForce4"
@@ -172,6 +151,11 @@ config MESALIB_GBM
bool
prompt "GBM"
+config MESALIB_VA
+ bool
+ depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || MESALIB_DRI_NOUVEAU
+ prompt "VA"
+
comment "Platforms"
config MESALIB_EGL_X11
diff --git a/rules/mesalib.make b/rules/mesalib.make
index c0ba4539a..9d2337cff 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 21.3.4
-MESALIB_MD5 := ff03f3494b87186a15996bafe74ed929
+MESALIB_VERSION := 22.0.2
+MESALIB_MD5 := 964faf3c5d583afd5a47aff4015d32d8
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -24,21 +24,14 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESALIB_LICENSE := MIT
MESALIB_LICENSE_FILES := \
- file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f
+ file://docs/license.rst;md5=9a383ee9f65a4e939d6630e9b067ff58
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-ifdef PTXCONF_ARCH_X86
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I915) += i915
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965) += i965
-endif
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU_VIEUX)+= nouveau
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200) += r200
-
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VIRGL) += virgl
-ifndef PTXCONF_ARCH_ARM # broken: https://bugs.freedesktop.org/show_bug.cgi?id=72064
+ifndef PTXCONF_ARCH_ARM # broken: https://gitlab.freedesktop.org/mesa/mesa/-/issues/473
ifndef PTXCONF_ARCH_X86 # needs llvm
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300) += r300
endif
@@ -65,9 +58,6 @@ MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_CROCUS) += crocus
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SVGA) += svga
endif
-MESALIB_DRI_LIBS-y = \
- $(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y))
-
MESALIB_DRI_GALLIUM_LIBS-y = \
$(call ptx/ifdef, PTXCONF_MESALIB_DRI_KMSRO, \
armada-drm \
@@ -78,6 +68,8 @@ MESALIB_DRI_GALLIUM_LIBS-y = \
imx-dcss \
imx-drm \
ingenic-drm \
+ kirin \
+ komeda \
mali-dp \
mcde \
mediatek \
@@ -85,6 +77,7 @@ MESALIB_DRI_GALLIUM_LIBS-y = \
mi0283qt \
mxsfb-drm \
pl111 \
+ rcar-du \
repaper \
rockchip \
st7586 \
@@ -127,6 +120,14 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
+ifdef PTXCONF_MESALIB_VA
+ifndef PTXCONF_ARCH_ARM # broken: https://gitlab.freedesktop.org/mesa/mesa/-/issues/473
+MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_R600) += r600
+MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_RADEONSI) += radeonsi
+endif
+MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_NOUVEAU) += nouveau
+endif
+
MESALIB_CONF_TOOL := meson
MESALIB_CONF_OPT := \
$(CROSS_MESON_USR) \
@@ -137,7 +138,7 @@ MESALIB_CONF_OPT := \
-Dd3d-drivers-path=/usr/lib/d3d \
-Ddatasources=auto \
-Ddraw-use-llvm=true \
- -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
+ -Ddri-drivers=[] \
-Ddri-drivers-path=/usr/lib/dri \
-Ddri-search-path=/usr/lib/dri \
-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
@@ -152,7 +153,7 @@ MESALIB_CONF_OPT := \
-Dgallium-nine=false \
-Dgallium-omx=disabled \
-Dgallium-opencl=disabled \
- -Dgallium-va=disabled \
+ -Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \
-Dgallium-vdpau=disabled \
-Dgallium-xa=disabled \
-Dgallium-xvmc=disabled \
@@ -182,24 +183,21 @@ MESALIB_CONF_OPT := \
-Dplatform-sdk-version=25 \
-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
-Dpower8=disabled \
- -Dprefer-crocus=false \
- -Dprefer-iris=true \
-Dselinux=false \
-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d \
-Dshader-cache-default=true \
-Dshader-cache-max-size=1G \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
- -Dshared-swr=true \
-Dspirv-to-dxil=false \
-Dsse2=true \
-Dstatic-libclc=[] \
- -Dswr-arches=[] \
-Dtools=[] \
-Dva-libs-path=/usr/lib/dri \
-Dvalgrind=disabled \
-Dvdpau-libs-path=/usr/lib/vdpau \
-Dvmware-mks-stats=false \
+ -Dvulkan-beta=false \
-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
-Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
@@ -238,10 +236,6 @@ $(STATEDIR)/mesalib.targetinstall:
@$(call install_fixup, mesalib,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, mesalib,DESCRIPTION,missing)
- @$(foreach lib, $(MESALIB_DRI_LIBS-y), \
- $(call install_copy, mesalib, 0, 0, 0644, -, \
- /usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
-
ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
@$(call install_copy, mesalib, 0, 0, 0644, \
$(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
@@ -253,6 +247,17 @@ ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
$(call install_link, mesalib, gallium_dri.so, \
/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
endif
+ifneq ($(strip $(MESALIB_DRI_VA_LIBS-y)),)
+ @$(call install_copy, mesalib, 0, 0, 0644, \
+ $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_VA_LIBS-y))_drv_video.so, \
+ /usr/lib/dri/va_dri.so)
+
+ @$(foreach lib, $(MESALIB_DRI_VA_LIBS-y), \
+ test -f $(MESALIB_PKGDIR)/usr/lib/dri/$(lib)_drv_video.so || \
+ ptxd_bailout "missing va driver $(lib)_drv_video.so"$(ptx/nl) \
+ $(call install_link, mesalib, va_dri.so, \
+ /usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl))
+endif
ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),)
@$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \
diff --git a/rules/microcom.make b/rules/microcom.make
index d8ff76bb8..93dbe59d5 100644
--- a/rules/microcom.make
+++ b/rules/microcom.make
@@ -21,7 +21,7 @@ MICROCOM_SUFFIX := tar.xz
MICROCOM_URL := https://github.com/pengutronix/microcom/releases/download/v$(MICROCOM_VERSION)/microcom-$(MICROCOM_VERSION).$(MICROCOM_SUFFIX)
MICROCOM_SOURCE := $(SRCDIR)/$(MICROCOM).$(MICROCOM_SUFFIX)
MICROCOM_DIR := $(BUILDDIR)/$(MICROCOM)
-MICROCOM_LICENSE := GPL-2.0-only
+MICROCOM_LICENSE := GPL-2.0-or-later
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mosquitto.make b/rules/mosquitto.make
index 125b96cd4..eedb5ca58 100644
--- a/rules/mosquitto.make
+++ b/rules/mosquitto.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto
#
# Paths and names
#
-MOSQUITTO_VERSION := 2.0.5
-MOSQUITTO_MD5 := 8e70da210301d2f60627170a1064f8f3
+MOSQUITTO_VERSION := 2.0.14
+MOSQUITTO_MD5 := abe42d8cdb4ec973bdbecc6da29cb98f
MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION)
MOSQUITTO_SUFFIX := tar.gz
MOSQUITTO_URL := https://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX)
@@ -25,8 +25,8 @@ MOSQUITTO_DIR := $(BUILDDIR)/$(MOSQUITTO)
MOSQUITTO_LICENSE := EPL-2.0 OR BSD-3-Clause
MOSQUITTO_LICENSE_FILES := \
file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \
- file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
- file://edl-v10;md5=c09f121939f063aeb5235972be8c722c
+ file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \
+ file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/mtr.in b/rules/mtr.in
index e49372fff..ced0808fa 100644
--- a/rules/mtr.in
+++ b/rules/mtr.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
config MTR
tristate
@@ -19,3 +21,7 @@ config MTR
ECHO requests to each one to determine the quality of the
link to each machine. As it does this, it prints running
statistics about each machine.
+
+ STAGING: remove in PTXdist 2023.04.0
+ Not realy maintained in PTXdist and fails to build with a current
+ toolchain (gcc 11).
diff --git a/rules/nanocom.in b/rules/nanocom.in
index 7a1d7b7b6..5bd837e65 100644
--- a/rules/nanocom.in
+++ b/rules/nanocom.in
@@ -1,6 +1,11 @@
-## SECTION=shell_and_console
+## SECTION=staging
+## old section:
+### SECTION=shell_and_console
config NANOCOM
tristate
prompt "nanocom"
help
This is a lightweight terminal emulator.
+
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain (gcc 11).
diff --git a/rules/ncftp.in b/rules/ncftp.in
index e7bd49e23..db9baf30f 100644
--- a/rules/ncftp.in
+++ b/rules/ncftp.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
menuconfig NCFTP
tristate
@@ -12,6 +14,9 @@ menuconfig NCFTP
not found in the standard interface, ftp. This version has
Readline support enabled.
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain (gcc 11).
+
if NCFTP
config NCFTP_NCTP
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 38f9c01ff..688160325 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
#
# Paths and names
#
-NCURSES_VERSION := 6.2
+NCURSES_VERSION := 6.3
NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5 := e812da327b1c2214ac1aed440ea3ae8d
+NCURSES_MD5 := a2736befde5fee7d2b7eb45eb281cdbe
NCURSES := ncurses-$(NCURSES_VERSION)
NCURSES_SUFFIX := tar.gz
NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
NCURSES_DIR := $(BUILDDIR)/$(NCURSES)
NCURSES_LICENSE := MIT
-NCURSES_LICENSE_FILES := file://COPYING;md5=910e05334f7e0b7631da6b4ebb1e1aab
+NCURSES_LICENSE_FILES := file://COPYING;md5=f852913c5d988a5f5a2f1df7ba7ee893
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/neatvnc.in b/rules/neatvnc.in
new file mode 100644
index 000000000..9871a645d
--- /dev/null
+++ b/rules/neatvnc.in
@@ -0,0 +1,22 @@
+## SECTION=system_libraries
+
+menuconfig NEATVNC
+ tristate
+ select HOST_MESON
+ select PIXMAN
+ select ZLIB
+ select AML
+ select LIBJPEG if NEATVNC_JPEG
+ select LIBJPEG_TURBO if NEATVNC_JPEG
+ select LIBDRM if BUILDTIME
+ prompt "neatvnc"
+ help
+ VNC Server library
+
+if NEATVNC
+
+config NEATVNC_JPEG
+ bool
+ prompt "enable jpeg compression"
+
+endif
diff --git a/rules/neatvnc.make b/rules/neatvnc.make
new file mode 100644
index 000000000..e5bb4c96e
--- /dev/null
+++ b/rules/neatvnc.make
@@ -0,0 +1,61 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Marian Cichy <m.cichy@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NEATVNC) += neatvnc
+
+#
+# Paths and names
+#
+NEATVNC_VERSION := 0.4.0
+NEATVNC_MD5 := c645abf2233a3a3ad294ca1ef9399d23
+NEATVNC := neatvnc-$(NEATVNC_VERSION)
+NEATVNC_SUFFIX := tar.gz
+NEATVNC_URL := https://github.com/any1/neatvnc/archive/refs/tags/v$(NEATVNC_VERSION).$(NEATVNC_SUFFIX)
+NEATVNC_SOURCE := $(SRCDIR)/$(NEATVNC).$(NEATVNC_SUFFIX)
+NEATVNC_DIR := $(BUILDDIR)/$(NEATVNC)
+NEATVNC_LICENSE := ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# meson
+#
+NEATVNC_CONF_TOOL := meson
+NEATVNC_CONF_OPT := \
+ $(CROSS_MESON_USR) \
+ -Dbenchmarks=false \
+ -Dexamples=false \
+ -Djpeg=$(call ptx/endis,PTXCONF_NEATVNC_JPEG)d \
+ -Dtls=disabled \
+ -Dsystemtap=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/neatvnc.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, neatvnc)
+ @$(call install_fixup, neatvnc,PRIORITY,optional)
+ @$(call install_fixup, neatvnc,SECTION,base)
+ @$(call install_fixup, neatvnc,AUTHOR,"Marian Cichy <m.cichy@pengutronix.de>")
+ @$(call install_fixup, neatvnc,DESCRIPTION,missing)
+
+ @$(call install_lib, neatvnc, 0, 0, 0644, libneatvnc)
+
+ @$(call install_finish, neatvnc)
+
+ @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/nftables.make b/rules/nftables.make
index 542071d2c..aaf170e37 100644
--- a/rules/nftables.make
+++ b/rules/nftables.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NFTABLES) += nftables
#
# Paths and names
#
-NFTABLES_VERSION := 0.8.3
-NFTABLES_MD5 := a604501c10a302fa417410b16f293d2c
+NFTABLES_VERSION := 1.0.1
+NFTABLES_MD5 := e3cf7011ee1e8e123c962446262de7cc
NFTABLES := nftables-$(NFTABLES_VERSION)
NFTABLES_SUFFIX := tar.bz2
NFTABLES_URL := http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
@@ -36,10 +36,11 @@ NFTABLES_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug \
--disable-man-doc \
- --disable-pdf-doc \
+ --disable-python \
--$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp \
--without-cli \
- --without-xtables
+ --without-xtables \
+ --without-json
# ----------------------------------------------------------------------------
# Target-Install
@@ -56,6 +57,7 @@ $(STATEDIR)/nftables.targetinstall:
@$(call install_copy, nftables, 0, 0, 0755, -, /usr/sbin/nft)
@$(call install_alternative, nftables, 0, 0, 0755, /etc/nftables.conf)
+ @$(call install_lib, nftables, 0, 0, 0644, libnftables)
ifdef PTXCONF_NFTABLES_STARTSCRIPT
@$(call install_alternative, nftables, 0, 0, 0755, /etc/init.d/nftables)
diff --git a/rules/npth.make b/rules/npth.make
index 68ec2694a..665668fd5 100644
--- a/rules/npth.make
+++ b/rules/npth.make
@@ -18,7 +18,9 @@ NPTH_VERSION := 1.5
NPTH_MD5 := 9ba2dc4302d2f32c66737c43ed191b1b
NPTH := npth-$(NPTH_VERSION)
NPTH_SUFFIX := tar.bz2
-NPTH_URL := ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
+NPTH_URL := \
+ https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) \
+ ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX)
NPTH_SOURCE := $(SRCDIR)/$(NPTH).$(NPTH_SUFFIX)
NPTH_DIR := $(BUILDDIR)/$(NPTH)
NPTH_LICENSE := LGPL-2.1-only
diff --git a/rules/nss.make b/rules/nss.make
index 99be3e20b..f9fe3dd72 100644
--- a/rules/nss.make
+++ b/rules/nss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
#
# Paths and names
#
-NSS_VERSION := 3.73
-NSS_MD5 := b4540bf98f6583b3fcf8101f846cf3bb
+NSS_VERSION := 3.75
+NSS_MD5 := 1a6ecb5ed5eb00c3c50eda15116b45fb
NSS := nss-$(NSS_VERSION)
NSS_SUFFIX := tar.gz
NSS_URL := https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(subst .,_,$(NSS_VERSION))_RTM/src/$(NSS).$(NSS_SUFFIX)
diff --git a/rules/ntp.make b/rules/ntp.make
index 168cfc2c4..9bbf9ef49 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp
#
# Paths and names
#
-NTP_VERSION := 4.2.8p12
-NTP_MD5 := 1522d66574bae14abb2622746dad2bdc
+NTP_VERSION := 4.2.8p15
+NTP_MD5 := e1e6b23d2fc75cced41801dbcd6c2561
NTP := ntp-$(NTP_VERSION)
NTP_SUFFIX := tar.gz
NTP_URL := http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
NTP_DIR := $(BUILDDIR)/$(NTP)
NTP_LICENSE := ntp
-NTP_LICENSE_FILES := file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003
+NTP_LICENSE_FILES := file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/opencv.make b/rules/opencv.make
index e0ab3143d..476f6007a 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -218,7 +218,7 @@ OPENCV_CONF_OPT := \
\
-DCMAKE_SKIP_RPATH=ON \
-DBUILD_opencv_python2=OFF \
- -DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR)m \
+ -DPYTHON_INCLUDE_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/include/python$(PYTHON3_MAJORMINOR) \
-DPYTHON_LIBRARY=$(PTXDIST_SYSROOT_TARGET)/bin/python$(PYTHON3_MAJORMINOR) \
-DOPENCV_PYTHON3_INSTALL_PATH=$(PYTHON3_SITEPACKAGES) \
-DOPENCV_SKIP_PYTHON_LOADER=ON
diff --git a/rules/opennhrp.in b/rules/opennhrp.in
index 6554e9dd8..997642616 100644
--- a/rules/opennhrp.in
+++ b/rules/opennhrp.in
@@ -1,4 +1,6 @@
-## SECTION=networking
+## SECTION=staging
+## old section:
+### SECTION=networking
config OPENNHRP
tristate
@@ -7,3 +9,6 @@ config OPENNHRP
help
OpenNHRP implements NBMA Next Hop Resolution Protocol
(as defined in RFC 2332)
+
+ STAGING: remove in PTXdist 2023.04.0
+ Upstream is dead and fails to build with a current toolchain (gcc 11).
diff --git a/rules/openssh.make b/rules/openssh.make
index c801d8a6a..8fa890218 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
#
# Paths and names
#
-OPENSSH_VERSION := 8.8p1
-OPENSSH_MD5 := 8ce5f390958baeeab635aafd0ef41453
+OPENSSH_VERSION := 9.0p1
+OPENSSH_MD5 := 5ed8252a0ee379c0f7c9e0d25d32424d
OPENSSH := openssh-$(OPENSSH_VERSION)
OPENSSH_SUFFIX := tar.gz
OPENSSH_URL := \
@@ -25,8 +25,8 @@ OPENSSH_URL := \
OPENSSH_SOURCE := $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX)
OPENSSH_DIR := $(BUILDDIR)/$(OPENSSH)
-OPENSSH_LICENSE := BSD AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT AND Beerware AND ISC
-OPENSSH_LICENSE_FILES := file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11
+OPENSSH_LICENSE := BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Beerware AND ISC
+OPENSSH_LICENSE_FILES := file://LICENCE;md5=8baf365614c9bdd63705f298c9afbfb9
# ----------------------------------------------------------------------------
# Prepare
@@ -35,12 +35,11 @@ OPENSSH_LICENSE_FILES := file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11
OPENSSH_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_search_SHA256Update=no \
- select_works_with_rlimit=yes \
LD=$(COMPILER_PREFIX)gcc
OPENSSH_SANDBOX-y := seccomp_filter
# seccomp_filter sandbox is not supported for ppc
-OPENSSH_SANDBOX-$(PTXCONF_ARCH_PPC) := rlimit
+OPENSSH_SANDBOX-$(PTXCONF_ARCH_PPC) := no
#
# autoconf
@@ -78,8 +77,7 @@ OPENSSH_CONF_OPT := \
--with-privsep-user=sshd \
--with-sandbox=$(OPENSSH_SANDBOX-y) \
--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \
- --with-privsep-path=/var/run/sshd \
- --without-md5-passwords
+ --with-privsep-path=/var/run/sshd
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/openssl.make b/rules/openssl.make
index 5e7b3a128..bdf5dbca5 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
# Paths and names
#
OPENSSL_BASE := 1.1.1
-OPENSSL_BUGFIX := l
+OPENSSL_BUGFIX := o
OPENSSL_VERSION := $(OPENSSL_BASE)$(OPENSSL_BUGFIX)
-OPENSSL_MD5 := ac0d4387f3ba0ad741b0580dd45f6ff3
+OPENSSL_MD5 := d05e96e200d2ff0aef20c114cb5f17bf
OPENSSL := openssl-$(OPENSSL_VERSION)
OPENSSL_SUFFIX := tar.gz
OPENSSL_URL := \
diff --git a/rules/optee-client.make b/rules/optee-client.make
index 7fbebf1f1..b1fa42920 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
#
# Paths and names
#
-OPTEE_CLIENT_VERSION := 3.5.0
-OPTEE_CLIENT_MD5 := 2738729cb2457f2b4993ef6b91a6519d
+OPTEE_CLIENT_VERSION := 3.16.0
+OPTEE_CLIENT_MD5 := d5fe83f6e7429ecc6961fbdaab1b6008
OPTEE_CLIENT := optee-client-$(OPTEE_CLIENT_VERSION)
OPTEE_CLIENT_SUFFIX := tar.gz
OPTEE_CLIENT_URL := https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
@@ -32,7 +32,8 @@ OPTEE_CLIENT_MAKE_ENV := \
$(CROSS_ENV) \
LIBDIR=/usr/lib \
INCLUDEDIR=/usr/include \
- CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/
+ CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ \
+ CFG_TEE_SUPP_PLUGINS=n
# ----------------------------------------------------------------------------
# Target-Install