From: Peter Michael Green Date: Sat, 14 Sep 2024 03:54:34 +0000 (+0000) Subject: Manual merge of version 2.38-13+rpi1 and 2.40-2 to produce 2.40-2+rpi1 X-Git-Tag: archive/raspbian/2.40-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=64ea71499a1fc0e3192918cf5e6145492d1bb451;p=glibc.git Manual merge of version 2.38-13+rpi1 and 2.40-2 to produce 2.40-2+rpi1 --- 64ea71499a1fc0e3192918cf5e6145492d1bb451 diff --cc debian/changelog index c5d5a7860,620ac8216..7296ce5ae --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,127 +1,137 @@@ - glibc (2.38-13+rpi1) trixie-staging; urgency=medium ++glibc (2.40-2+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 2.25-2+rpi1 by Peter Michael Green at Wed, 29 Nov 2017 03:00:21 +0000] + * Disable testsuite. + + [changes brought forward from 2.37-12+rpi2 by Peter Michael Green at Tue, 17 Oct 2023 12:00:24 +0000] + * Remove valgrind conflicts. + - -- Raspbian forward porter Fri, 14 Jun 2024 12:29:52 +0000 ++ -- Peter Michael Green Sat, 14 Sep 2024 03:53:53 +0000 ++ + glibc (2.40-2) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/debhelper.in/libc-dev.install.hurd-amd64: Add missing libm-2.39.a. + * debian/patches/hurd-i386/git-tst-aligned-alloc-random-thread{,-mcheck}.diff: + Link threading tests with $(shared-thread-library). + * debian/testsuite-xfail-debian.mk: Avoid tests overflowing memory. + * debian/testsuite-xfail-debian.mk: Update hurd xfails. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch. + + -- Aurelien Jarno Sun, 25 Aug 2024 20:16:17 +0200 + + glibc (2.40-1) experimental; urgency=medium + + [ Aurelien Jarno ] + * New upstream release. + - debian/symbols.wildcards: add 2.40. + - debian/patches/hurd-i386/git-context.diff: upstreamed. + - debian/patches/hurd-i386/git-xattr.diff: upstreamed. + - debian/patches/hurd-i386/git-proc_getchildren_rusage.diff: upstreamed. + - debian/patches/hurd-i386/git-AT_NO_AUTOMOUNT.diff: upstreamed. + - debian/patches/hurd-i386/git-intr-msg-clobber.diff: upstreamed. + - debian/patches/hurd-i386/git-pthread_self.diff: upstreamed. + - debian/patches/hurd-i386/git-pthread_self.2.diff: upstreamed. + - debian/patches/hurd-i386/tg-sysvshm.diff: rebased. + - debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff: rebased. + - debian/patches/hurd-i386/local-exec_filename.diff: rebased. + - debian/patches/all/local-remove-manual.diff: refreshed. + - debian/patches/any/local-cross.patch: refreshed. + - debian/patches/any/git-test-epoll.diff: upstreamed. + + -- Aurelien Jarno Mon, 22 Jul 2024 07:14:59 +0200 + + glibc (2.39-7) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/patches/hurd-i386/git-fault-64bit.diff: Fix receiving exceptions. + * debian/patches/hurd-i386/{tg-sendmsg-SCM_CREDS.diff,tg-ifaddrs_v6.diff}: + Fix build with gcc-14. + * debian/sysdeps/hurd-amd64.mk: Enable mvec. + * debian/libc0.3.symbols.hurd-amd64: Add symbols for libmvec. + * debian/patches/hurd-i386/git-pthread_symbols.diff: Fix missing symbols. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix build with libaudit 4.0. + + -- Aurelien Jarno Wed, 14 Aug 2024 16:06:39 +0200 + + glibc (2.39-6) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fixes elf/check-localplt test on power* with recent binutils. + + -- Aurelien Jarno Tue, 23 Jul 2024 19:09:58 +0200 + + glibc (2.39-5) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/patches/hurd-i386/git-pthread_self{,.2}.diff: Fix pthread_self() + without libpthread. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fixes stdlib/tst-swapcontext2 test on hppa. Closes: #1076512. + * debian/rules.d/tarball.mk: remove useless code. + * debian/sysdeps/arm64.mk: compile with -mbranch-protection=standard on + arm64 to enable PAC/BTI support. Closes: #1063515. + * debian/control.in/main: build-depends on g++13-for-host (>= 13.3.0-3) on + arm64 to ensure PAC/BTI support in GCC. + + -- Aurelien Jarno Mon, 22 Jul 2024 22:58:49 +0200 + + glibc (2.39-4) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - debian/patches/any/submitted-static-copysignf128.diff: upstreamed. + - debian/patches/any/submitted-static-fmod-fmodf.diff: upstreamed. + - debian/patches/any/submitted-static-frexpf128.diff: upstreamed. + - debian/patches/any/submitted-static-isnanf128.diff: upstreamed. + - debian/patches/any/submitted-static-modf128.diff: upstreamed. + - debian/patches/any/submitted-static-exp10.diff: upstreamed. + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update for upcoming 2.40. + * debian/debhelper.in/libc-udeb.install.hurd-amd64: Fix missing libhurduser. + * debian/debhelper.in/libc-udeb.install.hurd-i386: Fix missing libhurduser. + * debian/patches/hurd-i386/git-intr-msg-clobber.diff: Fix restoring message to be retried. + * debian/patches/hurd-i386/local-intr-msg-clobber.diff: Fix message-retry overwrite. + + -- Aurelien Jarno Mon, 15 Jul 2024 21:20:54 +0200 + + glibc (2.39-3.1) experimental; urgency=medium + + * Non-maintainer upload acked by Aurelien Jarno. + * Same diff as the 2.38-12.1 upload to unstable. + * Move all aliased files including the dynamic loader to /usr. (DEP17, + Closes: #1061248) + + Install a protective diversion for the dynamic loader to avoid accidental + deletion (DEP17 P1 M8). + + Manage the dynamic loader symlink via maintainer scripts and triggers + in multilib packages to avoid interaction of Replaces and /usr-move. + + Avoid a versioned dependency on base-files. + - Continue managing toplevel multilib aliasing links for the time being. + - Install protective diversions for aliasing symlinks that base-files + would also install in case libc is upgraded first. (DEP17 P9 M4) + + -- Helmut Grohne Thu, 06 Jun 2024 09:18:03 +0200 + + glibc (2.38-14) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/debhelper.in/libc.postinst: drop code to restart init systems. + Closes: #1074607. + * debian/control.in/libc: add breaks against systemd and sysvinit versions + not using the libc-upgrade trigger. + * debian/control.in/libc: add breaks against base-files version not + providing /usr-merge aliasing symlinks. Closes: #1074368. + + -- Aurelien Jarno Thu, 04 Jul 2024 21:53:20 +0200 glibc (2.38-13) unstable; urgency=medium diff --cc debian/control index a873343fd,6e74b6c5b..185d407b4 --- a/debian/control +++ b/debian/control @@@ -164,7 -165,7 +165,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.38), locales (<< 2.38), locales-all (<< 2.38), 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~), firefox (<< 91~), firefox-esr (<< 91~) -Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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 (<< 3.09-2~), base-files (<< 13.3~) ++Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit (<< 3.09-2~), base-files (<< 13.3~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.3-i686 [hurd-i386], @@@ -236,7 -237,7 +237,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.38), locales (<< 2.38), locales-all (<< 2.38), 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~), firefox (<< 91~), firefox-esr (<< 91~) -Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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 (<< 3.09-2~), base-files (<< 13.3~) ++Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit (<< 3.09-2~), base-files (<< 13.3~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.3-i686 [hurd-i386], @@@ -308,7 -309,7 +309,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.38), locales (<< 2.38), locales-all (<< 2.38), 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~), firefox (<< 91~), firefox-esr (<< 91~) -Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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 (<< 3.09-2~), base-files (<< 13.3~) ++Breaks: nscd (<< 2.40), locales (<< 2.40), locales-all (<< 2.40), 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~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit (<< 3.09-2~), base-files (<< 13.3~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.3-i686 [hurd-i386], diff --cc debian/control.in/libc index 32554a1dd,383290471..50edc585c --- a/debian/control.in/libc +++ b/debian/control.in/libc @@@ -8,7 -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~), firefox (<< 91~), firefox-esr (<< 91~) -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 (<< 3.09-2~), base-files (<< 13.3~) ++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~), firefox (<< 91~), firefox-esr (<< 91~), systemd (<< 256~rc4-1~), sysvinit (<< 3.09-2~), base-files (<< 13.3~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.3-i686 [hurd-i386], diff --cc debian/patches/series index c4834d3a4,5b752fc4a..05a526c55 --- a/debian/patches/series +++ b/debian/patches/series @@@ -20,33 -21,17 +20,13 @@@ alpha/submitted-makecontext.dif arm/local-sigaction.diff arm/unsubmitted-ldso-multilib.diff arm/local-arm-futex.diff - arm64/local-remove-aarch64-bits-math-vector-h.diff - # Committed for 2.39 - hurd-i386/git-realpath_NULL.diff - hurd-i386/git-tst-realpath-toolong.diff - hurd-i386/git-hidden_chk.diff - hurd-i386/git-glob_dirent.diff - hurd-i386/git-powerpc-longjmp.diff - -hppa/local-inlining.diff - + # Committed for 2.41 + hurd-i386/git-fault-64bit.diff + hurd-i386/git-pthread_symbols.diff + hurd-i386/git-tst-aligned-alloc-random-thread.diff + hurd-i386/git-tst-aligned-alloc-random-thread-mcheck.diff - + hurd-i386/local-intr-msg-clobber.diff +hppa/local-inlining.diff - hurd-i386/git-jemalloc.diff - hurd-i386/git-jemalloc2.diff - hurd-i386/git-error_t.diff - hurd-i386/git-tls_dtors.diff - hurd-i386/git-main_stack.diff - hurd-i386/git-ucontext.diff - hurd-i386/git-clean_ports.diff - hurd-i386/git-statfs_f_ffree.patch - hurd-i386/git-send_interrupt.diff - hurd-i386/git-exec-intr.diff - hurd-i386/git-ioctls-bsd.diff - hurd-i386/git-dtable_reauth.diff - hurd-i386/git-64bit-abi.diff - # Committed for 2.40 - hurd-i386/git-context.diff - hurd-i386/git-xattr.diff - # 2.40 - hurd-i386/git-proc_getchildren_rusage.diff - hurd-i386/git-AT_NO_AUTOMOUNT.diff hurd-i386/local-enable-ldconfig.diff hurd-i386/tg-sysvshm.diff hurd-i386/tg-thread-cancel.diff @@@ -73,11 -59,16 +53,10 @@@ i386/local-setcontext-revert-eax-ecx-ed m68k/local-dwarf2-buildfix.diff m68k/local-reloc.diff m68k/submitted-gcc34-seccomment.diff - mips/submitted-rld_map.diff - powerpc/local-powerpc8xx-dcbz.diff - riscv64/git-risc-v-add-support-for-dl_runtime_profile.diff - sh4/local-fpscr_values.diff - sparc/submitted-sparc-clone.diff - all/local-alias-et_EE.diff all/local-remove-manual.diff all/local-ru_RU.diff @@@ -100,12 -92,3 +79,4 @@@ any/local-bootstrap-headers.dif any/local-cudacc-float128.diff any/local-test-install.diff any/local-cross.patch - any/git-c-utf-8-language.diff - any/local-qsort-memory-corruption.patch - any/git-test-epoll.diff - any/submitted-static-copysignf128.diff - any/submitted-static-fmod-fmodf.diff - any/submitted-static-frexpf128.diff - any/submitted-static-isnanf128.diff - any/submitted-static-modf128.diff +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931 diff --cc sysdeps/x86_64/configure index e307467af,231e6ff12..231e6ff12 mode 100644,100755..100644 --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure