[ptxdist] [PATCH] ethtool: Version bump. 6.7 -> 6.9
Skipping version 6.8. Was never released. Minor fixes in 6.9 https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/log/?h=v6.9 Signed-off-by: Christian Melki --- rules/ethtool.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/ethtool.make b/rules/ethtool.make index 66ca739e9..7ef800cdd 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool # # Paths and names # -ETHTOOL_VERSION:= 6.7 -ETHTOOL_MD5:= 0caa1bbe49fc75975362a2b66284a8d2 +ETHTOOL_VERSION:= 6.9 +ETHTOOL_MD5:= e9da47ff5ff4b67475a4de03b473fdec ETHTOOL_SUFFIX := tar.xz ETHTOOL:= ethtool-$(ETHTOOL_VERSION) ETHTOOL_URL:= $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] e2fsprogs: Version bump. 1.47.0 -> 1.47.1
Bunch of fixes mostly. Post 2038 for 64-bit time_t. https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.1 * Disable libarchive. Could have been used to stream tar directly as input to mke2fs. * Forward patches. Applies cleanly. Signed-off-by: Christian Melki --- .../0001-e2fsprogs-Disable-docs.patch | 0 .../0002-e2fsprogs-Disable-ldconfig.patch | 0 ...mke2fs.conf-remove-orphan_file-from-ext4-features.patch | 0 patches/{e2fsprogs-1.47.0 => e2fsprogs-1.47.1}/series | 0 rules/e2fsprogs.make | 7 --- 5 files changed, 4 insertions(+), 3 deletions(-) rename patches/{e2fsprogs-1.47.0 => e2fsprogs-1.47.1}/0001-e2fsprogs-Disable-docs.patch (100%) rename patches/{e2fsprogs-1.47.0 => e2fsprogs-1.47.1}/0002-e2fsprogs-Disable-ldconfig.patch (100%) rename patches/{e2fsprogs-1.47.0 => e2fsprogs-1.47.1}/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch (100%) rename patches/{e2fsprogs-1.47.0 => e2fsprogs-1.47.1}/series (100%) diff --git a/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch b/patches/e2fsprogs-1.47.1/0001-e2fsprogs-Disable-docs.patch similarity index 100% rename from patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch rename to patches/e2fsprogs-1.47.1/0001-e2fsprogs-Disable-docs.patch diff --git a/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch b/patches/e2fsprogs-1.47.1/0002-e2fsprogs-Disable-ldconfig.patch similarity index 100% rename from patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch rename to patches/e2fsprogs-1.47.1/0002-e2fsprogs-Disable-ldconfig.patch diff --git a/patches/e2fsprogs-1.47.0/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch b/patches/e2fsprogs-1.47.1/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch similarity index 100% rename from patches/e2fsprogs-1.47.0/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch rename to patches/e2fsprogs-1.47.1/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch diff --git a/patches/e2fsprogs-1.47.0/series b/patches/e2fsprogs-1.47.1/series similarity index 100% rename from patches/e2fsprogs-1.47.0/series rename to patches/e2fsprogs-1.47.1/series diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 87f1004f3..f5cc651b1 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.47.0 -E2FSPROGS_MD5 := 6b4f18a33873623041857b4963641ee9 +E2FSPROGS_VERSION := 1.47.1 +E2FSPROGS_MD5 := 75e6d1353cbe6d5728a98fb0267206cb E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) @@ -75,7 +75,8 @@ E2FSPROGS_CONF_OPT:= \ --disable-addrsan \ --disable-threadsan \ --disable-fuzzing \ - --with-pthread + --with-pthread \ + --without-libarchive E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1) E2FSPROGS_INSTALL_OPT := install install-libs -- 2.34.1
[ptxdist] [PATCH] ntp: Version bump. 4.2.8p17 -> 4.2.8p18
Mostly bugfixes. https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p18 * Remove obsoleted options. * Correct a pthread build detection issue with gcc-14. Assume existing func. Unfortunately, a patch didn't make it into p18. Probably nobody bothered with the new compiler before releasing p18. Signed-off-by: Christian Melki --- rules/ntp.make | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rules/ntp.make b/rules/ntp.make index b813df9db..ce5351186 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NTP) += ntp # # Paths and names # -NTP_VERSION:= 4.2.8p17 -NTP_MD5:= a15558df580bd1b955a105a8b91c078f +NTP_VERSION:= 4.2.8p18 +NTP_MD5:= 516bdabd94ab7c824e9771390761a46c 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) @@ -32,6 +32,7 @@ NTP_LICENSE_FILES := file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec NTP_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_search_MD5Init=no \ + ol_cv_func_pthread_detach=yes \ libopts_cv_test_dev_zero=yes \ ntp_cv_vsnprintf_percent_m=yes @@ -60,7 +61,6 @@ NTP_CONF_OPT := \ --enable-linuxcaps \ --disable-solarisprivs \ --disable-trustedbsd-mac \ - --without-arlib \ --without-net-snmp-config \ --disable-libseccomp \ --disable-debug-timing \ @@ -121,7 +121,6 @@ NTP_CONF_OPT:= \ --$(call ptx/endis, PTXCONF_NTP_VARITEXT)-VARITEXT \ --$(call ptx/endis, PTXCONF_NTP_SEL240X)-SEL240X \ --$(call ptx/wwo, PTXCONF_NTP_CRYPTO)-crypto \ - --without-rpath \ --$(call ptx/endis, PTXCONF_NTP_CRYPTO)-openssl-random \ --$(call ptx/endis, PTXCONF_NTP_CRYPTO)-autokey \ --disable-kmem \ -- 2.34.1
[ptxdist] [PATCH 2/2] tpm2-tss: Version bump. 4.1.1 -> 4.1.3
Minor fixes. https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.2 https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.3 Signed-off-by: Christian Melki --- rules/tpm2-tss.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make index 783dd07f4..f48a3e07a 100644 --- a/rules/tpm2-tss.make +++ b/rules/tpm2-tss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss # # Paths and names # -TPM2_TSS_VERSION := 4.1.1 -TPM2_TSS_MD5 := d50302e29150823254b9f1594add6dcd +TPM2_TSS_VERSION := 4.1.3 +TPM2_TSS_MD5 := 018e7f53a7c2d6385c7a76cf7699019c TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) TPM2_TSS_SUFFIX:= tar.gz TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX) -- 2.34.1
Re: [ptxdist] year 2038 Toolchain
Hello Erwin. On 5/27/24 10:32 AM, Erwin Rol wrote: [You don't often get email from mailingli...@erwinrol.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] On 5/24/24 12:19, Michael Olbrich wrote: On Fri, May 24, 2024 at 11:04:24AM +0200, Erwin Rol wrote: On 5/24/24 10:41, Ian Abbott wrote: If I figure it out I'll let you guys know (so it can be added to the official Toolchain) Rememember to define _FILE_OFFSET_BITS=64 too if it is not already defined. _TIME_BITS=64 is ineffective when _FILE_OFFSET_BITS=32 for Glibc policy reasons. I tried some things to convince the Toolchain project (latest gcc13 release) to use those two defines, but without much luck. Sometimes parts complained that there were duplicate declarations of (time) functions, with some other tries it actually complained the the _FILE_OFFSET_BITS was missing for some part, that I really don't understand because I added them always in pairs. So I believe it is just a bit too early for 100% year 2038 compliance at the moment. Especially when it comes to C++/libstd++ there is also not much info online. But the C part seems to work with the support ptxdist offers, and C++ has always been some unwanted stepchild, especially now Rust is going to safe the world :-) So gcc-14 has a --enable-year2038 configure option, but I didn't test if it works. Any ETA for a gcc14 ptxdist Toolchain ? You can always roll your own toolchain? Esp. If you need to test things. ct-ng toolchains work pretty much as is. Atleast that's what I always do. But I don't know if that causes any API or ABI incompatibilities. The changelog says "Disable year2038 by default on 32-bit hosts.". That looks a bit suspicious to me. Maybe make 2 specific 32bit toolchains, one with TIME_BITS=32 and one with TIME_BITS=64? So ppl (like me) can start testing the TIME_BITS=64 version, and ppl that know for sure they do not care about y2038 can keep using the TIME_BITS=32 version ? - Erwin Regards, Christian
[ptxdist] [PATCH 1/2] libcurl: Version bump. 8.7.1 -> 8.8.0
Mostly a bunch of fixes. https://curl.se/changes.html#8_8_0 * Fix configure for dropped ntlm-wb option. Signed-off-by: Christian Melki --- rules/libcurl.make | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/libcurl.make b/rules/libcurl.make index 455695e25..65c9714b2 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION:= 8.7.1 -LIBCURL_MD5:= f4f37253c5f1ad9ee85fa6215fdfeb42 +LIBCURL_VERSION:= 8.8.0 +LIBCURL_MD5:= e1062de8a9b252a75fc42e2252746bd8 LIBCURL:= curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz LIBCURL_URL:= https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) @@ -80,7 +80,6 @@ LIBCURL_CONF_OPT := \ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-negotiate-auth \ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-aws \ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-ntlm \ - --disable-ntlm-wb \ --enable-tls-srp \ --enable-unix-sockets \ --$(call ptx/endis, PTXCONF_LIBCURL_COOKIES)-cookies \ -- 2.34.1
[ptxdist] [PATCH 2/2] host-libcurl: Follow target libcurl, remove ntlm-wb.
Signed-off-by: Christian Melki --- rules/host-libcurl.make | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make index e223573ea..b38667eff 100644 --- a/rules/host-libcurl.make +++ b/rules/host-libcurl.make @@ -65,7 +65,6 @@ HOST_LIBCURL_CONF_OPT := \ --disable-negotiate-auth \ --disable-aws \ --disable-ntlm \ - --disable-ntlm-wb \ --disable-tls-srp \ --enable-unix-sockets \ --disable-cookies \ -- 2.34.1
[ptxdist] [PATCH] libcap: Version bump. 2.69 -> 2.70.
Minor changes. https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.hde102t8xd0v Signed-off-by: Christian Melki --- rules/libcap.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libcap.make b/rules/libcap.make index 548a321ec..eb2b0d1b8 100644 --- a/rules/libcap.make +++ b/rules/libcap.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap # # Paths and names # -LIBCAP_VERSION := 2.69 -LIBCAP_MD5 := 4667bacb837f9ac4adb4a1a0266f4b65 +LIBCAP_VERSION := 2.70 +LIBCAP_MD5 := df0e20c6eeca849347b87d5d6a8870c0 LIBCAP := libcap-$(LIBCAP_VERSION) LIBCAP_SUFFIX := tar.xz LIBCAP_URL := \ -- 2.34.1
[ptxdist] [PATCH] iw: Version bump. 6.7 -> 6.9
Minor changes. 6.8 was never released. https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/log/?h=v6.9 Signed-off-by: Christian Melki --- rules/iw.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/iw.make b/rules/iw.make index 632e31abe..f3e0e20da 100644 --- a/rules/iw.make +++ b/rules/iw.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_IW) += iw # # Paths and names # -IW_VERSION := 6.7 -IW_MD5 := a63e81b0dcae9caf9ed3a20f2c445a07 +IW_VERSION := 6.9 +IW_MD5 := 457c99badf2913bb61a8407ae60e4819 IW := iw-$(IW_VERSION) IW_SUFFIX := tar.xz IW_URL := https://www.kernel.org/pub/software/network/iw/$(IW).$(IW_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] wayland-protocols: Version bump. 1.35 -> 1.36
Minor bugfix. https://lists.freedesktop.org/archives/wayland-devel/2024-April/043572.html Signed-off-by: Christian Melki --- rules/wayland-protocols.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make index 066e9b000..8dad5d220 100644 --- a/rules/wayland-protocols.make +++ b/rules/wayland-protocols.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols # # Paths and names # -WAYLAND_PROTOCOLS_VERSION := 1.35 -WAYLAND_PROTOCOLS_MD5 := cd0f2a1ab6e54568e4f856f140dedca9 +WAYLAND_PROTOCOLS_VERSION := 1.36 +WAYLAND_PROTOCOLS_MD5 := d733380202a75ca837744e65b4dbadc5 WAYLAND_PROTOCOLS := wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION) WAYLAND_PROTOCOLS_SUFFIX := tar.xz WAYLAND_PROTOCOLS_URL := https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] linux-firmware: Version bump. 20240410 -> 20240513
Usual updates. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240513 * AMDGPU license changed copyright year. Signed-off-by: Christian Melki --- rules/linux-firmware.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make index f12901f02..ac1a3967f 100644 --- a/rules/linux-firmware.make +++ b/rules/linux-firmware.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware # # Paths and names # -LINUX_FIRMWARE_VERSION := 20240410 -LINUX_FIRMWARE_MD5 := 62c5622044539ca0a431a19d7c57bc02 +LINUX_FIRMWARE_VERSION := 20240513 +LINUX_FIRMWARE_MD5 := 3c54e7d6d2d39e68870875b93aeb654c 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)) @@ -67,7 +67,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ 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=a2589a05ea5b6bd2b7f4f623c7e7a649 \ + file://LICENSE.amdgpu;md5=1433dfea38c97a2e563a248a863dcb94 \ file://LICENSE.nxp;md5=cca321ca1524d6a1e4fed87486cd82dc \ file://LICENSE.airoha;md5=fa3dedb960e2673aea51aa509f7b537d \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ -- 2.34.1
[ptxdist] [PATCH] strace: Version bump. 6.8 -> 6.9
Minor changes. https://github.com/strace/strace/releases/tag/v6.9 Signed-off-by: Christian Melki --- rules/strace.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/strace.make b/rules/strace.make index 697b1495a..bc39aca88 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace # # Paths and names # -STRACE_VERSION := 6.8 -STRACE_MD5 := 1c7aca3fad1f309fdb54031866fad6d9 +STRACE_VERSION := 6.9 +STRACE_MD5 := 395900d4de0b6b8c4707045a9782134c STRACE := strace-$(STRACE_VERSION) STRACE_SUFFIX := tar.xz STRACE_URL := https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] iproute2: Version bump. 6.8.0 -> 6.9.0
Minor changes. https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/?h=v6.9.0 Signed-off-by: Christian Melki --- rules/iproute2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/iproute2.make b/rules/iproute2.make index 79aa02f1d..315910698 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 6.8.0 -IPROUTE2_MD5 := 9d6ea453986900d98e3b6bcb868815cd +IPROUTE2_VERSION := 6.9.0 +IPROUTE2_MD5 := 0ca5c21a5a42157fbb88b39791963364 IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX:= tar.xz IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] glib: Version bump. 2.80.0 -> 2.80.2
Bugfix releases. https://gitlab.gnome.org/GNOME/glib/-/releases/2.80.1 https://gitlab.gnome.org/GNOME/glib/-/releases/2.80.2 Plugs CVE: CVE-2024-34397 - GDBus signal subscriptions for well-known names are vulnerable to unicast spoofing * Rearrange config option for option inspection. Signed-off-by: Christian Melki --- rules/glib.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/glib.make b/rules/glib.make index 2acc9539b..daf8d0bab 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -GLIB_VERSION := 2.80.0 -GLIB_MD5 := 3a51e2803ecd22c2dadcd07d9475ebe3 +GLIB_VERSION := 2.80.2 +GLIB_MD5 := 399162c4e5f46e3f331a1f9c7478e4c5 GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX:= tar.xz GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX)) @@ -39,12 +39,12 @@ GLIB_CONF_TOOL := meson GLIB_CONF_OPT := \ $(CROSS_MESON_USR) \ -Dbsymbolic_functions=true \ + -Ddocumentation=false \ -Ddtrace=false \ -Dforce_posix_threads=true \ -Dglib_assert=true \ -Dglib_checks=true \ -Dglib_debug=enabled \ - -Ddocumentation=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ -Dlibelf=disabled \ -- 2.34.1
[ptxdist] [PATCH] ca-certificates: Version bump. 3.98 -> 3.100
No changes to the raw cert textfile. Bump the version to the latest one anyway. This eliminates the question of "latest". https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_99.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_100.html Signed-off-by: Christian Melki --- rules/ca-certificates.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make index c9a3b..a667d2d26 100644 --- a/rules/ca-certificates.make +++ b/rules/ca-certificates.make @@ -14,7 +14,7 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates # # Paths and names # -CA_CERTIFICATES_VERSION:= NSS_3_98_RTM +CA_CERTIFICATES_VERSION:= NSS_3_100_RTM CA_CERTIFICATES_MD5:= c5dc443a649e31ebdb26243bbb5855ad CA_CERTIFICATES:= ca-certificates-$(CA_CERTIFICATES_VERSION) CA_CERTIFICATES_SUFFIX := txt -- 2.34.1
[ptxdist] [PATCH] nss: Version bump. 3.98 -> 3.100
Various fixes. https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_99.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_100.html * Forward patchset. Applies cleanly. Signed-off-by: Christian Melki --- .../0001-nss-fix-nsinstall-build.patch| 0 patches/{nss-3.98 => nss-3.100}/0002-add-nss.pc.in.patch | 0 .../0003-HACK-don-t-build-commands-that-need-zlib.patch | 0 .../0004-HACK-fix-parallel-building-issue.patch | 0 .../0005-fix-dependency-generation.patch | 0 patches/{nss-3.98 => nss-3.100}/series| 0 rules/nss.make| 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename patches/{nss-3.98 => nss-3.100}/0001-nss-fix-nsinstall-build.patch (100%) rename patches/{nss-3.98 => nss-3.100}/0002-add-nss.pc.in.patch (100%) rename patches/{nss-3.98 => nss-3.100}/0003-HACK-don-t-build-commands-that-need-zlib.patch (100%) rename patches/{nss-3.98 => nss-3.100}/0004-HACK-fix-parallel-building-issue.patch (100%) rename patches/{nss-3.98 => nss-3.100}/0005-fix-dependency-generation.patch (100%) rename patches/{nss-3.98 => nss-3.100}/series (100%) diff --git a/patches/nss-3.98/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.100/0001-nss-fix-nsinstall-build.patch similarity index 100% rename from patches/nss-3.98/0001-nss-fix-nsinstall-build.patch rename to patches/nss-3.100/0001-nss-fix-nsinstall-build.patch diff --git a/patches/nss-3.98/0002-add-nss.pc.in.patch b/patches/nss-3.100/0002-add-nss.pc.in.patch similarity index 100% rename from patches/nss-3.98/0002-add-nss.pc.in.patch rename to patches/nss-3.100/0002-add-nss.pc.in.patch diff --git a/patches/nss-3.98/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.100/0003-HACK-don-t-build-commands-that-need-zlib.patch similarity index 100% rename from patches/nss-3.98/0003-HACK-don-t-build-commands-that-need-zlib.patch rename to patches/nss-3.100/0003-HACK-don-t-build-commands-that-need-zlib.patch diff --git a/patches/nss-3.98/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.100/0004-HACK-fix-parallel-building-issue.patch similarity index 100% rename from patches/nss-3.98/0004-HACK-fix-parallel-building-issue.patch rename to patches/nss-3.100/0004-HACK-fix-parallel-building-issue.patch diff --git a/patches/nss-3.98/0005-fix-dependency-generation.patch b/patches/nss-3.100/0005-fix-dependency-generation.patch similarity index 100% rename from patches/nss-3.98/0005-fix-dependency-generation.patch rename to patches/nss-3.100/0005-fix-dependency-generation.patch diff --git a/patches/nss-3.98/series b/patches/nss-3.100/series similarity index 100% rename from patches/nss-3.98/series rename to patches/nss-3.100/series diff --git a/rules/nss.make b/rules/nss.make index 8a0d72500..0610b54d9 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss # # Paths and names # -NSS_VERSION:= 3.98 -NSS_MD5:= 4502fcae1b32da310fffdfb3c67f6985 +NSS_VERSION:= 3.100 +NSS_MD5:= 91d114f373c71ed04c4fca96958cdcd1 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) -- 2.34.1
[ptxdist] [PATCH] libjpeg: Version bump. 3.0.2 -> 3.0.3
Minor fixes. https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.3 * License conditions changed. zlib license no longer applies. libjpeg-turbo is now covered by two licenses, not three. https://github.com/libjpeg-turbo/libjpeg-turbo/commit/9ef0d03e1e5f0140636215afe627954b81602c38 Signed-off-by: Christian Melki --- rules/libjpeg.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 73fec3173..49fa9eb01 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION:= 3.0.2 -LIBJPEG_MD5:= 94756db95bc2477f7f7dad1c2590b51f +LIBJPEG_VERSION:= 3.0.3 +LIBJPEG_MD5:= 081269bd1f35eaadb7ce2e3b4f03aebb LIBJPEG_SUFFIX := tar.gz LIBJPEG:= libjpeg-turbo-$(LIBJPEG_VERSION) LIBJPEG_TARBALL:= $(LIBJPEG).$(LIBJPEG_SUFFIX) LIBJPEG_URL:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(LIBJPEG_VERSION)/$(LIBJPEG_TARBALL) LIBJPEG_SOURCE := $(SRCDIR)/$(LIBJPEG_TARBALL) LIBJPEG_DIR:= $(BUILDDIR)/$(LIBJPEG) -LIBJPEG_LICENSE:= IJG, BSD-3-Clause, Zlib +LIBJPEG_LICENSE:= IJG, BSD-3-Clause LIBJPEG_LICENSE_FILES := \ - file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \ + file://LICENSE.md;md5=2badff230cc27e58977d8bc1d494 \ file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 \ file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=100ad877b6a14ec137afd49a6e109624 -- 2.34.1
[ptxdist] [PATCH] tpm2-tss: Version bump. 4.1.0 -> 4.1.1
Minor fix to broken release tarballs. https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.1 Signed-off-by: Christian Melki --- rules/tpm2-tss.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make index cf37742c4..783dd07f4 100644 --- a/rules/tpm2-tss.make +++ b/rules/tpm2-tss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss # # Paths and names # -TPM2_TSS_VERSION := 4.1.0 -TPM2_TSS_MD5 := 97e91ce0c77d361409502badb1023e80 +TPM2_TSS_VERSION := 4.1.1 +TPM2_TSS_MD5 := d50302e29150823254b9f1594add6dcd TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) TPM2_TSS_SUFFIX:= tar.gz TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2] sdl2: Version bump. 2.30.2 -> 2.30.3
Minor stable series bump. Minor bugfixes. https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3 * Fix removed config option. Signed-off-by: Christian Melki --- rules/sdl2.make | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index 4959560a0..01747370d 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.30.2 -SDL2_MD5 := 08667937c83fada423dacc7cd90f3ec8 +SDL2_VERSION := 2.30.3 +SDL2_MD5 := 85ceed58290332fa4ef75a3dabfa1b89 SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX:= tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) @@ -67,7 +67,6 @@ SDL2_CONF_OPT := \ --$(call ptx/endis,PTXCONF_ARCH_X86_64)-sse3 \ --$(call ptx/endis,PTXCONF_ARCH_PPC_ALTIVEC)-altivec \ --disable-lsx \ - --disable-lasx \ --$(call ptx/endis,PTXCONF_SDL2_OSS)-oss \ --$(call ptx/endis,PTXCONF_SDL2_ALSA)-alsa \ --disable-alsatest \ -- 2.34.1
[ptxdist] [PATCH] sdl2: Version bump. 2.30.2 -> 2.30.3
Minor stable series bump. Minor bugfixes. https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3 Signed-off-by: Christian Melki --- rules/sdl2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index 4959560a0..c5f4fa5ad 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.30.2 -SDL2_MD5 := 08667937c83fada423dacc7cd90f3ec8 +SDL2_VERSION := 2.30.3 +SDL2_MD5 := 85ceed58290332fa4ef75a3dabfa1b89 SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX:= tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] hwdata: Version bump. 0.381 -> 0.382
https://github.com/vcrhonek/hwdata/releases/tag/v0.382 The usual updates. Signed-off-by: Christian Melki --- rules/hwdata.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/hwdata.make b/rules/hwdata.make index ba1451b9f..9c15cf790 100644 --- a/rules/hwdata.make +++ b/rules/hwdata.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata # # Paths and names # -HWDATA_VERSION := 0.381 -HWDATA_MD5 := 9db68f209f3393aa5bfa3217d7c890c5 +HWDATA_VERSION := 0.382 +HWDATA_MD5 := 17cffcd26a627070332422c65b55eaab HWDATA := hwdata-$(HWDATA_VERSION) HWDATA_SUFFIX := tar.gz HWDATA_URL := https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libarchive: Version bump. 3.7.3 -> 3.7.4
More security fixes (probably paranoia in the wake). https://github.com/libarchive/libarchive/releases/tag/v3.7.4 Signed-off-by: Christian Melki --- rules/libarchive.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libarchive.make b/rules/libarchive.make index 267d8c0fe..5fbe4b0fe 100644 --- a/rules/libarchive.make +++ b/rules/libarchive.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive # # Paths and names # -LIBARCHIVE_VERSION := 3.7.3 -LIBARCHIVE_MD5 := a6bf48d0d4f4974c4eac58341ced1227 +LIBARCHIVE_VERSION := 3.7.4 +LIBARCHIVE_MD5 := 5649f858cd87dc969b6901152bd6614d LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION) LIBARCHIVE_SUFFIX := tar.gz LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] tpm2-tools: Version bump. 5.6 -> 5.7
https://github.com/tpm2-software/tpm2-tools/releases/tag/5.7 Bunch of fixes. Plugs CVEs (missing proper description at time of writing): CVE-2024-29038 CVE-2024-29039 Signed-off-by: Christian Melki --- rules/tpm2-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make index 5261f972d..69666a828 100644 --- a/rules/tpm2-tools.make +++ b/rules/tpm2-tools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools # # Paths and names # -TPM2_TOOLS_VERSION := 5.6 -TPM2_TOOLS_MD5 := c8362a622634646d3a5dbe012b9307d8 +TPM2_TOOLS_VERSION := 5.7 +TPM2_TOOLS_MD5 := 3acb6305070f064c28c5284d39aa0b04 TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) TPM2_TOOLS_SUFFIX := tar.gz TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] tpm2-tss: Version bump. 4.0.1 -> 4.1.0
https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.0 Nothing fancy, a bunch of fixes mostly. Plugs CVE: CVE-2024-29040 - In tmu_set_table of tmu.c, there is a possible out of bounds write due to a missing bounds check. Signed-off-by: Christian Melki --- rules/tpm2-tss.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make index 729172b4c..cf37742c4 100644 --- a/rules/tpm2-tss.make +++ b/rules/tpm2-tss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss # # Paths and names # -TPM2_TSS_VERSION := 4.0.1 -TPM2_TSS_MD5 := fff676c669519097906bd8ce28fc4238 +TPM2_TSS_VERSION := 4.1.0 +TPM2_TSS_MD5 := 97e91ce0c77d361409502badb1023e80 TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) TPM2_TSS_SUFFIX:= tar.gz TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] weston: Version bump. 13.0.0 -> 13.0.1
Bugfix release. https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html * Forward patchset, applies cleanly Signed-off-by: Christian Melki --- .../0001-HACK-don-t-build-tests.patch | 0 patches/{weston-13.0.0 => weston-13.0.1}/series | 0 rules/weston.make | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename patches/{weston-13.0.0 => weston-13.0.1}/0001-HACK-don-t-build-tests.patch (100%) rename patches/{weston-13.0.0 => weston-13.0.1}/series (100%) diff --git a/patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch b/patches/weston-13.0.1/0001-HACK-don-t-build-tests.patch similarity index 100% rename from patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch rename to patches/weston-13.0.1/0001-HACK-don-t-build-tests.patch diff --git a/patches/weston-13.0.0/series b/patches/weston-13.0.1/series similarity index 100% rename from patches/weston-13.0.0/series rename to patches/weston-13.0.1/series diff --git a/rules/weston.make b/rules/weston.make index ebf62645b..b3a90288b 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston # # Paths and names # -WESTON_VERSION := 13.0.0 +WESTON_VERSION := 13.0.1 LIBWESTON_MAJOR := 13 -WESTON_MD5 := f5d8614664a26211621910d310b42890 +WESTON_MD5 := 8f8d0209d64d536d328ed78f4b7cf70b WESTON := weston-$(WESTON_VERSION) WESTON_SUFFIX := tar.gz WESTON_URL := https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] linux-firmware: Version bump. 20240312 -> 20240410
No license file changes. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240410 Signed-off-by: Christian Melki --- rules/linux-firmware.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make index 6473f1f86..f12901f02 100644 --- a/rules/linux-firmware.make +++ b/rules/linux-firmware.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware # # Paths and names # -LINUX_FIRMWARE_VERSION := 20240312 -LINUX_FIRMWARE_MD5 := 9dde672fd15408bca23a4df38d4513e2 +LINUX_FIRMWARE_VERSION := 20240410 +LINUX_FIRMWARE_MD5 := 62c5622044539ca0a431a19d7c57bc02 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)) -- 2.34.1
[ptxdist] [PATCH] libcap-ng: Version bump. 0.8.4 -> 0.8.5
Minor changes. https://github.com/stevegrubb/libcap-ng/blob/v0.8.5/ChangeLog Signed-off-by: Christian Melki --- rules/libcap-ng.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make index d508e1986..f85c96eb5 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.4 -LIBCAP_NG_MD5 := 950748fcbc46a9bacf544e97724e46a2 +LIBCAP_NG_VERSION := 0.8.5 +LIBCAP_NG_MD5 := 3c280d902b902f28caf3990e018fcd31 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) -- 2.34.1
[ptxdist] [PATCH] libarchive: Version bump. 3.7.2 -> 3.7.3
Version bump after the xz debacle. libarchive was affected by the same malicious user and 3.7.3 has reviewed relevant commits. https://github.com/libarchive/libarchive/releases/tag/v3.7.3 https://github.com/libarchive/libarchive/issues/2103 Signed-off-by: Christian Melki --- rules/libarchive.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libarchive.make b/rules/libarchive.make index eb22652aa..267d8c0fe 100644 --- a/rules/libarchive.make +++ b/rules/libarchive.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive # # Paths and names # -LIBARCHIVE_VERSION := 3.7.2 -LIBARCHIVE_MD5 := dfaf015d642da9235bdd8270460928f7 +LIBARCHIVE_VERSION := 3.7.3 +LIBARCHIVE_MD5 := a6bf48d0d4f4974c4eac58341ced1227 LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION) LIBARCHIVE_SUFFIX := tar.gz LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] chrony: Fix URL.
tuxfamily.org seems down. Atleast partly. Might as well adjust the URL to something officially listed at: https://chrony-project.org/download.html Signed-off-by: Christian Melki --- rules/chrony.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/chrony.make b/rules/chrony.make index faa7e9a69..5b320d4a4 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -19,7 +19,7 @@ CHRONY_VERSION:= 4.5 CHRONY_MD5 := fa50d026df54f9919e6a37fae1258c61 CHRONY := chrony-$(CHRONY_VERSION) CHRONY_SUFFIX := tar.gz -CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX) +CHRONY_URL := https://chrony-project.org/releases/$(CHRONY).$(CHRONY_SUFFIX) CHRONY_SOURCE := $(SRCDIR)/$(CHRONY).$(CHRONY_SUFFIX) CHRONY_DIR := $(BUILDDIR)/$(CHRONY) CHRONY_LICENSE := GPL-2.0-only AND RSA-MD -- 2.34.1
Re: [ptxdist] [PATCH] tf-a: stop defining AS and other variables in cross make env
On 4/9/24 12:37 PM, Ahmad Fatoum wrote: Hello Christian, On 09.04.24 12:23, Christian Melki wrote: On 4/9/24 11:08 AM, Ahmad Fatoum wrote: The MAKE_ENV incantation results in PTXdist defining variables like AS and LD that point at the respective tools in the cross toolchain. This was unneeded as we already supply the TF-A built with a CROSS_COMPILE option, which is used to derive the correct tools, but it didn't hurt. This will expectedly change with TF-A v2.11, which should merge commit cc277de81692 ("build: refactor toolchain detection"), currently sitting in the integration branch. This changes the default value of AS to be that of the C compiler and leads to various issues when overriding it with an assembler as was possible before, e.g.: - hang during tool discovery, because `as -v` keeps waiting for input, unlike gcc -v - Assembler errors during build, because GCC-specific options (e.g. -DMACRO=VAL) are now passed to as(1). While TF-A changing the semantics of the AS option is arguably strange[2], let's take the easy way out and stop setting AS, so the PTXdist rule can build both old and new TF-A without problems. [1]: https://github.com/ARM-software/arm-trusted-firmware/commit/cc277de8169 [2]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163 Signed-off-by: Ahmad Fatoum --- rules/tf-a.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/rules/tf-a.make b/rules/tf-a.make index 54fe7d1e37d8..b8c477476c74 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -74,8 +74,6 @@ TF_A_CONF_TOOL := NO # Compile # -TF_A_MAKE_ENV := $(CROSS_ENV) - Perhaps not in this config, but isn't the make env used for other things? Like TLS stuff? Do you have a project, where you have TLS stuff and could test this? Anyhow, v2.11 would break the recipe, so this trades breaking all recipes for breaking only some recipes. Once we have breakage reports for those, we can start setting only the relevant variables in TF_A_MAKE_ENV. Cheers, Ahmad I have one with an older release, not actively rebuilding it. And I'm fine with the changes, just highlighting that it's maybe not an entirely useless variable. So please, go ahead with the changes. regards, Christian $(STATEDIR)/tf-a.compile: @$(call targetinfo)
Re: [ptxdist] [PATCH] tf-a: stop defining AS and other variables in cross make env
On 4/9/24 11:08 AM, Ahmad Fatoum wrote: The MAKE_ENV incantation results in PTXdist defining variables like AS and LD that point at the respective tools in the cross toolchain. This was unneeded as we already supply the TF-A built with a CROSS_COMPILE option, which is used to derive the correct tools, but it didn't hurt. This will expectedly change with TF-A v2.11, which should merge commit cc277de81692 ("build: refactor toolchain detection"), currently sitting in the integration branch. This changes the default value of AS to be that of the C compiler and leads to various issues when overriding it with an assembler as was possible before, e.g.: - hang during tool discovery, because `as -v` keeps waiting for input, unlike gcc -v - Assembler errors during build, because GCC-specific options (e.g. -DMACRO=VAL) are now passed to as(1). While TF-A changing the semantics of the AS option is arguably strange[2], let's take the easy way out and stop setting AS, so the PTXdist rule can build both old and new TF-A without problems. [1]: https://github.com/ARM-software/arm-trusted-firmware/commit/cc277de8169 [2]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163 Signed-off-by: Ahmad Fatoum --- rules/tf-a.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/rules/tf-a.make b/rules/tf-a.make index 54fe7d1e37d8..b8c477476c74 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -74,8 +74,6 @@ TF_A_CONF_TOOL:= NO # Compile # -TF_A_MAKE_ENV := $(CROSS_ENV) - Perhaps not in this config, but isn't the make env used for other things? Like TLS stuff? regards, Christian $(STATEDIR)/tf-a.compile: @$(call targetinfo)
[ptxdist] [PATCH] pciutils: Version bump. 3.11.1 -> 3.12.0
Minor changes. https://github.com/pciutils/pciutils/blob/v3.12.0/ChangeLog Signed-off-by: Christian Melki --- rules/pciutils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pciutils.make b/rules/pciutils.make index f2da15ebe..20e2b7f7e 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils # # Paths and names # -PCIUTILS_VERSION := 3.11.1 -PCIUTILS_MD5 := b97a06ef3944b1a4afdb46ac6d7b8600 +PCIUTILS_VERSION := 3.12.0 +PCIUTILS_MD5 := f6607d41eb8ce0f676368a1012b5fe5c PCIUTILS := pciutils-$(PCIUTILS_VERSION) PCIUTILS_SUFFIX:= tar.gz PCIUTILS_URL := https://github.com/pciutils/pciutils/archive/refs/tags/v$(PCIUTILS_VERSION).$(PCIUTILS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] mtdev: Version bump. 1.1.6 -> 1.1.7
Very minor changes. Signed-off-by: Christian Melki --- rules/mtdev.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mtdev.make b/rules/mtdev.make index 8b9986f25..57f337baf 100644 --- a/rules/mtdev.make +++ b/rules/mtdev.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MTDEV) += mtdev # # Paths and names # -MTDEV_VERSION := 1.1.6 -MTDEV_MD5 := bf8ef2482e84a00b5db8fbd3ce00e249 +MTDEV_VERSION := 1.1.7 +MTDEV_MD5 := 483ed7fdf7c1e7b7375c05a62848cce7 MTDEV := mtdev-$(MTDEV_VERSION) MTDEV_SUFFIX := tar.bz2 MTDEV_URL := http://bitmath.org/code/mtdev/$(MTDEV).$(MTDEV_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2 2/2] host-util-linux: Follow target util-linux.
* Disabled new functions. Signed-off-by: Christian Melki --- rules/host-util-linux.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 849c09c7a..adaf0b86c 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -50,6 +50,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=enabled \ -Dbuild-libfdisk=disabled \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=enabled \ -Dbuild-libsmartcols=disabled \ -Dbuild-libuuid=enabled \ @@ -68,6 +69,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=disabled \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=disabled \ -Dbuild-pg=disabled \ -Dbuild-pipesz=disabled \ -- 2.34.1
[ptxdist] [PATCH v2 1/2] util-linux: Version bump. 2.39.3 -> 2.40
https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes * Switch URL. Release tarballs (using make dist) were missing files needed to build with meson. But the files are present in the git snapshot url. * New liblastlog2 stuff does seem to have various building issues etc, so disable them for now. * Old patches dropped, seem to be included in the new release. Signed-off-by: Christian Melki --- ...roperly-handle-gettext-non-existence.patch | 29 --- patches/util-linux-2.39.3/series | 4 --- rules/util-linux.make | 11 +++ 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch delete mode 100644 patches/util-linux-2.39.3/series diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch deleted file mode 100644 index 01d07d3f6..0 --- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 5 Aug 2023 08:57:28 +0200 -Subject: [PATCH] meson: properly handle gettext non-existence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e91a49c9747f ("meson: don't build po if no gettext") -tried to add the possibility to build util-linux without gettext. - -Unfortunately by default the call to find_program() would abort the -build if the program is not found. -Avoid aborting the build. - -Signed-off-by: Thomas Weißschuh - po/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/meson.build b/po/meson.build -index c10deafd28a6..8adfa48d8327 100644 a/po/meson.build -+++ b/po/meson.build -@@ -1,4 +1,4 @@ --if not find_program('gettext').found() -+if not find_program('gettext', required : false).found() - subdir_done() - endif - diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series deleted file mode 100644 index ca4f8cdfd..0 --- a/patches/util-linux-2.39.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-properly-handle-gettext-non-existence.patch -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic diff --git a/rules/util-linux.make b/rules/util-linux.make index 2a2215570..60c6e9228 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,12 +15,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.39.3 -UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5 +UTIL_LINUX_VERSION := 2.40 +UTIL_LINUX_MD5 := bc4272a7821bb12c68c441d23b8eaa89 UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) -UTIL_LINUX_SUFFIX := tar.xz -UTIL_LINUX_BASENAME:= v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION))) -UTIL_LINUX_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_BASENAME)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)) +UTIL_LINUX_SUFFIX := tar.gz +UTIL_LINUX_URL := https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) UTIL_LINUX_SOURCE := $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) UTIL_LINUX_DIR := $(BUILDDIR)/$(UTIL_LINUX) UTIL_LINUX_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain @@ -70,6 +69,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ @@ -88,6 +88,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ -Dbuild-pg=disabled \ -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \ -- 2.34.1
[ptxdist] [PATCH v2 1/2] mtd-utils: Version bump. 2.1.6 -> 2.2.0
Not overly exciting. https://lists.infradead.org/pipermail/linux-mtd/2024-March/104058.html * Fix options that changed from endis to wwo. * Forward patchset, applies cleanly. Signed-off-by: Christian Melki --- .../0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch | 0 patches/{mtd-utils-2.1.6 => mtd-utils-2.2.0}/autogen.sh | 0 patches/{mtd-utils-2.1.6 => mtd-utils-2.2.0}/series | 0 rules/mtd-utils.make | 8 4 files changed, 4 insertions(+), 4 deletions(-) rename patches/{mtd-utils-2.1.6 => mtd-utils-2.2.0}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%) rename patches/{mtd-utils-2.1.6 => mtd-utils-2.2.0}/autogen.sh (100%) rename patches/{mtd-utils-2.1.6 => mtd-utils-2.2.0}/series (100%) diff --git a/patches/mtd-utils-2.1.6/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch b/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch similarity index 100% rename from patches/mtd-utils-2.1.6/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch rename to patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch diff --git a/patches/mtd-utils-2.1.6/autogen.sh b/patches/mtd-utils-2.2.0/autogen.sh similarity index 100% rename from patches/mtd-utils-2.1.6/autogen.sh rename to patches/mtd-utils-2.2.0/autogen.sh diff --git a/patches/mtd-utils-2.1.6/series b/patches/mtd-utils-2.2.0/series similarity index 100% rename from patches/mtd-utils-2.1.6/series rename to patches/mtd-utils-2.2.0/series diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index bef25b9ab..9722c20a5 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 2.1.6 -MTD_UTILS_MD5 := 2851d4b13e5c1cf9415f76102a34d623 +MTD_UTILS_VERSION := 2.2.0 +MTD_UTILS_MD5 := 35d71328107c54068c8df5a3b980c06e MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := https://infraroot.at/pub/mtd/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) @@ -35,9 +35,9 @@ MTD_UTILS_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ --disable-unit-tests \ $(GLOBAL_LARGE_FILE_OPTION) \ - --$(call ptx/endis,PTXCONF_MTD_UTILS_TESTS)-tests \ + --$(call ptx/wwo,PTXCONF_MTD_UTILS_TESTS)-tests \ --$(call ptx/endis,PTXCONF_MTD_UTILS_UBIHEALTHD)-ubihealthd \ - --$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ + --$(call ptx/wwo, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ --without-xattr \ -- 2.34.1
[ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils
* Fix options that changed from endis to wwo. Signed-off-by: Christian Melki --- rules/host-mtd-utils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 61179adce..99de07083 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -24,9 +24,9 @@ HOST_MTD_UTILS_CONF_OPT := \ $(HOST_AUTOCONF) \ --disable-unit-tests \ --enable-largefile \ - --disable-tests \ + --without-tests \ --disable-ubihealthd \ - --disable-lsmtd \ + --without-lsmtd \ --without-jffs \ --with-ubifs \ --with-xattr \ -- 2.34.1
[ptxdist] [PATCH] sdl2: Version bump. 2.30.1 -> 2.30.2
Minor stable series bump. Minor bugfixes. https://github.com/libsdl-org/SDL/releases/tag/release-2.30.2 Signed-off-by: Christian Melki --- rules/sdl2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index c8cdcf97b..4959560a0 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.30.1 -SDL2_MD5 := a28514e50ef4bb5cc2e1e8c70553425d +SDL2_VERSION := 2.30.2 +SDL2_MD5 := 08667937c83fada423dacc7cd90f3ec8 SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX:= tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] hwdata: Version bump. 0.380 -> 0.381.
Usual ID bumps. Signed-off-by: Christian Melki --- rules/hwdata.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/hwdata.make b/rules/hwdata.make index efd4eec22..ba1451b9f 100644 --- a/rules/hwdata.make +++ b/rules/hwdata.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata # # Paths and names # -HWDATA_VERSION := 0.380 -HWDATA_MD5 := 65d190da425b4fc9a38f4fb96b21f56f +HWDATA_VERSION := 0.381 +HWDATA_MD5 := 9db68f209f3393aa5bfa3217d7c890c5 HWDATA := hwdata-$(HWDATA_VERSION) HWDATA_SUFFIX := tar.gz HWDATA_URL := https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2 1/2] util-linux: Version bump. 2.39.3 -> 2.40
https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes * Fix missing files in the release. Add patches. New liblastlog2 stuff does seem to have various building issues etc, so disable them for now. * Old patches dropped, seem to be included in the new release. Signed-off-by: Christian Melki --- ...roperly-handle-gettext-non-existence.patch | 29 --- patches/util-linux-2.39.3/series | 4 -- ...-distribute-pam_lastlog2-meson.build.patch | 27 ++ ..._lastlog2-Add-missing-file-for-meson.patch | 52 +++ patches/util-linux-2.40/series| 5 ++ rules/util-linux.make | 6 ++- 6 files changed, 88 insertions(+), 35 deletions(-) delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch delete mode 100644 patches/util-linux-2.39.3/series create mode 100644 patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch create mode 100644 patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch create mode 100644 patches/util-linux-2.40/series diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch deleted file mode 100644 index 01d07d3f6..0 --- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 5 Aug 2023 08:57:28 +0200 -Subject: [PATCH] meson: properly handle gettext non-existence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e91a49c9747f ("meson: don't build po if no gettext") -tried to add the possibility to build util-linux without gettext. - -Unfortunately by default the call to find_program() would abort the -build if the program is not found. -Avoid aborting the build. - -Signed-off-by: Thomas Weißschuh - po/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/meson.build b/po/meson.build -index c10deafd28a6..8adfa48d8327 100644 a/po/meson.build -+++ b/po/meson.build -@@ -1,4 +1,4 @@ --if not find_program('gettext').found() -+if not find_program('gettext', required : false).found() - subdir_done() - endif - diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series deleted file mode 100644 index ca4f8cdfd..0 --- a/patches/util-linux-2.39.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-properly-handle-gettext-non-existence.patch -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic diff --git a/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch new file mode 100644 index 0..a0b045def --- /dev/null +++ b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch @@ -0,0 +1,27 @@ +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 30 Mar 2024 17:46:19 +0100 +Subject: [PATCH] autotools: distribute pam_lastlog2/meson.build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise building the dist tarball via meson doesn't work. + +Fixes #2875 +Signed-off-by: Thomas Weißschuh +--- + pam_lastlog2/Makemodule.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pam_lastlog2/Makemodule.am b/pam_lastlog2/Makemodule.am +index f33c98ba5324..f17cc09f6a14 100644 +--- a/pam_lastlog2/Makemodule.am b/pam_lastlog2/Makemodule.am +@@ -3,6 +3,6 @@ if BUILD_PAM_LASTLOG2 + include pam_lastlog2/man/Makemodule.am + include pam_lastlog2/src/Makemodule.am + +-EXTRA_DIST += pam_lastlog2/COPYING ++EXTRA_DIST += pam_lastlog2/COPYING pam_lastlog2/meson.build + + endif # BUILD_PAM_LASTLOG2 diff --git a/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch new file mode 100644 index 0..04c2a9141 --- /dev/null +++ b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch @@ -0,0 +1,52 @@ +From: Christian Melki +Date: Mon, 1 Apr 2024 19:52:46 +0200 +Subject: [PATCH] pam_lastlog2: Add missing file for meson. + +Signed-off-by: Christian Melki +--- + pam_lastlog2/meson.build | 36 + 1 file changed, 36 insertions(+) + create mode 100644 pam_lastlog2/meson.build + +diff --git a/pam_lastlog2/meson.build b/pam_lastlog2/meson.build +new file mode 100644 +index ..12f3a6b211e6 +--- /dev/null b/pam_lastlog2/meson.build +@@ -0,0 +1,36 @@ ++build_pam_lastlog2 = not get_option('build-pam-lastlog2') \ ++.require(build_liblastlog2) \ ++.require(conf.get('HAVE_SECURITY_PAM
[ptxdist] [PATCH v2 2/2] host-util-linux: Follow target util-linux.
* Disabled new functions. Signed-off-by: Christian Melki --- rules/host-util-linux.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 849c09c7a..adaf0b86c 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -50,6 +50,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=enabled \ -Dbuild-libfdisk=disabled \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=enabled \ -Dbuild-libsmartcols=disabled \ -Dbuild-libuuid=enabled \ @@ -68,6 +69,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=disabled \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=disabled \ -Dbuild-pg=disabled \ -Dbuild-pipesz=disabled \ -- 2.34.1
[ptxdist] [PATCH 1/2] util-linux: Version bump. 2.39.3 -> 2.40
https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes * Fix missing files in the release. New liblastlog2 stuff does seem to have various building issues etc, so disable them for now. * Old patches dropped, seem to be included in the new release. Signed-off-by: Christian Melki --- ...roperly-handle-gettext-non-existence.patch | 29 --- patches/util-linux-2.39.3/series | 4 --- rules/util-linux.make | 6 ++-- 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch delete mode 100644 patches/util-linux-2.39.3/series diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch deleted file mode 100644 index 01d07d3f6..0 --- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 5 Aug 2023 08:57:28 +0200 -Subject: [PATCH] meson: properly handle gettext non-existence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e91a49c9747f ("meson: don't build po if no gettext") -tried to add the possibility to build util-linux without gettext. - -Unfortunately by default the call to find_program() would abort the -build if the program is not found. -Avoid aborting the build. - -Signed-off-by: Thomas Weißschuh - po/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/meson.build b/po/meson.build -index c10deafd28a6..8adfa48d8327 100644 a/po/meson.build -+++ b/po/meson.build -@@ -1,4 +1,4 @@ --if not find_program('gettext').found() -+if not find_program('gettext', required : false).found() - subdir_done() - endif - diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series deleted file mode 100644 index ca4f8cdfd..0 --- a/patches/util-linux-2.39.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-properly-handle-gettext-non-existence.patch -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic diff --git a/rules/util-linux.make b/rules/util-linux.make index 2a2215570..43ee2c331 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.39.3 -UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5 +UTIL_LINUX_VERSION := 2.40 +UTIL_LINUX_MD5 := 46d1423122d310dfd022c799e1e4e259 UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SUFFIX := tar.xz UTIL_LINUX_BASENAME:= v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION))) @@ -70,6 +70,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ @@ -88,6 +89,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ -Dbuild-pg=disabled \ -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \ -- 2.34.1
[ptxdist] [PATCH 2/2] host-util-linux: Follow target util-linux.
* Disabled new functions. Signed-off-by: Christian Melki --- rules/host-util-linux.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 849c09c7a..adaf0b86c 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -50,6 +50,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=enabled \ -Dbuild-libfdisk=disabled \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=enabled \ -Dbuild-libsmartcols=disabled \ -Dbuild-libuuid=enabled \ @@ -68,6 +69,7 @@ HOST_UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=disabled \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=disabled \ -Dbuild-pg=disabled \ -Dbuild-pipesz=disabled \ -- 2.34.1
[ptxdist] [PATCH 1/2] mtd-utils: Version bump. 2.1.6 -> 2.2.0
Not overly exciting. https://lists.infradead.org/pipermail/linux-mtd/2024-March/104058.html * Fix options that changed from endis to wwo. * Forward patchset, applies cleanly. Signed-off-by: Christian Melki --- ...rkbad-new-util-to-mark-blocks-as-bad.patch | 158 ++ patches/mtd-utils-2.2.0/autogen.sh| 1 + patches/mtd-utils-2.2.0/series| 4 + rules/mtd-utils.make | 8 +- 4 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch create mode 12 patches/mtd-utils-2.2.0/autogen.sh create mode 100644 patches/mtd-utils-2.2.0/series diff --git a/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch b/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch new file mode 100644 index 0..e6ff202a7 --- /dev/null +++ b/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch @@ -0,0 +1,158 @@ +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Wed, 30 Aug 2017 13:31:46 +0200 +Subject: [PATCH] nandmarkbad: new util to mark blocks as bad + +--- + nand-utils/Makemodule.am | 5 +- + nand-utils/nandmarkbad.c | 119 +++ + 2 files changed, 123 insertions(+), 1 deletion(-) + create mode 100644 nand-utils/nandmarkbad.c + +diff --git a/nand-utils/Makemodule.am b/nand-utils/Makemodule.am +index cee677783e7a..7fd1de5aa9ae 100644 +--- a/nand-utils/Makemodule.am b/nand-utils/Makemodule.am +@@ -7,6 +7,9 @@ nandwrite_LDADD = libmtd.a + nandtest_SOURCES = nand-utils/nandtest.c + nandtest_LDADD = libmtd.a + ++nandmarkbad_SOURCES = nand-utils/nandmarkbad.c ++nandmarkbad_LDADD = libmtd.a ++ + nftldump_SOURCES = nand-utils/nftldump.c include/mtd_swab.h + nftldump_SOURCES += include/mtd/nftl-user.h include/mtd/ftl-user.h + nftldump_LDADD = libmtd.a +@@ -23,7 +26,7 @@ NAND_SH = \ + + EXTRA_DIST += $(NAND_SH) + +-sbin_PROGRAMS += nanddump nandwrite nandtest nftldump nftl_format nandflipbits ++sbin_PROGRAMS += nanddump nandwrite nandtest nandmarkbad nftldump nftl_format nandflipbits + + if BUILD_TESTS + test_SCRIPTS += $(NAND_SH) +diff --git a/nand-utils/nandmarkbad.c b/nand-utils/nandmarkbad.c +new file mode 100644 +index ..cf05698c3609 +--- /dev/null b/nand-utils/nandmarkbad.c +@@ -0,0 +1,119 @@ ++#define PROGRAM_NAME "nandmarkbad" ++ ++#include ++#include ++#include ++#include ++ ++#include "common.h" ++#include ++ ++static void usage(int status) ++{ ++ fprintf(status ? stderr : stdout, ++ "usage: %s [OPTIONS] \n\n" ++ " -b, --markbad=blocknoMark block bad\n" ++ " -h, --help Display this help and exit\n" ++ " -V, --versionOutput version information and exit\n" ++ " -y, --i-know-what-i-do really do mark blocks as bad\n", ++ PROGRAM_NAME); ++ exit(status); ++} ++ ++/* ++ * Main program ++ */ ++int main(int argc, char **argv) ++{ ++ loff_t mark_bad[32]; ++ unsigned cnt_bad = 0; ++ struct mtd_dev_info mtd; ++ libmtd_t mtd_desc; ++ int fd; ++ int error = 0; ++ int ret; ++ unsigned int i; ++ int iknowwhatido = 0; ++ ++ for (;;) { ++ static const char short_options[] = "b:hVy"; ++ static const struct option long_options[] = { ++ { "help", no_argument, 0, 'h' }, ++ { "markbad", required_argument, 0, 'b' }, ++ { "version", no_argument, 0, 'V'}, ++ { "i-know-what-i-do", no_argument, 0, 'y' }, ++ {0, 0, 0, 0}, ++ }; ++ int option_index = 0; ++ int c = getopt_long(argc, argv, short_options, long_options, ++ _index); ++ if (c == EOF) ++ break; ++ ++ switch (c) { ++ case '?': ++ usage(EXIT_FAILURE); ++ break; ++ ++ case 'b': ++ if (cnt_bad < ARRAY_SIZE(mark_bad)) { ++ mark_bad[cnt_bad] = ++ simple_strtoll(optarg, ); ++ ++cnt_bad; ++ } else { ++ errmsg_die("Can't handle so many bad blocks\n"); ++ } ++ ++ break; ++ ++ case 'h': ++ usage(EXIT_SUCCESS); ++ break; ++ ++ case 'V': ++ common_print_version(); ++ return EXIT_SUCCESS; ++ ++ case 'y': ++
[ptxdist] [PATCH 2/2] host-mtd-utils: Follow target mtd-utils
* Fix options that changed from endis to wwo. Signed-off-by: Christian Melki --- rules/host-mtd-utils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 61179adce..99de07083 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -24,9 +24,9 @@ HOST_MTD_UTILS_CONF_OPT := \ $(HOST_AUTOCONF) \ --disable-unit-tests \ --enable-largefile \ - --disable-tests \ + --without-tests \ --disable-ubihealthd \ - --disable-lsmtd \ + --without-lsmtd \ --without-jffs \ --with-ubifs \ --with-xattr \ -- 2.34.1
Re: [ptxdist] [PATCH] xz: Version bump. 5.4.4 -> 5.6.0
On 3/29/24 10:52 PM, Michael Olbrich wrote: > On Sun, Feb 25, 2024 at 03:35:13PM +0100, Christian Melki wrote: >> https://github.com/tukaani-project/xz/releases/tag/v5.6.0 >> https://github.com/tukaani-project/xz/releases/tag/v5.5.2beta >> https://github.com/tukaani-project/xz/releases/tag/v5.5.1alpha >> https://github.com/tukaani-project/xz/releases/tag/v5.4.6 >> https://github.com/tukaani-project/xz/releases/tag/v5.4.5 >> >> * License conditions changed! The majority of XZ >> that was public domain is now re-released under the 0-clause BSD license. >> Otherwise, the other parts still remains the same. >> The sum of XZ licensing is pretty complex however. >> >> * URL changed. XZ is now hosted on github. >> >> * Fix a few options. > > FYI, I reverted this for now. It seems the release tarballs are > compromised[1]. From what I've read so far, PTXdist is probably not > affected, since we don't carry the relevant openssh patches. > But the next PTXdist release will happen pretty soon, so we'll stick to the > old version for now. We can update once upstream is sorted out. > > Regards, > Michael > > [1] https://www.cve.org/CVERecord?id=CVE-2024-3094 > > Yeah. I just saw the news. I would suspect the actor has tried to infiltrate other projects as well Everything that account has touched probably needs to be vetted. https://github.com/JiaT75?tab=repositories Tnx for the heads up. Regards, C >> Signed-off-by: Christian Melki >> --- >> rules/xz.make | 17 ++--- >> 1 file changed, 10 insertions(+), 7 deletions(-) >> >> diff --git a/rules/xz.make b/rules/xz.make >> index f24a2ac03..51490b2ce 100644 >> --- a/rules/xz.make >> +++ b/rules/xz.make >> @@ -14,16 +14,16 @@ PACKAGES-$(PTXCONF_XZ) += xz >> # >> # Paths and names >> # >> -XZ_VERSION := 5.4.4 >> -XZ_MD5 := fbb849a27e266964aefe26bad508144f >> +XZ_VERSION := 5.6.0 >> +XZ_MD5 := cfb1afdfcfeca02f7677b1b401bc536e >> XZ := xz-$(XZ_VERSION) >> -XZ_SUFFIX := tar.bz2 >> -XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) >> +XZ_SUFFIX := tar.xz >> +XZ_URL := >> https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) >> XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) >> XZ_DIR := $(BUILDDIR)/$(XZ) >> -XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND >> GPL-3.0-or-later >> +XZ_LICENSE := public_domain AND 0BSD AND LGPL-2.1-or-later AND >> GPL-2.0-or-later AND GPL-3.0-or-later >> XZ_LICENSE_FILES := \ >> -file://COPYING;md5=c8ea84ebe7b93cce676b54355dc6b2c0 \ >> +file://COPYING;md5=3ef4de063517b8d33e97bbb87a3339ee \ >> file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ >> file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ >> file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c >> @@ -44,6 +44,7 @@ XZ_CONF_OPT:= \ >> --disable-lzip-decoder \ >> --enable-assembler \ >> --enable-clmul-crc \ >> +--enable-arm64-crc32 \ >> --disable-small \ >> --enable-threads \ >> --$(call ptx/endis,PTXCONF_XZ_TOOLS)-xz \ >> @@ -60,9 +61,11 @@ XZ_CONF_OPT := \ >> --disable-nls \ >> --disable-rpath \ >> $(GLOBAL_LARGE_FILE_OPTION) \ >> +--enable-ifunc \ >> --enable-unaligned-access=auto \ >> --disable-unsafe-type-punning \ >> ---disable-werror >> +--disable-werror \ >> +--$(call ptx/endis, PTXDIST_Y2038)-year2038 >> >> # >> >> # Target-Install >> -- >> 2.34.1 >> >> >> >
[ptxdist] [PATCH 1/2] libcurl: Version bump. 8.6.0 -> 8.7.1
Bunch of fixes as usual. 8.7.1 is a very minor change. https://curl.se/changes.html#8_7_0 https://curl.se/changes.html#8_7_1 * Add new build flag to disable docs. Signed-off-by: Christian Melki --- rules/libcurl.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/libcurl.make b/rules/libcurl.make index 10c501e0d..455695e25 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION:= 8.6.0 -LIBCURL_MD5:= 8f28f7e08c91cc679a45fccf66184fbc +LIBCURL_VERSION:= 8.7.1 +LIBCURL_MD5:= f4f37253c5f1ad9ee85fa6215fdfeb42 LIBCURL:= curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz LIBCURL_URL:= https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) @@ -62,6 +62,7 @@ LIBCURL_CONF_OPT := \ --$(call ptx/endis, PTXCONF_LIBCURL_SMTP)-smtp \ --disable-gopher \ --disable-mqtt \ + --disable-docs \ --disable-manual \ --enable-libcurl-option \ --disable-libgcc \ -- 2.34.1
[ptxdist] [PATCH 2/2] host-libcurl: Follow target libcurl.
* Add build option to disable docs. Signed-off-by: Christian Melki --- rules/host-libcurl.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make index 686a3d4ab..e223573ea 100644 --- a/rules/host-libcurl.make +++ b/rules/host-libcurl.make @@ -46,6 +46,7 @@ HOST_LIBCURL_CONF_OPT := \ --disable-smb \ --disable-smtp \ --disable-gopher \ + --disable-docs \ --disable-mqtt \ --disable-manual \ --enable-libcurl-option \ -- 2.34.1
[ptxdist] [PATCH] zstd: Version bump. 1.5.5 -> 1.5.6
Various improvements. https://github.com/facebook/zstd/releases/tag/v1.5.6 Signed-off-by: Christian Melki --- rules/zstd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/zstd.make b/rules/zstd.make index 6310cc4fc..fdda5819e 100644 --- a/rules/zstd.make +++ b/rules/zstd.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd # # Paths and names # -ZSTD_VERSION := 1.5.5 -ZSTD_MD5 := 4ff0ee1965ab161bc55be7c9dcd1f7f9 +ZSTD_VERSION := 1.5.6 +ZSTD_MD5 := 2543d7cb3beda9ec48f965e5059dbd42 ZSTD := zstd-$(ZSTD_VERSION) ZSTD_SUFFIX:= tar.gz ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libxkbcommon: Version bump. 1.6.0 -> 1.7.0
Minor changes and fixes. Reverts the removal of previously deleted keysyms. https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-1.7.0/NEWS.md Signed-off-by: Christian Melki --- rules/libxkbcommon.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make index f0e307567..ca54115a6 100644 --- a/rules/libxkbcommon.make +++ b/rules/libxkbcommon.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon # # Paths and names # -LIBXKBCOMMON_VERSION := 1.6.0 -LIBXKBCOMMON_MD5 := 90079ab4a0c6fa56dc75abffef9b1bc6 +LIBXKBCOMMON_VERSION := 1.7.0 +LIBXKBCOMMON_MD5 := b05b1a0d473189efb2dd995dd944f152 LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION) LIBXKBCOMMON_SUFFIX:= tar.xz LIBXKBCOMMON_URL := http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libpciaccess: Version bump. 0.18 -> 0.18.1
Very minor meson build change. Bumping anyway. Signed-off-by: Christian Melki --- rules/libpciaccess.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make index 7ab035ab5..79b4f9263 100644 --- a/rules/libpciaccess.make +++ b/rules/libpciaccess.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess # # Paths and names # -LIBPCIACCESS_VERSION := 0.18 -LIBPCIACCESS_MD5 := 54f48367e37666f9e0f12571d1ee3620 +LIBPCIACCESS_VERSION := 0.18.1 +LIBPCIACCESS_MD5 := 57c7efbeceedefde006123a77a7bc825 LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION) LIBPCIACCESS_SUFFIX:= tar.xz LIBPCIACCESS_URL := $(call ptx/mirror, XORG, individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] strace: Version bump. 6.7 -> 6.8
Minor changes. https://github.com/strace/strace/releases/tag/v6.8 Signed-off-by: Christian Melki --- rules/strace.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/strace.make b/rules/strace.make index 2b505e57e..697b1495a 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace # # Paths and names # -STRACE_VERSION := 6.7 -STRACE_MD5 := 8eb0aa75111a8e66cc14176159cc8ee9 +STRACE_VERSION := 6.8 +STRACE_MD5 := 1c7aca3fad1f309fdb54031866fad6d9 STRACE := strace-$(STRACE_VERSION) STRACE_SUFFIX := tar.xz STRACE_URL := https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] glib: Version bump. 2.78.4 -> 2.80.0
New stable series. Looks like mostly bugfixes with a few API changes. https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.0 https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.1 https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.2 https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.3 https://gitlab.gnome.org/GNOME/glib/-/releases/2.80.0 * Fix option changes. Signed-off-by: Christian Melki --- rules/glib.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/glib.make b/rules/glib.make index 67c60227c..f95e19e60 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -GLIB_VERSION := 2.78.4 -GLIB_MD5 := 0781e889cab64f1f7dbb6e8357c6a95f +GLIB_VERSION := 2.80.0 +GLIB_MD5 := 3a51e2803ecd22c2dadcd07d9475ebe3 GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX:= tar.xz GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX)) @@ -44,11 +44,11 @@ GLIB_CONF_OPT := \ -Dglib_assert=true \ -Dglib_checks=true \ -Dglib_debug=enabled \ - -Dgtk_doc=false \ + -Ddocumentation=false \ -Dinstalled_tests=false \ -Dlibelf=disabled \ -Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \ - -Dman=false \ + -Dman-pages=disabled \ -Dnls=disabled \ -Doss_fuzz=disabled \ -Dselinux=disabled \ -- 2.34.1
[ptxdist] [PATCH] expat: Version bump. 2.6.1 -> 2.6.2
Minor changes https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes Plugs CVE: CVE-2024-28757: Prevent billion laughs attacks with isolated use of external parsers. Signed-off-by: Christian Melki --- rules/expat.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/expat.make b/rules/expat.make index 1c5fcf441..03f9ac6b4 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # # Paths and names # -EXPAT_VERSION := 2.6.1 -EXPAT_MD5 := d83bb2458956aeed4236cf45bff6eccd +EXPAT_VERSION := 2.6.2 +EXPAT_MD5 := b246f58b25a7629fca6cbd1429400cdf EXPAT := expat-$(EXPAT_VERSION) EXPAT_SUFFIX := tar.bz2 EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) -- 2.34.1
[ptxdist] [PATCH] linux-firmware: Version bump. 20240220 -> 20240312
Nothing overly interesting. Smaller than the last, big one. No license changes. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240312 Signed-off-by: Christian Melki --- rules/linux-firmware.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make index 69e350d7d..6473f1f86 100644 --- a/rules/linux-firmware.make +++ b/rules/linux-firmware.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware # # Paths and names # -LINUX_FIRMWARE_VERSION := 20240220 -LINUX_FIRMWARE_MD5 := cf98535691464e21bb27acff2989cc6f +LINUX_FIRMWARE_VERSION := 20240312 +LINUX_FIRMWARE_MD5 := 9dde672fd15408bca23a4df38d4513e2 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)) -- 2.34.1
[ptxdist] [PATCH] iproute2: Version bump. 6.7.0 -> 6.8.0
Minor changes. https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/?h=v6.8.0 Signed-off-by: Christian Melki --- rules/iproute2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/iproute2.make b/rules/iproute2.make index 6de8652f2..79aa02f1d 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 6.7.0 -IPROUTE2_MD5 := 35d8277d1469596b7edc07a51470a033 +IPROUTE2_VERSION := 6.8.0 +IPROUTE2_MD5 := 9d6ea453986900d98e3b6bcb868815cd IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX:= tar.xz IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] openssh: Version bump. 9.6 -> 9.7
Minor changes. Biggest notice is the permanent removal of DSA in 2025. https://www.openssh.com/txt/release-9.7 Signed-off-by: Christian Melki --- rules/openssh.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/openssh.make b/rules/openssh.make index 7f55b2ba3..5381cbca5 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh # # Paths and names # -OPENSSH_VERSION:= 9.6p1 -OPENSSH_MD5:= 5e90def5af3ffb27e149ca6fff12bef3 +OPENSSH_VERSION:= 9.7p1 +OPENSSH_MD5:= 1100f170ca1bc669038ca3743e074094 OPENSSH:= openssh-$(OPENSSH_VERSION) OPENSSH_SUFFIX := tar.gz OPENSSH_URL:= \ -- 2.34.1
Re: [ptxdist] [PATCH] image-root-cpio.in: Use multithreaded XZ (revisited).
On 3/7/24 17:04, Michael Olbrich wrote: > Hi, > > On Sun, Feb 25, 2024 at 03:49:06PM +0100, Christian Melki wrote: >> So, after asking questions about the default multithread mode >> of xz 5.6.0 and determinism, it turned out that there >> is a common misconception about determinism in xz. >> >> XZ compression varies between the two compressors. Ie, the single >> thread and multi thread variant. T0 always uses the multithread >> one, even if used on one core. But T1 uses the singlethread >> compressor. >> >> This has caused a very common misconception about determinism >> variability with number of threads. I've seen this discussion >> on a lot of places. So albeit true, it only applies to the >> distinct compressors, not how many threads are used in >> multithread mode. >> >> Now after giving this some thought I've decided to reenable >> threaded XZ, using T0. T0 should produce the same results always, >> on any target. Even unicore machines. And with the multithread >> compressor now being the default, users should end up with the >> same results unless they are actively using T1. > > So if I understand it correctly then multithreaded compression results i a > slightly larger output file. But it also means that it can be extracted > with multiple threads. > The question is: will that actually happen? The initramfs is extracted by > the kernel and I'm not sure if it supports that. > > Michael > Not sure I follow. You're asking if a multithreaded compressed archive can be decompressed by the in kernel (single thread, assumed) decompressor? It would seem it's very bad if it wasn't capable of doing so, so I never think about that. I just assume it. Regardless. You may drop this if you like, regarding slightly larger archives. It's a very trivial local change for those who thinks it's useful. Regards, Christian >> Signed-off-by: Christian Melki >> --- >> platforms/image-root-cpio.in | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in >> index 0338175a0..546dda7fb 100644 >> --- a/platforms/image-root-cpio.in >> +++ b/platforms/image-root-cpio.in >> @@ -84,7 +84,7 @@ config IMAGE_ROOT_CPIO_COMPRESSION_UTIL >> 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 "xz -T0 --check=crc32" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ >> default "lzop" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP >> >> endif >> -- >> 2.34.1 >> >> >> >
[ptxdist] [PATCH] libkmod: Version bump. 31 -> 32.
Minor fix release. Most interesting bit is that the module directory is now easily changeable. https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/log/?h=v32 * Fix some deprecated options and add another. Signed-off-by: Christian Melki --- rules/libkmod.make | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rules/libkmod.make b/rules/libkmod.make index e89388615..1f7e73d00 100644 --- a/rules/libkmod.make +++ b/rules/libkmod.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod # # Paths and names # -LIBKMOD_VERSION:= 31 -LIBKMOD_MD5:= 6165867e1836d51795a11ea4762ff66a +LIBKMOD_VERSION:= 32 +LIBKMOD_MD5:= 1046fda48766fae905f83150d12eec78 LIBKMOD:= kmod-$(LIBKMOD_VERSION) LIBKMOD_SUFFIX := tar.xz LIBKMOD_URL:= $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX)) @@ -35,17 +35,16 @@ LIBKMOD_CONF_TOOL := autoconf LIBKMOD_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ - --disable-experimental \ --$(call ptx/endis, PTXCONF_LIBKMOD_TOOLS)-tools \ --disable-manpages \ --disable-test-modules \ --$(call ptx/endis, PTXCONF_LIBKMOD_LOGGING)-logging \ --$(call ptx/endis, PTXCONF_LIBKMOD_DEBUG)-debug \ - --disable-python \ --disable-coverage \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ + --$(call ptx/endis, PTXDIST_Y2038)-year2038 \ --$(call ptx/wwo, PTXCONF_LIBKMOD_ZSTD)-zstd \ --without-xz \ --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \ -- 2.34.1
[ptxdist] [PATCH] host-libkmod: Follow target libkmod.
* Configure options changes. Signed-off-by: Christian Melki --- rules/host-libkmod.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make index f95494084..adb42a33a 100644 --- a/rules/host-libkmod.make +++ b/rules/host-libkmod.make @@ -23,14 +23,13 @@ HOST_LIBKMOD_CONF_OPT := \ $(HOST_AUTOCONF) \ --disable-static \ --enable-shared \ - --disable-experimental \ --enable-tools \ --disable-manpages \ --disable-test-modules \ --disable-logging \ --disable-debug \ - --disable-python \ --disable-coverage \ + --enable-year2038 \ --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \ --without-xz \ --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \ -- 2.34.1
[ptxdist] [PATCH] sdl2: Version bump. 2.30.0 -> 2.30.1
Minor bugfix release. https://github.com/libsdl-org/SDL/releases/tag/release-2.30.1 Signed-off-by: Christian Melki --- rules/sdl2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index 64869c4e6..c8cdcf97b 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.30.0 -SDL2_MD5 := 3b0a35e1d794382dcd64d9da93870ea1 +SDL2_VERSION := 2.30.1 +SDL2_MD5 := a28514e50ef4bb5cc2e1e8c70553425d SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX:= tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] hwdata: Version bump. 0.379 -> 0.380.
Usual id updates. Signed-off-by: Christian Melki --- rules/hwdata.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/hwdata.make b/rules/hwdata.make index 6ffcbba70..efd4eec22 100644 --- a/rules/hwdata.make +++ b/rules/hwdata.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata # # Paths and names # -HWDATA_VERSION := 0.379 -HWDATA_MD5 := 2d8d413696545fd889ca3d32b78f64b5 +HWDATA_VERSION := 0.380 +HWDATA_MD5 := 65d190da425b4fc9a38f4fb96b21f56f HWDATA := hwdata-$(HWDATA_VERSION) HWDATA_SUFFIX := tar.gz HWDATA_URL := https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] qemu: Version bump. 8.2.1 -> 8.2.2
Minor changes. https://github.com/qemu/qemu/compare/v8.2.1...v8.2.2 * Move patches forward, applies cleanly. Signed-off-by: Christian Melki --- ...9pfs-allow-real-symlinks-for-security_model-mapped-f.patch | 0 .../0101-let-ninja-use-the-jobserver.patch| 0 patches/{qemu-8.2.1 => qemu-8.2.2}/series | 0 rules/qemu.make | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename patches/{qemu-8.2.1 => qemu-8.2.2}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%) rename patches/{qemu-8.2.1 => qemu-8.2.2}/0101-let-ninja-use-the-jobserver.patch (100%) rename patches/{qemu-8.2.1 => qemu-8.2.2}/series (100%) diff --git a/patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 100% rename from patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch similarity index 100% rename from patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch rename to patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch diff --git a/patches/qemu-8.2.1/series b/patches/qemu-8.2.2/series similarity index 100% rename from patches/qemu-8.2.1/series rename to patches/qemu-8.2.2/series diff --git a/rules/qemu.make b/rules/qemu.make index f3cab4174..19d07a599 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 8.2.1 -QEMU_MD5 := bda54248d773be2599df66f8995f10e1 +QEMU_VERSION := 8.2.2 +QEMU_MD5 := e43091262671c1728b09522932b75b1d QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX:= tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) -- 2.34.1
Re: [ptxdist] [PATCH] xz: add extra URL
Hi Bruno. I bumped xz last week. I think it's hosted on github from now on. https://lore.ptxdist.org/ptxdist/20240225143514.2406777-1-christian.me...@t2data.com/T/#m2a3fe2fdc489cf841e388f18b5f9e38c7ccfa408 On 3/4/24 20:40, Bruno Thomsen wrote: > Add an additional github URL that is currently used. > It will then act as fallback so we don't rely on 302 Found Location > from primary URL. > > Suggested-by: Roland Hieber > Signed-off-by: Bruno Thomsen > --- > rules/xz.make | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/rules/xz.make b/rules/xz.make > index f24a2ac03..969eed4bd 100644 > --- a/rules/xz.make > +++ b/rules/xz.make > @@ -18,7 +18,9 @@ XZ_VERSION := 5.4.4 > XZ_MD5 := fbb849a27e266964aefe26bad508144f > XZ := xz-$(XZ_VERSION) > XZ_SUFFIX:= tar.bz2 > -XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) > +XZ_URL := \ > + https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) \ > + > https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) > XZ_SOURCE:= $(SRCDIR)/$(XZ).$(XZ_SUFFIX) > XZ_DIR := $(BUILDDIR)/$(XZ) > XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND > GPL-3.0-or-later > > base-commit: 6bf08f784b8d41b63ba1d322e79145ad670b09e2
[ptxdist] [PATCH] expat: Version bump. 2.6.0 -> 2.6.1
Minor fixes. https://github.com/libexpat/libexpat/blob/R_2_6_1/expat/Changes Signed-off-by: Christian Melki --- rules/expat.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/expat.make b/rules/expat.make index c40d36ac8..1c5fcf441 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # # Paths and names # -EXPAT_VERSION := 2.6.0 -EXPAT_MD5 := eeb1cf76f51dadebff73fe6aa317ba37 +EXPAT_VERSION := 2.6.1 +EXPAT_MD5 := d83bb2458956aeed4236cf45bff6eccd EXPAT := expat-$(EXPAT_VERSION) EXPAT_SUFFIX := tar.bz2 EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) -- 2.34.1
[ptxdist] [PATCH] pixman: Version bump. 0.43.2 -> 0.43.4
Looks like very minor changes. https://lists.freedesktop.org/archives/pixman/2024-February/005012.html Signed-off-by: Christian Melki --- rules/pixman.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pixman.make b/rules/pixman.make index bc1a97501..5ebbcb059 100644 --- a/rules/pixman.make +++ b/rules/pixman.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman # # Paths and names # -PIXMAN_VERSION := 0.43.2 -PIXMAN_MD5 := 372c47d8c10027d66288fb928ebc4167 +PIXMAN_VERSION := 0.43.4 +PIXMAN_MD5 := ca6767b8056637d690cd17970daf4b18 PIXMAN := pixman-$(PIXMAN_VERSION) PIXMAN_SUFFIX := tar.xz PIXMAN_URL := $(call ptx/mirror, XORG, individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] orc: Version bump. 0.4.37 -> 0.4.38
Minor changes. https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.38/RELEASE Signed-off-by: Christian Melki --- rules/orc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/orc.make b/rules/orc.make index 1c1e1979b..fd3b5bf36 100644 --- a/rules/orc.make +++ b/rules/orc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ORC) += orc # # Paths and names # -ORC_VERSION:= 0.4.37 -ORC_MD5:= de1de1bdd9b35252035a3b996afc9425 +ORC_VERSION:= 0.4.38 +ORC_MD5:= 309ed9f12724e861bed05e8e84e22968 ORC:= orc-$(ORC_VERSION) ORC_SUFFIX := tar.xz ORC_URL:= http://gstreamer.freedesktop.org/data/src/orc/$(ORC).$(ORC_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] pciutils: Version bump. 3.10.0 -> 3.11.1
Minor changes. pcie lane margining utility. This could come in handy if dealing with electrical shenanigans on links with issues. Signed-off-by: Christian Melki --- rules/pciutils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pciutils.make b/rules/pciutils.make index 069c3be4b..f2da15ebe 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils # # Paths and names # -PCIUTILS_VERSION := 3.10.0 -PCIUTILS_MD5 := 701a7e54459ce382d8224afeec1ccb04 +PCIUTILS_VERSION := 3.11.1 +PCIUTILS_MD5 := b97a06ef3944b1a4afdb46ac6d7b8600 PCIUTILS := pciutils-$(PCIUTILS_VERSION) PCIUTILS_SUFFIX:= tar.gz PCIUTILS_URL := https://github.com/pciutils/pciutils/archive/refs/tags/v$(PCIUTILS_VERSION).$(PCIUTILS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libpng: Version bump. 1.6.42 -> 1.6.43.
Minor bugfixes. https://sourceforge.net/p/libpng/code/ci/libpng16/tree/CHANGES Signed-off-by: Christian Melki --- rules/libpng.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpng.make b/rules/libpng.make index 4fe4bb7c3..4a98c02a7 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.6.42 -LIBPNG_MD5 := c580b12b1a8c040b13c35f324a636bb6 +LIBPNG_VERSION := 1.6.43 +LIBPNG_MD5 := 22b8362d16c3724eba9c1fb8d187320a LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.xz LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] image-root-cpio.in: Use multithreaded XZ (revisited).
So, after asking questions about the default multithread mode of xz 5.6.0 and determinism, it turned out that there is a common misconception about determinism in xz. XZ compression varies between the two compressors. Ie, the single thread and multi thread variant. T0 always uses the multithread one, even if used on one core. But T1 uses the singlethread compressor. This has caused a very common misconception about determinism variability with number of threads. I've seen this discussion on a lot of places. So albeit true, it only applies to the distinct compressors, not how many threads are used in multithread mode. Now after giving this some thought I've decided to reenable threaded XZ, using T0. T0 should produce the same results always, on any target. Even unicore machines. And with the multithread compressor now being the default, users should end up with the same results unless they are actively using T1. Signed-off-by: Christian Melki --- platforms/image-root-cpio.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in index 0338175a0..546dda7fb 100644 --- a/platforms/image-root-cpio.in +++ b/platforms/image-root-cpio.in @@ -84,7 +84,7 @@ config IMAGE_ROOT_CPIO_COMPRESSION_UTIL 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 "xz -T0 --check=crc32" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ default "lzop" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP endif -- 2.34.1
[ptxdist] [PATCH] xz: Version bump. 5.4.4 -> 5.6.0
https://github.com/tukaani-project/xz/releases/tag/v5.6.0 https://github.com/tukaani-project/xz/releases/tag/v5.5.2beta https://github.com/tukaani-project/xz/releases/tag/v5.5.1alpha https://github.com/tukaani-project/xz/releases/tag/v5.4.6 https://github.com/tukaani-project/xz/releases/tag/v5.4.5 * License conditions changed! The majority of XZ that was public domain is now re-released under the 0-clause BSD license. Otherwise, the other parts still remains the same. The sum of XZ licensing is pretty complex however. * URL changed. XZ is now hosted on github. * Fix a few options. Signed-off-by: Christian Melki --- rules/xz.make | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/rules/xz.make b/rules/xz.make index f24a2ac03..51490b2ce 100644 --- a/rules/xz.make +++ b/rules/xz.make @@ -14,16 +14,16 @@ PACKAGES-$(PTXCONF_XZ) += xz # # Paths and names # -XZ_VERSION := 5.4.4 -XZ_MD5 := fbb849a27e266964aefe26bad508144f +XZ_VERSION := 5.6.0 +XZ_MD5 := cfb1afdfcfeca02f7677b1b401bc536e XZ := xz-$(XZ_VERSION) -XZ_SUFFIX := tar.bz2 -XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) +XZ_SUFFIX := tar.xz +XZ_URL := https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) XZ_DIR := $(BUILDDIR)/$(XZ) -XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later +XZ_LICENSE := public_domain AND 0BSD AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later XZ_LICENSE_FILES := \ - file://COPYING;md5=c8ea84ebe7b93cce676b54355dc6b2c0 \ + file://COPYING;md5=3ef4de063517b8d33e97bbb87a3339ee \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c @@ -44,6 +44,7 @@ XZ_CONF_OPT := \ --disable-lzip-decoder \ --enable-assembler \ --enable-clmul-crc \ + --enable-arm64-crc32 \ --disable-small \ --enable-threads \ --$(call ptx/endis,PTXCONF_XZ_TOOLS)-xz \ @@ -60,9 +61,11 @@ XZ_CONF_OPT := \ --disable-nls \ --disable-rpath \ $(GLOBAL_LARGE_FILE_OPTION) \ + --enable-ifunc \ --enable-unaligned-access=auto \ --disable-unsafe-type-punning \ - --disable-werror + --disable-werror \ + --$(call ptx/endis, PTXDIST_Y2038)-year2038 # # Target-Install -- 2.34.1
[ptxdist] [PATCH] host-xz: Follow suit from target xz.
* Pin down a few options. Signed-off-by: Christian Melki --- rules/host-xz.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/host-xz.make b/rules/host-xz.make index c04db9567..bc044fcea 100644 --- a/rules/host-xz.make +++ b/rules/host-xz.make @@ -27,6 +27,7 @@ HOST_XZ_CONF_OPT := \ --disable-lzip-decoder \ --enable-assembler \ --enable-clmul-crc \ + --enable-arm64-crc32 \ --disable-small \ --enable-threads \ --enable-xz \ @@ -42,8 +43,10 @@ HOST_XZ_CONF_OPT := \ --enable-symbol-versions \ --disable-nls \ --enable-rpath \ + --enable-ifunc \ --enable-unaligned-access=auto \ --disable-unsafe-type-punning \ - --disable-werror + --disable-werror \ + --enable-year2038 # vim: syntax=make -- 2.34.1
[ptxdist] [PATCH] libunwind: Version bump. 1.8.0 -> 1.8.1
Minor fixes. Tests are installed, but ptxdist builds with tests disabled. So no big changes. https://github.com/libunwind/libunwind/releases/tag/v1.8.1 Signed-off-by: Christian Melki --- rules/libunwind.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libunwind.make b/rules/libunwind.make index b1cd40a58..5eab56e29 100644 --- a/rules/libunwind.make +++ b/rules/libunwind.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBUNWIND) += libunwind # # Paths and names # -LIBUNWIND_VERSION := 1.8.0 -LIBUNWIND_MD5 := c66dabc3d032eee8f4053595af7c31cb +LIBUNWIND_VERSION := 1.8.1 +LIBUNWIND_MD5 := 10c96118ff30b88c9eeb6eac8e75599d LIBUNWIND := libunwind-$(LIBUNWIND_VERSION) LIBUNWIND_SUFFIX := tar.gz LIBUNWIND_URL := https://github.com/libunwind/libunwind/releases/download/v$(LIBUNWIND_VERSION)/$(LIBUNWIND).$(LIBUNWIND_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] linux-fiwmare: Version bump. 20240115 -> 20240220
Pretty substantial bump. New firmwares galore. https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240220 * Add license for Intel Xe Graphics micro Controller (GuC) * Add license for Montage-TSSE crypto accelerator. * Add license for Gen10 Mali GPUs (Panthor) Signed-off-by: Christian Melki --- rules/linux-firmware.make | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make index 180fd6010..69e350d7d 100644 --- a/rules/linux-firmware.make +++ b/rules/linux-firmware.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware # # Paths and names # -LINUX_FIRMWARE_VERSION := 20240115 -LINUX_FIRMWARE_MD5 := c361d22d6eae6325fc163c2589eab427 +LINUX_FIRMWARE_VERSION := 20240220 +LINUX_FIRMWARE_MD5 := cf98535691464e21bb27acff2989cc6f 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)) @@ -28,6 +28,7 @@ LINUX_FIRMWARE_LICENSE:= proprietary LINUX_FIRMWARE_LICENSE_FILES := \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.iwlwifi_firmware;md5=2ce6786e0fc11ac6e36b54bb9b799f1b \ + file://LICENCE.mali_csffw;md5=e064aaec4d21ef856e1b76a6f5dc435f \ file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ file://LICENCE.linaro;md5=936d91e71cf9cd30e733db4bf11661cc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ @@ -38,6 +39,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \ file://LICENSE.ivsc;md5=4f1f696a12c18dd058d3cc51006c640d \ file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ + file://LICENSE.montage;md5=12a9f2b351f60fc9374da61c8b2f11ed \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ @@ -101,6 +103,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ file://LICENSE.amlogic;md5=80e4e3f27def8bc4b232009c3a587c07 \ + file://LICENSE.xe;md5=c674d38774242bc0c528214721488118 \ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ file://wfx/LICENCE.wf200;md5=4d1beff00d902c05c9c7e95a5d8eb52d \ -- 2.34.1
[ptxdist] [PATCH] pcre2: Version bump. 10.42 -> 10.43
Looks like various smaller enhancements and fixes. https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.43 https://github.com/PCRE2Project/pcre2/blob/pcre2-10.43/NEWS https://github.com/PCRE2Project/pcre2/blob/pcre2-10.43/ChangeLog * License hash update. Copyright year changes. Signed-off-by: Christian Melki --- rules/pcre2.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/pcre2.make b/rules/pcre2.make index 6aba2fe92..5d7494d66 100644 --- a/rules/pcre2.make +++ b/rules/pcre2.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_PCRE2) += pcre2 # # Paths and names # -PCRE2_VERSION := 10.42 -PCRE2_MD5 := a8e9ab2935d428a4807461f183034abe +PCRE2_VERSION := 10.43 +PCRE2_MD5 := c8e2043cbc4abb80e76dba323f7c409f PCRE2 := pcre2-$(PCRE2_VERSION) PCRE2_SUFFIX := tar.bz2 PCRE2_URL := https://github.com/PCRE2Project/pcre2/releases/download/$(PCRE2)/$(PCRE2).$(PCRE2_SUFFIX) PCRE2_SOURCE := $(SRCDIR)/$(PCRE2).$(PCRE2_SUFFIX) PCRE2_DIR := $(BUILDDIR)/$(PCRE2) PCRE2_LICENSE := BSD-3-Clause -PCRE2_LICENSE_FILES:= file://LICENCE;md5=41bfb977e4933c506588724ce69bf5d2 +PCRE2_LICENSE_FILES:= file://LICENCE;md5=321a5eb46acae6b6c1ff2c7a866d836a # # Prepare -- 2.34.1
[ptxdist] [PATCH] libffi: Version bump. 3.4.5 -> 3.4.6
Back to back bump. Apparently some regression. Doesn't look very important to me. Oh well. https://github.com/libffi/libffi/releases/tag/v3.4.6 * Forward patches, no changes. Signed-off-by: Christian Melki --- ...libffi-Fix-location-of-libraries-for-multilib-toolch.patch | 0 ...002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch | 0 patches/{libffi-3.4.5 => libffi-3.4.6}/autogen.sh | 0 patches/{libffi-3.4.5 => libffi-3.4.6}/series | 0 rules/libffi.make | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename patches/{libffi-3.4.5 => libffi-3.4.6}/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch (100%) rename patches/{libffi-3.4.5 => libffi-3.4.6}/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch (100%) rename patches/{libffi-3.4.5 => libffi-3.4.6}/autogen.sh (100%) rename patches/{libffi-3.4.5 => libffi-3.4.6}/series (100%) diff --git a/patches/libffi-3.4.5/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch b/patches/libffi-3.4.6/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch similarity index 100% rename from patches/libffi-3.4.5/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch rename to patches/libffi-3.4.6/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch diff --git a/patches/libffi-3.4.5/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch b/patches/libffi-3.4.6/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch similarity index 100% rename from patches/libffi-3.4.5/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch rename to patches/libffi-3.4.6/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch diff --git a/patches/libffi-3.4.5/autogen.sh b/patches/libffi-3.4.6/autogen.sh similarity index 100% rename from patches/libffi-3.4.5/autogen.sh rename to patches/libffi-3.4.6/autogen.sh diff --git a/patches/libffi-3.4.5/series b/patches/libffi-3.4.6/series similarity index 100% rename from patches/libffi-3.4.5/series rename to patches/libffi-3.4.6/series diff --git a/rules/libffi.make b/rules/libffi.make index 97de849bb..df6ca0a5c 100644 --- a/rules/libffi.make +++ b/rules/libffi.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi # # Paths and names # -LIBFFI_VERSION := 3.4.5 -LIBFFI_MD5 := cea8d9ea4dc191481a3d56feb5a80937 +LIBFFI_VERSION := 3.4.6 +LIBFFI_MD5 := b9cac6c5997dca2b3787a59ede34e0eb LIBFFI := libffi-$(LIBFFI_VERSION) LIBFFI_SUFFIX := tar.gz LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] nss: Version bump. 3.97 -> 3.98
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_98.html Plugs CVE: CVE-2023-5388 - Timing attack against RSA decryption in TLS * Forward patchset, applies cleanly. Signed-off-by: Christian Melki --- .../{nss-3.97 => nss-3.98}/0001-nss-fix-nsinstall-build.patch | 0 patches/{nss-3.97 => nss-3.98}/0002-add-nss.pc.in.patch | 0 .../0003-HACK-don-t-build-commands-that-need-zlib.patch | 0 .../0004-HACK-fix-parallel-building-issue.patch | 0 .../0005-fix-dependency-generation.patch | 0 patches/{nss-3.97 => nss-3.98}/series | 0 rules/nss.make| 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename patches/{nss-3.97 => nss-3.98}/0001-nss-fix-nsinstall-build.patch (100%) rename patches/{nss-3.97 => nss-3.98}/0002-add-nss.pc.in.patch (100%) rename patches/{nss-3.97 => nss-3.98}/0003-HACK-don-t-build-commands-that-need-zlib.patch (100%) rename patches/{nss-3.97 => nss-3.98}/0004-HACK-fix-parallel-building-issue.patch (100%) rename patches/{nss-3.97 => nss-3.98}/0005-fix-dependency-generation.patch (100%) rename patches/{nss-3.97 => nss-3.98}/series (100%) diff --git a/patches/nss-3.97/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.98/0001-nss-fix-nsinstall-build.patch similarity index 100% rename from patches/nss-3.97/0001-nss-fix-nsinstall-build.patch rename to patches/nss-3.98/0001-nss-fix-nsinstall-build.patch diff --git a/patches/nss-3.97/0002-add-nss.pc.in.patch b/patches/nss-3.98/0002-add-nss.pc.in.patch similarity index 100% rename from patches/nss-3.97/0002-add-nss.pc.in.patch rename to patches/nss-3.98/0002-add-nss.pc.in.patch diff --git a/patches/nss-3.97/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.98/0003-HACK-don-t-build-commands-that-need-zlib.patch similarity index 100% rename from patches/nss-3.97/0003-HACK-don-t-build-commands-that-need-zlib.patch rename to patches/nss-3.98/0003-HACK-don-t-build-commands-that-need-zlib.patch diff --git a/patches/nss-3.97/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.98/0004-HACK-fix-parallel-building-issue.patch similarity index 100% rename from patches/nss-3.97/0004-HACK-fix-parallel-building-issue.patch rename to patches/nss-3.98/0004-HACK-fix-parallel-building-issue.patch diff --git a/patches/nss-3.97/0005-fix-dependency-generation.patch b/patches/nss-3.98/0005-fix-dependency-generation.patch similarity index 100% rename from patches/nss-3.97/0005-fix-dependency-generation.patch rename to patches/nss-3.98/0005-fix-dependency-generation.patch diff --git a/patches/nss-3.97/series b/patches/nss-3.98/series similarity index 100% rename from patches/nss-3.97/series rename to patches/nss-3.98/series diff --git a/rules/nss.make b/rules/nss.make index 4a7958171..8a0d72500 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss # # Paths and names # -NSS_VERSION:= 3.97 -NSS_MD5:= 66da5ddb30ebf742338d4f7f180fb329 +NSS_VERSION:= 3.98 +NSS_MD5:= 4502fcae1b32da310fffdfb3c67f6985 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) -- 2.34.1
[ptxdist] [PATCH] ca-certificates: Version bump. 3.97 -> 3.98
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_98.html Signed-off-by: Christian Melki --- rules/ca-certificates.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make index 328adbb51..c9a3b 100644 --- a/rules/ca-certificates.make +++ b/rules/ca-certificates.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates # # Paths and names # -CA_CERTIFICATES_VERSION:= NSS_3_97_RTM -CA_CERTIFICATES_MD5:= 0f959b6e7001196c91a06ffe60e80270 +CA_CERTIFICATES_VERSION:= NSS_3_98_RTM +CA_CERTIFICATES_MD5:= c5dc443a649e31ebdb26243bbb5855ad CA_CERTIFICATES:= ca-certificates-$(CA_CERTIFICATES_VERSION) CA_CERTIFICATES_SUFFIX := txt CA_CERTIFICATES_URL:= https://hg.mozilla.org/projects/nss/raw-file/$(CA_CERTIFICATES_VERSION)/lib/ckfw/builtins/certdata.$(CA_CERTIFICATES_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libffi: Version bump. 3.4.4 -> 3.4.5
https://github.com/libffi/libffi/releases/tag/v3.4.5 * License file changed. Dates, years etc. * Forward patches, minor corrections, applies cleanly. Signed-off-by: Christian Melki --- ...bffi-Fix-location-of-libraries-for-multilib-toolch.patch | 2 +- ...2-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch | 4 ++-- patches/{libffi-3.4.4 => libffi-3.4.5}/autogen.sh | 0 patches/{libffi-3.4.4 => libffi-3.4.5}/series | 0 rules/libffi.make | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) rename patches/{libffi-3.4.4 => libffi-3.4.5}/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch (94%) rename patches/{libffi-3.4.4 => libffi-3.4.5}/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch (92%) rename patches/{libffi-3.4.4 => libffi-3.4.5}/autogen.sh (100%) rename patches/{libffi-3.4.4 => libffi-3.4.5}/series (100%) diff --git a/patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch b/patches/libffi-3.4.5/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch similarity index 94% rename from patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch rename to patches/libffi-3.4.5/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch index bad669509..851455713 100644 --- a/patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch +++ b/patches/libffi-3.4.5/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch @@ -10,7 +10,7 @@ Signed-off-by: Christian Melki 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index a4a4887cbb62..cb457fec24db 100644 +index 3de0bea4737d..55b507e021aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ MAKEOVERRIDES= diff --git a/patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch b/patches/libffi-3.4.5/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch similarity index 92% rename from patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch rename to patches/libffi-3.4.5/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch index 7606955f3..fc77ca27b 100644 --- a/patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch +++ b/patches/libffi-3.4.5/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch @@ -19,10 +19,10 @@ Signed-off-by: Ross Burton 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7e8cd98a4ce8..cf37e88bf5f6 100644 +index 741a6690a729..2aa767cb192e 100644 --- a/configure.ac +++ b/configure.ac -@@ -405,7 +405,7 @@ AC_ARG_ENABLE(multi-os-directory, +@@ -401,7 +401,7 @@ AC_ARG_ENABLE(multi-os-directory, # These variables are only ever used when we cross-build to X86_WIN32. # And we only support this with GCC, so... diff --git a/patches/libffi-3.4.4/autogen.sh b/patches/libffi-3.4.5/autogen.sh similarity index 100% rename from patches/libffi-3.4.4/autogen.sh rename to patches/libffi-3.4.5/autogen.sh diff --git a/patches/libffi-3.4.4/series b/patches/libffi-3.4.5/series similarity index 100% rename from patches/libffi-3.4.4/series rename to patches/libffi-3.4.5/series diff --git a/rules/libffi.make b/rules/libffi.make index 064f89f0e..97de849bb 100644 --- a/rules/libffi.make +++ b/rules/libffi.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi # # Paths and names # -LIBFFI_VERSION := 3.4.4 -LIBFFI_MD5 := 0da1a5ed7786ac12dcbaf0d499d8a049 +LIBFFI_VERSION := 3.4.5 +LIBFFI_MD5 := cea8d9ea4dc191481a3d56feb5a80937 LIBFFI := libffi-$(LIBFFI_VERSION) LIBFFI_SUFFIX := tar.gz LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) @@ -26,7 +26,7 @@ LIBFFI_URL:= \ ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX) LIBFFI_LICENSE := MIT LIBFFI_LICENSE_FILES := \ - file://LICENSE;md5=32c0d09a0641daf4903e5d61cc8f23a8 + file://LICENSE;md5=1db54c9fd307a12218766c3c7f650ca7 # # Prepare -- 2.34.1
[ptxdist] [PATCH] host-pkgconf: Version bump. 1.9.5 -> 2.1.1
Another bump to host tools, looks ok. Mostly dependency solver and graphing fixes. Worked in my builds. https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.1/NEWS Signed-off-by: Christian Melki --- rules/host-pkgconf.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-pkgconf.make b/rules/host-pkgconf.make index 43f54ffd5..7cc949078 100644 --- a/rules/host-pkgconf.make +++ b/rules/host-pkgconf.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_PKGCONF) += host-pkgconf # # Paths and names # -HOST_PKGCONF_VERSION := 1.9.5 -HOST_PKGCONF_MD5 := 0a8b69723bef4ebad83e9c8b43a75cc7 +HOST_PKGCONF_VERSION := 2.1.1 +HOST_PKGCONF_MD5 := bc29d74c2483197deb9f1f3b414b7918 HOST_PKGCONF := pkgconf-$(HOST_PKGCONF_VERSION) HOST_PKGCONF_SUFFIX:= tar.xz HOST_PKGCONF_URL := https://distfiles.ariadne.space/pkgconf/$(HOST_PKGCONF).$(HOST_PKGCONF_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] host-cmake: Version bump. 3.27.4 -> 3.28.3
New minor version. Doesn't look dangerous, but tread lightly. https://cmake.org/cmake/help/latest/release/3.27.html https://cmake.org/cmake/help/latest/release/3.28.html * Fix license file hash. Version and year changed in cmzlib. Signed-off-by: Christian Melki --- rules/host-cmake.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/host-cmake.make b/rules/host-cmake.make index fcd6296ab..0d4788f93 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake # # Paths and names # -HOST_CMAKE_VERSION := 3.27.4 -HOST_CMAKE_MD5 := 91639a7c786f33340f07a6e0b2a85ee1 +HOST_CMAKE_VERSION := 3.28.3 +HOST_CMAKE_MD5 := 6b16c82b81e1fd80b63bee9696846b21 HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION) HOST_CMAKE_SUFFIX := tar.gz HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) @@ -35,7 +35,7 @@ HOST_CMAKE_LICENSE_FILES := \ file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \ - file://Utilities/cmzlib/Copyright.txt;md5=e08ebeaec41728215e9137e1d2b4d7cd \ + file://Utilities/cmzlib/Copyright.txt;md5=952d96c4fe88e5ceb8b3a1f9d47b9ec1 \ file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 -- 2.34.1
[ptxdist] [PATCH] host-opkg-utils: Version bump. 0.5.0 -> 0.6.3
https://git.yoctoproject.org/opkg-utils/log/?h=0.6.3 Added acls and xattrs. Not sure they'll be used? Othersise, minor changes. Looks like they're trying to follow the opkg version number. * Rework the patch set. Try to follow the intentions of the previous diff. Signed-off-by: Christian Melki --- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 38 -- ...0100-opkg-build-use-CROSS_COMPILE-ar.patch | 10 ++-- .../0101-Update-Installed-Size-properly.patch | 6 +-- ...xdist-the-maxium-UID-for-system-user.patch | 4 +- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 52 +++ ...pkg-build-fix-typo-in-compressorargs.patch | 4 +- .../series| 0 rules/host-opkg-utils.make| 4 +- 8 files changed, 66 insertions(+), 52 deletions(-) delete mode 100644 patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0100-opkg-build-use-CROSS_COMPILE-ar.patch (59%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0101-Update-Installed-Size-properly.patch (91%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch (95%) create mode 100644 patches/opkg-utils-0.6.3/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0104-opkg-build-fix-typo-in-compressorargs.patch (86%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/series (100%) diff --git a/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index b855eec53..0 --- a/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Michael Olbrich -Date: Sat, 25 Jan 2020 18:28:40 +0100 -Subject: [PATCH] Revert "opkg-build: clamp mtimes to SOURCE_DATE_EPOCH" - -This reverts commit c3cc95693048bdd57a82069bad47abbc72a1932e. - -We set the mtime already in PTXdist so it's not needed and this breaks -building with tar <= 1.28 (e.g. CentOS 7). - -Signed-off-by: Michael Olbrich - opkg-build | 9 + - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/opkg-build b/opkg-build -index 6d6f7e92b919..2fb6216104b6 100755 a/opkg-build -+++ b/opkg-build -@@ -298,18 +298,11 @@ mkdir $tmp_dir - - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" - --mtime_args="" --# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. --# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. --if [ ! -z "$SOURCE_DATE_EPOCH" ]; then --mtime_args="--mtime=@$build_date --clamp-mtime" --fi -- - export LANG=C - export LC_ALL=C - ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) - ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) --( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list - rm $tmp_dir/control_list diff --git a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch similarity index 59% rename from patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch rename to patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch index 9e54dd0ec..556092909 100644 --- a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch +++ b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch @@ -14,15 +14,15 @@ Signed-off-by: Andreas Bießmann 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opkg-build b/opkg-build -index 1b564166a7a4..eca1ee2fa42c 100755 +index 6edd938b8f7e..ef2fbfa42c09 100755 --- a/opkg-build +++ b/opkg-build -@@ -324,7 +324,7 @@ fi +@@ -352,7 +352,7 @@ fi rm -f $pkg_file if [ "$outer" = "ar" ] ; then -- ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) -+ ( cd $tmp_dir && ${CROSS_COMPILE}ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) +- ( cd $tmp_dir && ar -crfD $pkg_file
[ptxdist] [PATCH] opkg: Version bump. 0.6.1 -> 0.6.3
https://git.yoctoproject.org/opkg/log/?h=v0.6.3 Minor changes really. Just bump it so host-opkg follows. Signed-off-by: Christian Melki --- rules/opkg.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/opkg.make b/rules/opkg.make index b4c2d1020..9e80a0494 100644 --- a/rules/opkg.make +++ b/rules/opkg.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPKG) += opkg # # Paths and names # -OPKG_VERSION := 0.6.1 -OPKG_MD5 := d428fe15e9c71f4315ecc8e4588a75b4 +OPKG_VERSION := 0.6.3 +OPKG_MD5 := 8be4d6ec7557c40e7604d37ba33fdd34 OPKG := opkg-$(OPKG_VERSION) OPKG_SUFFIX:= tar.gz OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] expat: Version bump. 2.5.0 -> 2.6.0
https://github.com/libexpat/libexpat/blob/R_2_6_0/expat/Changes Plugs CVEs: CVE-2023-52425 - Fix quadratic runtime issues with big tokens CVE-2023-52426 - Fix billion laughs attacks without XML_DTD Signed-off-by: Christian Melki --- rules/expat.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/expat.make b/rules/expat.make index d12144458..418496b14 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # # Paths and names # -EXPAT_VERSION := 2.5.0 -EXPAT_MD5 := 5e9974d422dc4b157f300568ad28ebf6 +EXPAT_VERSION := 2.6.0 +EXPAT_MD5 := eeb1cf76f51dadebff73fe6aa317ba37 EXPAT := expat-$(EXPAT_VERSION) EXPAT_SUFFIX := tar.bz2 EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) -- 2.34.1
[ptxdist] [PATCH] hwdata: Version bump. 0.378 -> 0.379
Minor updates. Signed-off-by: Christian Melki --- rules/hwdata.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/hwdata.make b/rules/hwdata.make index cf5d7e132..6ffcbba70 100644 --- a/rules/hwdata.make +++ b/rules/hwdata.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata # # Paths and names # -HWDATA_VERSION := 0.378 -HWDATA_MD5 := 14890b995ce88d39b042ca49526c00c6 +HWDATA_VERSION := 0.379 +HWDATA_MD5 := 2d8d413696545fd889ca3d32b78f64b5 HWDATA := hwdata-$(HWDATA_VERSION) HWDATA_SUFFIX := tar.gz HWDATA_URL := https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] orc: Version bump. 0.4.36 -> 0.4.37
Minor fixes. https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.37/RELEASE Signed-off-by: Christian Melki --- rules/orc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/orc.make b/rules/orc.make index 8baa69fc5..1c1e1979b 100644 --- a/rules/orc.make +++ b/rules/orc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ORC) += orc # # Paths and names # -ORC_VERSION:= 0.4.36 -ORC_MD5:= 9f07a8127c62025309ce33196e220ab6 +ORC_VERSION:= 0.4.37 +ORC_MD5:= de1de1bdd9b35252035a3b996afc9425 ORC:= orc-$(ORC_VERSION) ORC_SUFFIX := tar.xz ORC_URL:= http://gstreamer.freedesktop.org/data/src/orc/$(ORC).$(ORC_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] host-makedepend: Version bump. 1.0.8 -> 1.0.9
Minor bugfixes. Autoconf 2.70+. * Code stopped depending on xorgproto. Two macros included in source instead. Fix .in file. Signed-off-by: Christian Melki --- rules/host-makedepend.in | 1 - rules/host-makedepend.make | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/host-makedepend.in b/rules/host-makedepend.in index 803054e89..2afee06df 100644 --- a/rules/host-makedepend.in +++ b/rules/host-makedepend.in @@ -2,5 +2,4 @@ config HOST_MAKEDEPEND tristate - select HOST_XORGPROTO default y if ALLYES diff --git a/rules/host-makedepend.make b/rules/host-makedepend.make index bb1826004..53cf47e47 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.8 -HOST_MAKEDEPEND_MD5:= 6c7a1cc70ba390be51eee5d2408c306a +HOST_MAKEDEPEND_VERSION:= 1.0.9 +HOST_MAKEDEPEND_MD5:= 16dc80a12fb44520057f23b679122ebd HOST_MAKEDEPEND:= makedepend-$(HOST_MAKEDEPEND_VERSION) HOST_MAKEDEPEND_SUFFIX := tar.xz HOST_MAKEDEPEND_URL:= $(call ptx/mirror, XORG, individual/util/$(HOST_MAKEDEPEND).$(HOST_MAKEDEPEND_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] openssl: Version bump. 3.2.0 -> 3.2.1
Minor release, security bugfixes. All low severity. https://www.openssl.org/news/cl32.txt Plugs CVEs: CVE-2024-0727: Fixed PKCS12 Decoding crashes CVE-2023-6237: Fixed excessive time spent checking invalid RSA public keys CVE-2023-6129: Fixed POLY1305 MAC implementation corrupting vector registers on PowerPC CPUs which support PowerISA 2.07. * Remove one patch. Code was added to the release. Signed-off-by: Christian Melki --- ...frag_len-checking-if-no-Max-Fragment.patch | 41 --- .../0001-debian-targets.patch | 0 .../0002-pic.patch| 0 ...to-enable-ktls-if-target-does-not-st.patch | 4 +- ...rialize-allocation-free-of-ssl_names.patch | 0 ...zero-call-used-regs-used-gpr-from-De.patch | 0 .../{openssl-3.2.0 => openssl-3.2.1}/series | 3 +- rules/openssl.make| 4 +- 8 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 patches/openssl-3.2.0/0100-Don-t-apply-max_frag_len-checking-if-no-Max-Fragment.patch rename patches/{openssl-3.2.0 => openssl-3.2.1}/0001-debian-targets.patch (100%) rename patches/{openssl-3.2.0 => openssl-3.2.1}/0002-pic.patch (100%) rename patches/{openssl-3.2.0 => openssl-3.2.1}/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch (96%) rename patches/{openssl-3.2.0 => openssl-3.2.1}/0004-conf-Serialize-allocation-free-of-ssl_names.patch (100%) rename patches/{openssl-3.2.0 => openssl-3.2.1}/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch (100%) rename patches/{openssl-3.2.0 => openssl-3.2.1}/series (73%) diff --git a/patches/openssl-3.2.0/0100-Don-t-apply-max_frag_len-checking-if-no-Max-Fragment.patch b/patches/openssl-3.2.0/0100-Don-t-apply-max_frag_len-checking-if-no-Max-Fragment.patch deleted file mode 100644 index 814bd07be..0 --- a/patches/openssl-3.2.0/0100-Don-t-apply-max_frag_len-checking-if-no-Max-Fragment.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Matt Caswell -Date: Tue, 2 Jan 2024 16:48:43 + -Subject: [PATCH] Don't apply max_frag_len checking if no Max Fragment Length - extension - -Don't check the Max Fragment Length if the it hasn't been negotiated. We -were checking it anyway, and using the default value -(SSL3_RT_MAX_PLAIN_LENGTH). This works in most cases but KTLS can cause the -record length to actually exceed this in some cases. - -Fixes #23169 - ssl/record/methods/tls_common.c | 14 ++ - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c -index 423777c18dd4..1a9320ae74de 100644 a/ssl/record/methods/tls_common.c -+++ b/ssl/record/methods/tls_common.c -@@ -910,11 +910,17 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl) - } - - /* -- * Check if the received packet overflows the current -- * Max Fragment Length setting. -- * Note: rl->max_frag_len > 0 and KTLS are mutually exclusive. -+ * Record overflow checking (e.g. checking if -+ * thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH) is the responsibility of -+ * the post_process_record() function above. However we check here if -+ * the received packet overflows the current Max Fragment Length setting -+ * if there is one. -+ * Note: rl->max_frag_len != SSL3_RT_MAX_PLAIN_LENGTH and KTLS are -+ * mutually exclusive. Also note that with KTLS thisrr->length can -+ * be > SSL3_RT_MAX_PLAIN_LENGTH (and rl->max_frag_len must be ignored) - */ --if (thisrr->length > rl->max_frag_len) { -+if (rl->max_frag_len != SSL3_RT_MAX_PLAIN_LENGTH -+&& thisrr->length > rl->max_frag_len) { - RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW, SSL_R_DATA_LENGTH_TOO_LONG); - goto end; - } diff --git a/patches/openssl-3.2.0/0001-debian-targets.patch b/patches/openssl-3.2.1/0001-debian-targets.patch similarity index 100% rename from patches/openssl-3.2.0/0001-debian-targets.patch rename to patches/openssl-3.2.1/0001-debian-targets.patch diff --git a/patches/openssl-3.2.0/0002-pic.patch b/patches/openssl-3.2.1/0002-pic.patch similarity index 100% rename from patches/openssl-3.2.0/0002-pic.patch rename to patches/openssl-3.2.1/0002-pic.patch diff --git a/patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch b/patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch similarity index 96% rename from patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch rename to patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch index 6275de708..6b518ef22 100644 --- a/patches/openssl-3.2.0/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch +++ b/patches/openssl-3.2.1/0003-Configure-allow-to-enable-ktls-if
[ptxdist] [PATCH] xkeyboard-config: Version bump. 2.40 -> 2.41
Minor fixes, translation updates. Signed-off-by: Christian Melki --- rules/xkeyboard-config.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make index a51065772..50899f715 100644 --- a/rules/xkeyboard-config.make +++ b/rules/xkeyboard-config.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config # # Paths and names # -XKEYBOARD_CONFIG_VERSION := 2.40 -XKEYBOARD_CONFIG_MD5 := 11c8d0ed0f7b604dc5757b7fa1e908d3 +XKEYBOARD_CONFIG_VERSION := 2.41 +XKEYBOARD_CONFIG_MD5 := 2f0b843b5283b82cae0402cbc4f374b4 XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION) XKEYBOARD_CONFIG_SUFFIX:= tar.xz XKEYBOARD_CONFIG_URL := $(call ptx/mirror, XORG, individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX)) -- 2.34.1
Re: [ptxdist] [PATCH] u-boot: Allow specification of padding byte for custom env images
On 2/5/24 21:49, Sebastian Muxel wrote: > [Du f?r inte e-post ofta fr?n sebastian.mu...@entner-electronics.com. L?s om > varf?r det h?r ?r viktigt p? https://aka.ms/LearnAboutSenderIdentification ] > > Hello > >> Just curious. In what situation would you need to alter the default >> padding bytes? 0xff suits most (if not all) NVM types. Flash transition >> layers usually just give an illusion of the traditional zero:ed block on >> flash to block translation? > > I had to tweak it to 0x00 after noticing that the env image generated by > our vendor supplied SDK has specified it in it's make process. Keeping > it at 0xFF wouldn't allow me to generate a firmware image. It could likely > be that it's a hard requirement of their image generation/flashing tool? > I honestly haven't put much further thought into it and assumed it's due > to the way NAND erasure works > 0x0 looks wrong to me w.r.t most flash media. Also not sure I understand why 0xff would stop anything from generating a firmware image? That said, I don't think it matters a lot. It just risks excessive erases the first time a block is written on media that hasn't got a smart(er) FTL. It's really not a common thing to want to change, hence the question. :) For me it's usually the opposite. I want to make sure I don't get fills with anything else than 0xff. > Regards, > Sebastian
Re: [ptxdist] [PATCH] u-boot: Allow specification of padding byte for custom env images
On 2/5/24 21:16, Sebastian Muxel wrote: > [Du får inte e-post ofta från sebastian.mu...@entner-electronics.com. Läs om > varför det här är viktigt på https://aka.ms/LearnAboutSenderIdentification ] > > The env image is currently always padded with the default bytes 0xFF. > New configuration U_BOOT_ENV_IMAGE_CUSTOM_PADDING_BYTES is added > to allow specification for custom env images. > Hi. Just curious. In what situation would you need to alter the default padding bytes? 0xff suits most (if not all) NVM types. Flash transition layers usually just give an illusion of the traditional zero:ed block on flash to block translation? Regards, Christian > Signed-off-by: Sebastian Muxel > --- > platforms/u-boot.in | 9 + > rules/u-boot.make | 1 + > 2 files changed, 10 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 769237081..bcabc8b27 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -131,6 +131,15 @@ config U_BOOT_ENV_IMAGE_CUSTOM_SOURCE > The file should have lines in the form var=value, one per line. > Blank lines and lines starting with a # are ignored. > > +config U_BOOT_ENV_IMAGE_CUSTOM_PADDING_BYTES > + prompt "Bytes used to pad environment image" > + hex > + default "0xFF" > + depends on U_BOOT_ENV_IMAGE_CUSTOM > + help > + Enter the byte used for padding the image to the specified > + U-Boot environment size. > + > if !U_BOOT_ENV_IMAGE_NONE > > config U_BOOT_ENV_IMAGE_SIZE > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 4bc7f3f78..6ef657529 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -123,6 +123,7 @@ ifdef PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM > $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > -o $(U_BOOT_BUILD_DIR)/u-boot-env.img \ > + -p $(PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM_PADDING_BYTES) \ > $(U_BOOT_ENV_IMAGE_CUSTOM_SRC) > endif > @$(call touch) > -- > 2.43.0 > >
[ptxdist] [PATCH] sdl2: Version bump. 2.28.5 -> 2.30.0
Some changes, but interface wise looks ok. Ie mostly fixes and some enhancements. Still (if I got it right), 400+ commits... So something interesting might pop up. https://github.com/libsdl-org/SDL/releases/tag/release-2.30.0 Signed-off-by: Christian Melki --- rules/sdl2.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index 8399c747c..64869c4e6 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.28.5 -SDL2_MD5 := a344eb827a03045c9b399e99af4af13d +SDL2_VERSION := 2.30.0 +SDL2_MD5 := 3b0a35e1d794382dcd64d9da93870ea1 SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX:= tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libpciaccess: Version bump. 0.17 -> 0.18
Some minor bugfixes and a dropped autotools build system. * Convert to meson. * Remove MTRR overrides. Don't think there are x86s without MTRR/PATs this side of the millenia. It should be automatically detected just fine. * Explicitly enable HWDATA dependency. Signed-off-by: Christian Melki --- rules/libpciaccess.in | 16 ++-- rules/libpciaccess.make | 27 --- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/rules/libpciaccess.in b/rules/libpciaccess.in index b6f3e7340..efbd52913 100644 --- a/rules/libpciaccess.in +++ b/rules/libpciaccess.in @@ -3,20 +3,8 @@ menuconfig LIBPCIACCESS tristate prompt "libpciaccess " + select HOST_MESON + select HWDATA help libpciaccess contains low level access functions to be used by the xorg servers and video drivers. - -if LIBPCIACCESS - -config LIBPCIACCESS_MTRR - bool - prompt "MTRR support" - help - You should carefully check if your x86 target CPU supports MTRRs, - and if so enable this menuentry. - BTW: MTRR stands for "memory type range registers" and its used to - optimize accesses to various memory types, like main memory - or memory accessible via buses like video memory on PCI cards. - -endif diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make index fb0b46a8e..7ab035ab5 100644 --- a/rules/libpciaccess.make +++ b/rules/libpciaccess.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess # # Paths and names # -LIBPCIACCESS_VERSION := 0.17 -LIBPCIACCESS_MD5 := 1466cf950c914ad2db1dbb76c9a724db +LIBPCIACCESS_VERSION := 0.18 +LIBPCIACCESS_MD5 := 54f48367e37666f9e0f12571d1ee3620 LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION) LIBPCIACCESS_SUFFIX:= tar.xz LIBPCIACCESS_URL := $(call ptx/mirror, XORG, individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)) @@ -27,26 +27,15 @@ LIBPCIACCESS_LICENSE:= MIT # Prepare # -LIBPCIACCESS_CONF_ENV := $(CROSS_ENV) - -ifdef PTXCONF_LIBPCIACCESS_MTRR -LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=yes -else -LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=no -endif - # -# autoconf +# meson # -LIBPCIACCESS_CONF_TOOL := autoconf +LIBPCIACCESS_CONF_TOOL := meson LIBPCIACCESS_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-selective-werror \ - --disable-strict-compilation \ - --disable-linux-rom-fallback \ - $(GLOBAL_LARGE_FILE_OPTION) \ - --with-pciids-path=/usr/share \ - --without-zlib + $(CROSS_MESON_USR) \ + -Dlinux-rom-fallback=false \ + -Dpci-ids=/usr/share \ + -Dzlib=disabled # # Target-Install -- 2.34.1
[ptxdist] [PATCH] batctl: Version bump. 2023.2 -> 2024.0
Some minor changes. https://github.com/open-mesh-mirror/batman-adv/blob/v2024.0/CHANGELOG.rst Signed-off-by: Christian Melki --- rules/batctl.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/batctl.make b/rules/batctl.make index 8545e4c05..035fa42b1 100644 --- a/rules/batctl.make +++ b/rules/batctl.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BATCTL) += batctl # # Paths and names # -BATCTL_VERSION := 2023.2 -BATCTL_MD5 := 629b5dbf4e35253a0db8a65d99eaec57 +BATCTL_VERSION := 2024.0 +BATCTL_MD5 := be148ec3f668bcf23837035c31bcc3ed BATCTL := batctl-$(BATCTL_VERSION) BATCTL_SUFFIX := tar.gz BATCTL_URL := http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] libpng: Version bump. 1.6.41 -> 1.6.42
Minor bugfix only. https://sourceforge.net/p/libpng/code/ci/libpng16/tree/CHANGES Signed-off-by: Christian Melki --- rules/libpng.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpng.make b/rules/libpng.make index aaada5825..4fe4bb7c3 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.6.41 -LIBPNG_MD5 := 0206c4c8de50793cf6cd0616ec9a17e6 +LIBPNG_VERSION := 1.6.42 +LIBPNG_MD5 := c580b12b1a8c040b13c35f324a636bb6 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.xz LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) -- 2.34.1
[ptxdist] [PATCH] host-tz-database: Version bump. 2023c -> 2024a.
Some internal build changes. And afaict, no mishaps on the most common host platform. https://github.com/eggert/tz/blob/2024a/NEWS https://github.com/eggert/tz/blob/2023d/NEWS Signed-off-by: Christian Melki --- rules/host-tz-database.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make index cf4e04663..a1c4dea32 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:= 2023c +HOST_TZ_DATABASE_VERSION:= 2024a TZCODE_VERSION := $(HOST_TZ_DATABASE_VERSION) -TZCODE_MD5 := 532bcd571bff983447f0596112bbc065 +TZCODE_MD5 := 1a9d670f0b418130503401b8b8f41769 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 := 5aa672bf129b44dd915f8232de38e49a +TZDATA_MD5 := 2349edd8335245525cc082f2755d5bf4 TZDATA := tzdata$(TZDATA_VERSION) TZDATA_SUFFIX := tar.gz TZDATA_URL := \ -- 2.34.1
[ptxdist] [PATCH] libusb: Version bump. 1.0.26 -> 1.0.27
Nothing overly exciting. Some new API calls, will probably replace older ones at some point. https://github.com/libusb/libusb/blob/v1.0.27/ChangeLog * License hash changed. File had copyright year changes. Signed-off-by: Christian Melki --- rules/libusb.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/libusb.make b/rules/libusb.make index 1a8c1ea43..b33657c66 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # # Paths and names # -LIBUSB_VERSION := 1.0.26 -LIBUSB_MD5 := 9c75660dfe1d659387c37b28c91e3160 +LIBUSB_VERSION := 1.0.27 +LIBUSB_MD5 := 1fb61afe370e94f902a67e03eb39c51f LIBUSB := libusb-$(LIBUSB_VERSION) LIBUSB_SUFFIX := tar.bz2 LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX)) @@ -23,7 +23,7 @@ LIBUSB_SOURCE := $(SRCDIR)/$(LIBUSB).$(LIBUSB_SUFFIX) LIBUSB_DIR := $(BUILDDIR)/$(LIBUSB) LIBUSB_LICENSE := LGPL-2.1-or-later LIBUSB_LICENSE_FILES := \ - file://libusb/core.c;startline=2;endline=21;md5=55b8fea5bf37bd5167aa42596e982e0a \ + file://libusb/core.c;startline=2;endline=21;md5=e2bc3b2209f8457532820f1fc033ebec \ file://COPYING;md5=fbc093901857fcd118f065f900982c24 # -- 2.34.1
[ptxdist] [PATCH] efivar: Version bump. 38 -> 39.
Bunch of fixes mostly. https://github.com/rhboot/efivar/releases/tag/39 * Change URL. Ongoing saga with github automatic tarballing vs archive releases. But it looks like this release have yet to be packaged as an archive release. * Remove all patches. Afaict, they have all been fixed in this release. * Disable doc building. Was part of the patches, now has a flag. Signed-off-by: Christian Melki --- ...uild-util.c-separately-for-makeguids.patch | 34 .../0002-docs-Remove-docs-building.patch | 25 - ...0003-fix-building-with-binutils-2.36.patch | 26 - ...x-glibc-2.36-build-mount.h-conflicts.patch | 54 --- patches/efivar-38/series | 7 --- rules/efivar.make | 9 ++-- 6 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch delete mode 100644 patches/efivar-38/0002-docs-Remove-docs-building.patch delete mode 100644 patches/efivar-38/0003-fix-building-with-binutils-2.36.patch delete mode 100644 patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch delete mode 100644 patches/efivar-38/series 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 deleted file mode 100644 index 12db66bfa..0 --- a/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Alexander Kanavin -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 - 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 deleted file mode 100644 index ef34cf96c..0 --- a/patches/efivar-38/0002-docs-Remove-docs-building.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Christian Melki -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 - 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 deleted file mode 100644 index fef499699..0 --- a/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich -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 - 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' ; \ -
[ptxdist] [PATCH] libcurl: Version bump. 8.5.0 -> 8.6.0
The usual. A few enhancements, a bunch of bugfixes. https://curl.se/changes.html#8_6_0 Plugs CVE: CVE-2024-0853: OCSP verification bypass with TLS session reuse * License file changed. Copyright year updates. * Explicitly disable a new option. Signed-off-by: Christian Melki --- rules/libcurl.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/libcurl.make b/rules/libcurl.make index f0c2a74f2..67dc9a634 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION:= 8.5.0 -LIBCURL_MD5:= 3e9e5c2db494e7dbd4e7024b149021c9 +LIBCURL_VERSION:= 8.6.0 +LIBCURL_MD5:= 8f28f7e08c91cc679a45fccf66184fbc LIBCURL:= curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz LIBCURL_URL:= https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_DIR:= $(BUILDDIR)/$(LIBCURL) LIBCURL_LICENSE:= curl -LIBCURL_LICENSE_FILES := file://COPYING;md5=db8448a1e43eb2125f7740fc397db1f6 +LIBCURL_LICENSE_FILES := file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75 # # Prepare @@ -128,6 +128,7 @@ LIBCURL_CONF_OPT:= \ --without-libidn2 \ --without-nghttp2 \ --without-ngtcp2 \ + --without-openssl-quic \ --without-nghttp3 \ --without-quiche \ --without-msh3 \ -- 2.34.1
[ptxdist] [PATCH] qemu: Version bump. 8.1.4 -> 8.2.1
Notable changes, kernel 4.4+, deprecated HAX. I think qemu could use an options cleaning pass at some point. https://wiki.qemu.org/ChangeLog/8.2 * Remove hax option. * Forward patchset. Applies cleanly. Signed-off-by: Christian Melki --- ...pfs-allow-real-symlinks-for-security_model-mapped-f.patch | 0 .../0101-let-ninja-use-the-jobserver.patch | 0 patches/{qemu-8.1.4 => qemu-8.2.1}/series| 0 rules/qemu.make | 5 ++--- 4 files changed, 2 insertions(+), 3 deletions(-) rename patches/{qemu-8.1.4 => qemu-8.2.1}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%) rename patches/{qemu-8.1.4 => qemu-8.2.1}/0101-let-ninja-use-the-jobserver.patch (100%) rename patches/{qemu-8.1.4 => qemu-8.2.1}/series (100%) diff --git a/patches/qemu-8.1.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 100% rename from patches/qemu-8.1.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-8.1.4/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch similarity index 100% rename from patches/qemu-8.1.4/0101-let-ninja-use-the-jobserver.patch rename to patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch diff --git a/patches/qemu-8.1.4/series b/patches/qemu-8.2.1/series similarity index 100% rename from patches/qemu-8.1.4/series rename to patches/qemu-8.2.1/series diff --git a/rules/qemu.make b/rules/qemu.make index 5ad69ee39..f3cab4174 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 8.1.4 -QEMU_MD5 := d5cf54ace6aabd619e89df301aed66e2 +QEMU_VERSION := 8.2.1 +QEMU_MD5 := bda54248d773be2599df66f8995f10e1 QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX:= tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) @@ -105,7 +105,6 @@ QEMU_CONF_OPT := \ --$(call ptx/endis, PTXCONF_QEMU_GTK)-gtk-clipboard \ --disable-guest-agent \ --disable-guest-agent-msi \ - --disable-hax \ --disable-hvf \ --enable-iconv \ --disable-jack \ -- 2.34.1