Package: release.debian.org
Severity: normal
X-Debbugs-Cc: gl...@packages.debian.org
Control: affects -1 + src:glibc
User: release.debian....@packages.debian.org
Usertags: unblock
[ Reason ]
The reason that triggered this upload is bug#1108193. In addition this
includes updates from the upstream stable branch, and small hurd
changes.
[ Impact ]
The dist-upgrade process from bookworm to trixie will fail in a
semi-catastrophic way for users having i386 as a foreign architecture.
[ Tests ]
The changes to the maintainer script have been widely tested by Helmut
Grohne and basically tested by me. The changes to the testsuite have
been tested by building the package on amd64 and riscv64.
[ Risks ]
The testsuite improvements do not have any impact on the generated code,
and the hurd and sparc32 changes are only limited to the corresponding
architectures. Therefore on all debian architectures except hurd-amd64,
hurd-i386 and sparc64 (for the sparc32 biarch part), most of the
binaries shipped in the binary packages are identical. The ones that are
not identical basically differ by the debian version number (with a
small shift of code due to adding one digit to the version).
Therefore the only risk is in the libc6's maintainer script and the
Breaks removal. For these the risk is also quite limited given most of
the code in the libc6's maintainer script was there up to version
2.38-13, and the breakage was also not there up to that version. In
addition these changes have been manually tested.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock glibc/2.41-10
diff --git a/debian/changelog b/debian/changelog
index e984b7a6..b02453e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+glibc (2.41-10) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * debian/testsuite-xfail-debian.mk: Update xfails.
+ * debian/patches/hurd-i386/local-pthread_once.diff: Pave the way for 2.42.
+
+ [ Helmut Grohne ]
+ * Partially restore init restarting. (Closes: #1108193)
+
+ [ Aurelien Jarno ]
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - Fix sparc32 Fix argument passing to __libc_start_main
+ - Fix error reporting (false negatives) in SGID tests
+
+ -- Aurelien Jarno <aure...@debian.org> Wed, 16 Jul 2025 08:28:43 +0200
+
glibc (2.41-9) unstable; urgency=medium
[ Aurelien Jarno ]
diff --git a/debian/control b/debian/control
index d74eacbf..1e20f798 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any],
libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686
[i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
-Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit-core (<<
3.09-2~), sysvinit (<< 3.09-2~), base-files (<< 13.3~), openssh-server (<<
1:9.9p1-3+hurd.1) [hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
+Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), sysvinit-core (<< 3.09-2~), sysvinit (<<
3.09-2~), base-files (<< 13.3~), openssh-server (<< 1:9.9p1-3+hurd.1)
[hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
@@ -238,7 +238,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any],
libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686
[i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
-Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit-core (<<
3.09-2~), sysvinit (<< 3.09-2~), base-files (<< 13.3~), openssh-server (<<
1:9.9p1-3+hurd.1) [hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
+Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), sysvinit-core (<< 3.09-2~), sysvinit (<<
3.09-2~), base-files (<< 13.3~), openssh-server (<< 1:9.9p1-3+hurd.1)
[hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
@@ -310,7 +310,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any],
libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686
[i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
-Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit-core (<<
3.09-2~), sysvinit (<< 3.09-2~), base-files (<< 13.3~), openssh-server (<<
1:9.9p1-3+hurd.1) [hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
+Breaks: nscd (<< 2.41), locales (<< 2.41), locales-all (<< 2.41),
gnumach-image-1.8-486 (<< 2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<<
2:1.8+git20210923~), gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), sysvinit-core (<< 3.09-2~), sysvinit (<<
3.09-2~), base-files (<< 13.3~), openssh-server (<< 1:9.9p1-3+hurd.1)
[hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
diff --git a/debian/control.in/libc b/debian/control.in/libc
index fa06ae2b..7f6b3668 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -8,7 +8,7 @@ Recommends: libidn2-0 (>= 2.0.5~)
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-any],
libnss-nis, libnss-nisplus
Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686
[i386]
Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
-Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@),
locales-all (<< @DEB_VERSION_UPSTREAM@), gnumach-image-1.8-486 (<<
2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit-core (<<
3.09-2~), sysvinit (<< 3.09-2~), base-files (<< 13.3~), openssh-server (<<
1:9.9p1-3+hurd.1) [hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
+Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@),
locales-all (<< @DEB_VERSION_UPSTREAM@), gnumach-image-1.8-486 (<<
2:1.8+git20210923~), gnumach-image-1.8-486-dbg (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486 (<< 2:1.8+git20210923~),
gnumach-image-1.8-xen-486-dbg (<< 2:1.8+git20210923~), hurd (<<
1:0.9.git20220301-2), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5),
tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox
(<< 91~), firefox-esr (<< 91~), sysvinit-core (<< 3.09-2~), sysvinit (<<
3.09-2~), base-files (<< 13.3~), openssh-server (<< 1:9.9p1-3+hurd.1)
[hurd-amd64], dhcpcd (<< 1:10.1.0-7~), pd-scaf (<<
1:0.14.1+darcs20180201-6+b4), postgresql-15-pllua (<< 1:2.0.12-4),
postgresql-17-pllua (<< 1:2.0.12-3+b2), librccl1 (<< 5.4.3-3+b1), libamdhip64-5
(<< 5.7.1-5+b1), libhiprtc-builtins5 (<< 5.7.1-5+b1), lua-swupdate (<<
2024.12.1+dfsg-1+b3), libswupdate0.1 (<< 2024.12.1+dfsg-1+b3),
uwsgi-plugin-pypy3 (<< 0.0.2+b1), python3-onnxruntime (<< 1.20.1+dfsg-2~),
libde265-0 (<< 1.0.15-1+b3) [armel armhf], libmad0 (<< 0.15.1b-11+b1) [armel
armhf], libx264-164 (<< 2:0.164.3108+git31e19f9-2+b1) [armel armhf],
doublecmd-gtk (<< 1.1.22-1+b1) [armel armhf], doublecmd-plugins (<<
1.1.22-1+b1) [armel armhf], doublecmd-qt (<< 1.1.22-1+b1) [armel armhf],
libmpeg2-4 (<< 0.5.1-9+b3) [armel armhf], libne10-10t64 (<< 1.2.1-5.1+b2)
[armhf], libpdbg5 (<< 3.5-1+b1) [armel], libopenblas0-openmp (<<
0.3.29+ds-2+b1) [armhf s390x], libopenblas0-pthread (<< 0.3.29+ds-2+b1) [armhf
s390x], libopenblas0-serial (<< 0.3.29+ds-2+b1) [armhf s390x],
libopenblas64-0-openmp (<< 0.3.29+ds-2+b1) [s390x], libopenblas64-0-pthread (<<
0.3.29+ds-2+b1) [s390x], libopenblas64-0-serial (<< 0.3.29+ds-2+b1) [s390x],
libfec0 (<< 1.0-26-gc5d935f-1+b3) [i386], python3-mrgingham (<< 1.25-1),
linux-perf (<< 6.12.16-1) [armel], libqt6webenginecore6 (<< 6.8.2+dfsg-3) [i386]
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.3-i686 [hurd-i386],
diff --git a/debian/debhelper.in/libc.postinst
b/debian/debhelper.in/libc.postinst
index 30c8675c..b5a84a4f 100644
--- a/debian/debhelper.in/libc.postinst
+++ b/debian/debhelper.in/libc.postinst
@@ -147,6 +147,30 @@ then
fi # end upgrading and $preversion lt DEB_VERSION_UPSTREAM
fi # Upgrading
+# begin-remove-after: released:trixie
+ # Restart systemd. Starting with trixie, inits restart themselves via
+ # dpkg-triggers. For inits other than systemd, versioned Breaks have been
+ # declared, but doing so for systemd would create a cycle.
+ if ! command -v systemd >/dev/null; then
+ : # The systemd binary has been moved out of $PATH in trixie.
+ # systemd's trigger interest or its postinst will handle reexecuting.
+ elif [ -n "${DPKG_ROOT:-}" ] || ischroot 2>/dev/null; then
+ : # Do not re-exec init if we are operating on a chroot.
+ elif [ -d /run/systemd/system ]; then
+ # Restart systemd on upgrade, but carefully.
+ # The restart is wanted because of LP: #1942276 and Bug: #993821
+ # The care is needed because of https://bugs.debian.org/753725
+ # (if systemd --help fails the system might still be quite broken but
+ # that seems better than the kernel panic that results if systemd
+ # cannot reexec itself).
+ if command -v systemd >/dev/null; then
+ systemctl daemon-reexec
+ else
+ echo "Error: Could not restart systemd, systemd binary not working"
>&2
+ fi
+ fi
+
+# end-remove-after
# Emit triggers to allow depending packages to restart themselves if
# needed. The triggers are called with "--no-await", as packages with the
# triggers-awaited state do not satisfy dependencies.
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 8d6d023f..f8df40b4 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1321,10 +1321,10 @@ index 0000000000..5eb79eef48
+/* Opening this object should not succeed. */
diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c
new file mode 100644
-index 0000000000..5688b79f2e
+index 0000000000..8aec52e19f
--- /dev/null
+++ b/elf/tst-dlopen-sgid.c
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,106 @@
+/* Test case for ignored LD_LIBRARY_PATH in static startug (bug 32976).
+ Copyright (C) 2025 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -1397,13 +1397,7 @@ index 0000000000..5688b79f2e
+
+ free (libdir);
+
-+ int status = support_capture_subprogram_self_sgid (magic_argument);
-+
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ if (!WIFEXITED (status))
-+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
++ support_capture_subprogram_self_sgid (magic_argument);
+
+ return 0;
+}
@@ -1437,6 +1431,77 @@ index 0000000000..5688b79f2e
+
+#define PREPARE alternative_main
+#include <support/test-driver.c>
+diff --git a/elf/tst-env-setuid-tunables.c b/elf/tst-env-setuid-tunables.c
+index a4233b1727..bfdb30cbd8 100644
+--- a/elf/tst-env-setuid-tunables.c
++++ b/elf/tst-env-setuid-tunables.c
+@@ -105,10 +105,7 @@ do_test (int argc, char **argv)
+
+ if (ret != 0)
+ exit (1);
+-
+- /* Special return code to make sure that the child executed all the way
+- through. */
+- exit (42);
++ return 0;
+ }
+ else
+ {
+@@ -127,18 +124,7 @@ do_test (int argc, char **argv)
+ continue;
+ }
+
+- int status = support_capture_subprogram_self_sgid (buf);
+-
+- /* Bail out early if unsupported. */
+- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+- return EXIT_UNSUPPORTED;
+-
+- if (WEXITSTATUS (status) != 42)
+- {
+- printf (" [%d] child failed with status %d\n", i,
+- WEXITSTATUS (status));
+- support_record_failure ();
+- }
++ support_capture_subprogram_self_sgid (buf);
+ }
+ return 0;
+ }
+diff --git a/elf/tst-env-setuid.c b/elf/tst-env-setuid.c
+index 2c632ed30c..7209acd616 100644
+--- a/elf/tst-env-setuid.c
++++ b/elf/tst-env-setuid.c
+@@ -147,10 +147,7 @@ do_test (int argc, char **argv)
+
+ if (ret != 0)
+ exit (1);
+-
+- /* Special return code to make sure that the child executed all the way
+- through. */
+- exit (42);
++ return 0;
+ }
+ else
+ {
+@@ -174,17 +171,7 @@ do_test (int argc, char **argv)
+ free (profilepath);
+ }
+
+- int status = support_capture_subprogram_self_sgid (SETGID_CHILD);
+-
+- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+- exit (EXIT_UNSUPPORTED);
+-
+- if (WEXITSTATUS (status) != 42)
+- {
+- printf (" child failed with status %d\n",
+- WEXITSTATUS (status));
+- support_record_failure ();
+- }
++ support_capture_subprogram_self_sgid (SETGID_CHILD);
+
+ return 0;
+ }
diff --git a/elf/tst-execstack-prog-static-tunable.c
b/elf/tst-execstack-prog-static-tunable.c
new file mode 100644
index 0000000000..88b0ca1263
@@ -1829,51 +1894,281 @@ index 0000000000..f5f484c83a
+}
+
+#include <support/test-driver.c>
+diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c
+index 3fd1d232be..c12c63aee1 100644
+--- a/stdlib/tst-secure-getenv.c
++++ b/stdlib/tst-secure-getenv.c
+@@ -57,13 +57,7 @@ do_test (void)
+ exit (1);
+ }
+
+- int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
+-
+- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+- return EXIT_UNSUPPORTED;
+-
+- if (!WIFEXITED (status))
+- FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
++ support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
+
+ return 0;
+ }
+@@ -82,6 +76,7 @@ alternative_main (int argc, char **argv)
+ if (secure_getenv ("PATH") != NULL)
+ FAIL_EXIT (4, "PATH variable not filtered out\n");
+
++ support_record_failure_barrier ();
+ exit (EXIT_SUCCESS);
+ }
+ }
diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h
-index 91d75e5d6b..77140430d2 100644
+index 91d75e5d6b..b37462d0d1 100644
--- a/support/capture_subprocess.h
+++ b/support/capture_subprocess.h
-@@ -45,8 +45,7 @@ struct support_capture_subprocess support_capture_subprogram
- /* Copy the running program into a setgid binary and run it with CHILD_ID
- argument. If execution is successful, return the exit status of the child
- program, otherwise return a non-zero failure exit code. */
+@@ -42,11 +42,12 @@ struct support_capture_subprocess
support_capture_subprocess
+ struct support_capture_subprocess support_capture_subprogram
+ (const char *file, char *const argv[], char *const envp[]);
+
+-/* Copy the running program into a setgid binary and run it with CHILD_ID
+- argument. If execution is successful, return the exit status of the child
+- program, otherwise return a non-zero failure exit code. */
-int support_capture_subprogram_self_sgid
- (char *child_id);
-+int support_capture_subprogram_self_sgid (const char *child_id);
++/* Copy the running program into a setgid binary and run it with
++ CHILD_ID argument. If the program exits with a non-zero status,
++ exit with that exit status (or status 1 if the program did not exit
++ normally). If the test cannot be performed, exit with
++ EXIT_UNSUPPORTED. */
++void support_capture_subprogram_self_sgid (const char *child_id);
/* Deallocate the subprocess data captured by
support_capture_subprocess. */
diff --git a/support/support_capture_subprocess.c
b/support/support_capture_subprocess.c
-index c3ef478d17..d99aafd370 100644
+index c3ef478d17..b4e4bf9502 100644
--- a/support/support_capture_subprocess.c
+++ b/support/support_capture_subprocess.c
-@@ -110,7 +110,7 @@ support_capture_subprogram (const char *file, char *const
argv[],
+@@ -21,12 +21,17 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#include <grp.h>
++#include <scratch_buffer.h>
++#include <stdio_ext.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/xunistd.h>
+ #include <support/xsocket.h>
+ #include <support/xspawn.h>
+ #include <support/support.h>
++#include <support/temp_file.h>
+ #include <support/test-driver.h>
+
+ static void
+@@ -109,111 +114,88 @@ support_capture_subprogram (const char *file, char
*const argv[],
+ /* Copies the executable into a restricted directory, so that we can
safely make it SGID with the TARGET group ID. Then runs the
executable. */
- static int
+-static int
-copy_and_spawn_sgid (char *child_id, gid_t gid)
++static void
+copy_and_spawn_sgid (const char *child_id, gid_t gid)
{
- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
- test_dir, (intmax_t) getpid ());
-@@ -182,7 +182,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid)
- ret = 0;
- infd = outfd = -1;
+- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
+- test_dir, (intmax_t) getpid ());
++ char *dirname = support_create_temp_directory ("tst-glibc-sgid-");
+ char *execname = xasprintf ("%s/bin", dirname);
+- int infd = -1;
+- int outfd = -1;
+- int ret = 1, status = 1;
+-
+- TEST_VERIFY (mkdir (dirname, 0700) == 0);
+- if (support_record_failure_is_failed ())
+- goto err;
++ add_temp_file (execname);
+
+- infd = open ("/proc/self/exe", O_RDONLY);
+- if (infd < 0)
++ if (access ("/proc/self/exe", R_OK) != 0)
+ FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n");
+
+- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
+- TEST_VERIFY (outfd >= 0);
+- if (support_record_failure_is_failed ())
+- goto err;
+-
+- char buf[4096];
+- for (;;)
+- {
+- ssize_t rdcount = read (infd, buf, sizeof (buf));
+- TEST_VERIFY (rdcount >= 0);
+- if (support_record_failure_is_failed ())
+- goto err;
+- if (rdcount == 0)
+- break;
+- char *p = buf;
+- char *end = buf + rdcount;
+- while (p != end)
+- {
+- ssize_t wrcount = write (outfd, buf, end - p);
+- if (wrcount == 0)
+- errno = ENOSPC;
+- TEST_VERIFY (wrcount > 0);
+- if (support_record_failure_is_failed ())
+- goto err;
+- p += wrcount;
+- }
+- }
++ support_copy_file ("/proc/self/exe", execname);
+
+- bool chowned = false;
+- TEST_VERIFY ((chowned = fchown (outfd, getuid (), gid) == 0)
+- || errno == EPERM);
+- if (support_record_failure_is_failed ())
+- goto err;
+- else if (!chowned)
+- {
+- ret = 77;
+- goto err;
+- }
++ if (chown (execname, getuid (), gid) != 0)
++ FAIL_UNSUPPORTED ("cannot change group of \"%s\" to %jd: %m",
++ execname, (intmax_t) gid);
+
+- TEST_VERIFY (fchmod (outfd, 02750) == 0);
+- if (support_record_failure_is_failed ())
+- goto err;
+- TEST_VERIFY (close (outfd) == 0);
+- if (support_record_failure_is_failed ())
+- goto err;
+- TEST_VERIFY (close (infd) == 0);
+- if (support_record_failure_is_failed ())
+- goto err;
++ if (chmod (execname, 02750) != 0)
++ FAIL_UNSUPPORTED ("cannot make \"%s\" SGID: %m ", execname);
+
+ /* We have the binary, now spawn the subprocess. Avoid using
+ support_subprogram because we only want the program exit status, not the
+ contents. */
+- ret = 0;
+- infd = outfd = -1;
- char * const args[] = {execname, child_id, NULL};
+ char * const args[] = {execname, (char *) child_id, NULL};
-
- status = support_subprogram_wait (args[0], args);
-
-@@ -211,7 +211,7 @@ err:
++ int status = support_subprogram_wait (args[0], args);
+
+- status = support_subprogram_wait (args[0], args);
++ free (execname);
++ free (dirname);
+
+-err:
+- if (outfd >= 0)
+- close (outfd);
+- if (infd >= 0)
+- close (infd);
+- if (execname != NULL)
++ if (WIFEXITED (status))
+ {
+- unlink (execname);
+- free (execname);
++ if (WEXITSTATUS (status) == 0)
++ return;
++ else
++ exit (WEXITSTATUS (status));
+ }
+- if (dirname != NULL)
++ else
++ FAIL_EXIT1 ("subprogram failed with status %d", status);
++}
++
++/* Returns true if a group with NAME has been found, and writes its
++ GID to *TARGET. */
++static bool
++find_sgid_group (gid_t *target, const char *name)
++{
++ /* Do not use getgrname_r because it does not work in statically
++ linked binaries if the system libc is different. */
++ FILE *fp = fopen ("/etc/group", "rce");
++ if (fp == NULL)
++ return false;
++ __fsetlocking (fp, FSETLOCKING_BYCALLER);
++
++ bool ok = false;
++ struct scratch_buffer buf;
++ scratch_buffer_init (&buf);
++ while (true)
+ {
+- rmdir (dirname);
+- free (dirname);
++ struct group grp;
++ struct group *result = NULL;
++ int status = fgetgrent_r (fp, &grp, buf.data, buf.length, &result);
++ if (status == 0 && result != NULL)
++ {
++ if (strcmp (result->gr_name, name) == 0)
++ {
++ *target = result->gr_gid;
++ ok = true;
++ break;
++ }
++ }
++ else if (errno != ERANGE)
++ break;
++ else if (!scratch_buffer_grow (&buf))
++ break;
+ }
+-
+- if (ret == 77)
+- FAIL_UNSUPPORTED ("Failed to make sgid executable for test\n");
+- if (ret != 0)
+- FAIL_EXIT1 ("Failed to make sgid executable for test\n");
+-
+- return status;
++ scratch_buffer_free (&buf);
++ fclose (fp);
++ return ok;
}
- int
+-int
-support_capture_subprogram_self_sgid (char *child_id)
++void
+support_capture_subprogram_self_sgid (const char *child_id)
{
- gid_t target = 0;
+- gid_t target = 0;
const int count = 64;
+ gid_t groups[count];
+
+@@ -225,6 +207,7 @@ support_capture_subprogram_self_sgid (char *child_id)
+ (intmax_t) getuid ());
+
+ gid_t current = getgid ();
++ gid_t target = current;
+ for (int i = 0; i < ret; ++i)
+ {
+ if (groups[i] != current)
+@@ -234,11 +217,18 @@ support_capture_subprogram_self_sgid (char *child_id)
+ }
+ }
+
+- if (target == 0)
+- FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
+- (intmax_t) getuid ());
++ if (target == current)
++ {
++ /* If running as root, try to find a harmless group for SGID. */
++ if (getuid () != 0
++ || (!find_sgid_group (&target, "nogroup")
++ && !find_sgid_group (&target, "bin")
++ && !find_sgid_group (&target, "daemon")))
++ FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
++ (intmax_t) getuid ());
++ }
+
+- return copy_and_spawn_sgid (child_id, target);
++ copy_and_spawn_sgid (child_id, target);
+ }
+
+ void
diff --git a/sysdeps/aarch64/fpu/asinh_sve.c b/sysdeps/aarch64/fpu/asinh_sve.c
index 0889f79dbb..ff6b71390c 100644
--- a/sysdeps/aarch64/fpu/asinh_sve.c
@@ -4731,10 +5026,34 @@ index a30892f080..dcc3e0883b 100644
return lazy;
}
diff --git a/sysdeps/sparc/sparc32/start.S b/sysdeps/sparc/sparc32/start.S
-index 694b020ce0..cef7c96cac 100644
+index 694b020ce0..8393760da6 100644
--- a/sysdeps/sparc/sparc32/start.S
+++ b/sysdeps/sparc/sparc32/start.S
-@@ -73,6 +73,10 @@ _start:
+@@ -35,6 +35,7 @@
+
+ #include <sysdep.h>
+
++#define FRAME_SIZE 104
+
+ .section ".text"
+ .align 4
+@@ -48,12 +49,12 @@ _start:
+ /* Terminate the stack frame, and reserve space for functions to
+ drop their arguments. */
+ mov %g0, %fp
+- sub %sp, 6*4, %sp
++ sub %sp, FRAME_SIZE, %sp
+
+ /* Extract the arguments and environment as encoded on the stack. The
+ argument info starts after one register window (16 words) past the SP.
*/
+- ld [%sp+22*4], %o1
+- add %sp, 23*4, %o2
++ ld [%sp+168], %o1
++ add %sp, 172, %o2
+
+ /* Load the addresses of the user entry points. */
+ #ifndef PIC
+@@ -73,6 +74,10 @@ _start:
be NULL. */
mov %g1, %o5
diff --git a/debian/patches/hurd-i386/local-pthread_once-2.42.diff
b/debian/patches/hurd-i386/local-pthread_once-2.42.diff
new file mode 100644
index 00000000..716ebb08
--- /dev/null
+++ b/debian/patches/hurd-i386/local-pthread_once-2.42.diff
@@ -0,0 +1,52 @@
+Note: Keep the 2.41 symbol until we rebuild packages against the 2.42
+symbol.
+
+Index: glibc-upstream/sysdeps/htl/pt-once.c
+===================================================================
+--- glibc-upstream.orig/sysdeps/htl/pt-once.c
++++ glibc-upstream/sysdeps/htl/pt-once.c
+@@ -58,5 +58,8 @@ libc_hidden_def (__pthread_once)
+ versioned_symbol (libc, __pthread_once, pthread_once, GLIBC_2_42);
+
+ #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
++compat_symbol (libpthread, __pthread_once, pthread_once, GLIBC_2_41);
++#endif
++#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+ compat_symbol (libpthread, __pthread_once, pthread_once, GLIBC_2_12);
+ #endif
+Index: glibc-upstream/sysdeps/mach/hurd/i386/libc.abilist
+===================================================================
+--- glibc-upstream.orig/sysdeps/mach/hurd/i386/libc.abilist
++++ glibc-upstream/sysdeps/mach/hurd/i386/libc.abilist
+@@ -2588,6 +2588,7 @@ GLIBC_2.41 pthread_mutexattr_setpshared
+ GLIBC_2.41 pthread_mutexattr_setrobust F
+ GLIBC_2.41 pthread_mutexattr_setrobust_np F
+ GLIBC_2.41 pthread_mutexattr_settype F
++GLIBC_2.41 pthread_once F
+ GLIBC_2.41 pthread_sigmask F
+ GLIBC_2.42 __inet_ntop_chk F
+ GLIBC_2.42 __inet_pton_chk F
+Index: glibc-upstream/sysdeps/mach/hurd/x86_64/libc.abilist
+===================================================================
+--- glibc-upstream.orig/sysdeps/mach/hurd/x86_64/libc.abilist
++++ glibc-upstream/sysdeps/mach/hurd/x86_64/libc.abilist
+@@ -2271,6 +2271,7 @@ GLIBC_2.41 pthread_mutexattr_setpshared
+ GLIBC_2.41 pthread_mutexattr_setrobust F
+ GLIBC_2.41 pthread_mutexattr_setrobust_np F
+ GLIBC_2.41 pthread_mutexattr_settype F
++GLIBC_2.41 pthread_once F
+ GLIBC_2.41 pthread_sigmask F
+ GLIBC_2.42 __inet_ntop_chk F
+ GLIBC_2.42 __inet_pton_chk F
+Index: glibc-upstream/htl/Versions
+===================================================================
+--- glibc-upstream.orig/htl/Versions
++++ glibc-upstream/htl/Versions
+@@ -148,6 +148,7 @@ libc {
+ pthread_mutexattr_setpshared;
+ pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
+ pthread_mutexattr_settype;
++ pthread_once;
+ pthread_sigmask;
+ }
+
diff --git a/debian/patches/hurd-i386/local-pthread_once.diff
b/debian/patches/hurd-i386/local-pthread_once.diff
index 0d9f527f..532efd4f 100644
--- a/debian/patches/hurd-i386/local-pthread_once.diff
+++ b/debian/patches/hurd-i386/local-pthread_once.diff
@@ -1,6 +1,8 @@
Note: compared to upstream, this was changed to exposing pthread_once as
version
2.41. When 2.42 gets integrated, we'll want to keep the 2.41 symbol until we
-rebuild packages against the 2.42 symbol.
+rebuild packages against the 2.42 symbol. This is done by
+local-pthread_once-2.42.diff which is to be used instead of
+local-pthread_once.diff in 2.42
commit ccdb68e829a31e4cda8339ea0d2dc3e51fb81ba5
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index 99fd1224..bbd894ca 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -393,8 +393,6 @@ test-xfail-tst-initgroups2 = yes
test-xfail-tst-sprintf-fortify-rdonly = yes
test-xfail-tst-plt-rewrite1 = yes
test-xfail-tst-tunables = yes
-test-xfail-tst-cancel11 = yes
-test-xfail-tst-cancelx11 = yes
test-xfail-tst-mremap1 = yes
test-xfail-tst-mremap2 = yes
@@ -406,8 +404,6 @@ test-xfail-tst-malloc-alternate-path-malloc-hugetlb1 = yes
test-xfail-tst-malloc-alternate-path-malloc-hugetlb2 = yes
test-xfail-tst-malloc-alternate-path-mcheck = yes
test-xfail-tst-shutdown = yes
-test-xfail-tst-dlopen-tlsreinit3 = yes
-test-xfail-tst-dlopen-tlsreinit4 = yes
test-xfail-tst-truncate64 = yes
# new in 2.41
@@ -434,6 +430,15 @@ test-xfail-tst-audit12 = yes
test-xfail-tst-audit28 = yes
test-xfail-tst-execstack-prog-static-tunable = yes
+# new in 2.42
+test-xfail-tst-qsort7-mem = yes
+test-xfail-tst-qsortx7-mem = yes
+test-xfail-tst-fclose-devzero = yes
+test-xfail-tst-malloc-tcache-leak-malloc-largetcache = yes
+test-xfail-tst-malloc-too-large-malloc-largetcache = yes
+test-xfail-tst-mallocfork2-malloc-largetcache = yes
+test-xfail-tst-malloc-alternate-path-malloc-largetcache = yes
+
# actually never succeded
test-xfail-tst-create_format1 = yes
test-xfail-tst-getcwd-abspath = yes
