commit 198c02f13750260e0d97c5241f19978ae03e99a2
parent 20d2eb8197ce93981d943c9f5cb9bae8fe08f552
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Thu, 18 Dec 2025 17:18:29 +0000
Downgrade strace 6.17
Diffstat:
8 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -156,3 +156,4 @@ b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014 446032 https://
2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 1172739 https://download.samba.org/pub/rsync/src/rsync-3.4.1.tar.gz
9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5 88530720 https://ftpmirror.gnu.org/gnu/gcc/gcc-13.4.0/gcc-13.4.0.tar.xz
9b607166a1c999d8326098121222feb080a20a3253975fcdfa2de96ba7f757a7 153382068 https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.17.tar.xz
+0a7c7bedc7efc076f3242a0310af2ae63c292a36dd4236f079e88a93e98cb9c0 2682684 https://github.com/strace/strace/releases/download/v6.17/strace-6.17.tar.xz
diff --git a/templates/pkg/strace b/templates/pkg/strace
@@ -1,4 +1,4 @@
-{%- set pkg_version="6.18" -%}
+{%- set pkg_version="6.17" -%}
{%- set pkg_source="tar.xz" -%}
{% extends "autotools_static_mini" %}
{% block package_deps -%}
@@ -11,12 +11,7 @@
patch -p1 <../strace-6.5-static.patch
{% endblock %}
-{%- block configure_args %}--with-unwind --without-libdw --enable-mpers=check --enable-bundled=no{% endblock %}
-{%- block configure %}
-{{- super() -}}
-{# musl headers are full of checks for (undefined in C) __cplusplus defines -#}
-sed -i 's/ -Wundef / -Wno-undef -Wno-parentheses -Wno-system-headers /' Makefile src/Makefile
-{% endblock %}
+{%- block configure_args %}--with-unwind --without-libdw --enable-mpers=check{% endblock %}
{% block check -%}
check_static command/strace
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -80,7 +80,7 @@
#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0
#+ccx-utils.58b905f89ddaacf3b71032cc22edd3774e160a28bedfacc264a1b225817feb51
#+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414
-#+strace.ab61846c743cd47444f13db7a377db427236c1aa3f3377024e093179bfe38fea
+#+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79
#+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1
#+findutils.efdc2b649d6fcaea4f7b4716e770de6197dbc3d02ce14907eeda729116f581e2
#+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -34,7 +34,7 @@
#+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898
#+libunwind.5f67febc687df4ca5120a14e0afdf5be078bef8a499410f9917c35d0c05341af
#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
-#@untar:-J:sha256:0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325:.
+#@untar:-J:sha256:0a7c7bedc7efc076f3242a0310af2ae63c292a36dd4236f079e88a93e98cb9c0:.
# - build script start -
@@ -85,15 +85,14 @@ check_static() {
prefix=/home/ccx/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
-cd 'strace-6.18'
+cd 'strace-6.17'
patch -p1 <../strace-6.5-static.patch
build_env_static
-autotools_config_static --with-unwind --without-libdw --enable-mpers=check --enable-bundled=no
+autotools_config_static --with-unwind --without-libdw --enable-mpers=check
-sed -i 's/ -Wundef / -Wno-undef -Wno-parentheses -Wno-system-headers /' Makefile src/Makefile
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -80,7 +80,7 @@
#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0
#+ccx-utils.58b905f89ddaacf3b71032cc22edd3774e160a28bedfacc264a1b225817feb51
#+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414
-#+strace.ab61846c743cd47444f13db7a377db427236c1aa3f3377024e093179bfe38fea
+#+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79
#+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1
#+findutils.efdc2b649d6fcaea4f7b4716e770de6197dbc3d02ce14907eeda729116f581e2
#+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -80,7 +80,7 @@
#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd
#+ccx-utils.56531a85598867340e810d9b67ada7c585f8125201faf8af0689df70567482c0
#+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816
-#+strace.895a52716e1efe1f50aa4e5dc8ce66376e9273fbcdc0839fe27104aa4cfbc405
+#+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182
#+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5
#+findutils.337df827b790b33c27518f2bf52fb537e3b5756ccdbde9dedfa26f6922395b60
#+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -34,7 +34,7 @@
#+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123
#+libunwind.9d51680da5c5f9dc18d7812efe569f603eae8aaf484c2a23b64d39fce44c4602
#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
-#@untar:-J:sha256:0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325:.
+#@untar:-J:sha256:0a7c7bedc7efc076f3242a0310af2ae63c292a36dd4236f079e88a93e98cb9c0:.
# - build script start -
@@ -85,15 +85,14 @@ check_static() {
prefix=/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
-cd 'strace-6.18'
+cd 'strace-6.17'
patch -p1 <../strace-6.5-static.patch
build_env_static
-autotools_config_static --with-unwind --without-libdw --enable-mpers=check --enable-bundled=no
+autotools_config_static --with-unwind --without-libdw --enable-mpers=check
-sed -i 's/ -Wundef / -Wno-undef -Wno-parentheses -Wno-system-headers /' Makefile src/Makefile
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -80,7 +80,7 @@
#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd
#+ccx-utils.56531a85598867340e810d9b67ada7c585f8125201faf8af0689df70567482c0
#+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816
-#+strace.895a52716e1efe1f50aa4e5dc8ce66376e9273fbcdc0839fe27104aa4cfbc405
+#+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182
#+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5
#+findutils.337df827b790b33c27518f2bf52fb537e3b5756ccdbde9dedfa26f6922395b60
#+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2
