From: Peter Michael Green Date: Tue, 20 Dec 2022 13:06:52 +0000 (+0000) Subject: Manual merge of version 2.35-2+rpi1 and 2.36-6 to produce 2.36-6+rpi1 X-Git-Tag: archive/raspbian/2.36-6+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e47086ae5fbe4b5964dfd49d5be18bee092550da;p=glibc.git Manual merge of version 2.35-2+rpi1 and 2.36-6 to produce 2.36-6+rpi1 --- b1265a8d587b4af672392525d4889a8965dbdfa5 diff --cc debian/changelog index aee8e4129,fde7e8644..8b9d9843f --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,134 +1,144 @@@ - glibc (2.35-2+rpi1) bookworm-staging; urgency=medium ++glibc (2.36-6+rpi1) bookworm-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.35-1+rpi2 by Peter Michael Green at Sun, 02 Oct 2022 17:46:25 +0000] + * Remove valgrind breaks. + - -- Peter Michael Green Tue, 11 Oct 2022 17:24:59 +0000 ++ -- Peter Michael Green Tue, 20 Dec 2022 13:06:19 +0000 ++ + glibc (2.36-6) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/debhelper.in/libc-udeb.install: stop installing (now empty) + libutil.so.1, it is not used by any of the udeb in testing/sid. + * debian/rules.d/build.mk: ensure that an empty libanl.a is shipped even on + newly added upstream architectures. + * debian/patches/git-updates.diff: update from upstream stable branch. + + [ Dandan Zhang ] + * debian/sysdeps/loong64.mk: add support for loong64 architecture. Closes: + #1024130. + + [ Helmut Grohne ] + * Declare packages skipped by noudeb build profile. Closes: #1024940. + + -- Aurelien Jarno Mon, 28 Nov 2022 22:26:50 +0100 + + glibc (2.36-5) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/patches/hurd-i386/git-sigtimedwait.diff: Add support for + sigtimedwait and sigwaitinfo. + * debian/testsuite-xfail-debian.mk: Update accordingly. + + [ Aurelien Jarno ] + * debian/sysdeps/sh{3,4}.mk: build with --disable-default-pie. Closes: + #1023554. + * debian/control.in/main: bump binutils build-depends to 2.38. + * debian/control.in/libc: add a Breaks against binutils (<< 2.38). Closes: + #1023661. + * debian/control.in/libc: add a Breaks against check (<< 0.15.2-2+b1) on + s390x. Addresses: #1023531. + * debian/patches/git-updates.diff: update from upstream stable branch. + + -- Aurelien Jarno Sat, 12 Nov 2022 14:23:05 +0100 + + glibc (2.36-4) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix y2038 support in fstatat on mips64el. Closes: #1022991. + + -- Aurelien Jarno Wed, 02 Nov 2022 19:43:41 +0100 + + glibc (2.36-3) unstable; urgency=medium + + [ Aurelien Jarno ] + * Upload to unstable. + * debian/testsuite-xfail-debian.mk: XFAIL malloc/tst-scratch_buffer on hppa. + Closes: #1022771. + * debian/patches/git-updates.diff: update from upstream stable branch. + + -- Aurelien Jarno Tue, 01 Nov 2022 12:41:15 +0100 + + glibc (2.36-2) experimental; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch. + * debian/control.in/main, debian/rules.d/control.mk, debian/rules: build + with GCC 12. + * debian/sysdeps/{amd64,i386,x32}.mk: explicitly pass -Wl,--hash-style=both + to the compiler to workaround the debian toolchain that deviates from the + Generic System V Application Binary and breaks the Easy Anti-Cheat system. + Addresses: #1019535. + + -- Aurelien Jarno Tue, 25 Oct 2022 07:27:10 +0200 + + glibc (2.36-1) experimental; urgency=medium + + [ Aurelien Jarno ] + * New upstream release: + - Support for DT_RELR relative relocation format has been added. Closes: + #996598. + - The Linux kernel version check has been removed. Closes: #781715, #1004577. + - debian/symbols.wildcard: add 2.36 and GLIBC_ABI_DT_RELR. + - debian/patches/localedata/sort-UTF8-first.diff: rebased. + - debian/patches/localedata/supported.diff: rebased. + - debian/patches/arm/unsubmitted-ldso-multilib.diff: rebased. + - debian/patches/hurd-i386/git-spawni-reauth.diff: upstreamed. + - debian/patches/hurd-i386/pthread_key.diff: upstreamed. + - debian/patches/kfreebsd/submitted-waitid.diff: dropped. kfreebsd + specific changes moved to debian/patches/kfreebsd/local-sysdeps.diff. + - debian/patches/kfreebsd/local-config_h_in.patch: rebased. + - debian/patches/kfreebsd/local-getaddrinfo-freebsd-kernel.diff: rebased. + - debian/patches/all/local-remove-manual.diff: rebased. + - debian/patches/any/local-ldso-disable-hwcap.diff: rebased. + - debian/patches/any/unsubmitted-ldso-machine-mismatch.diff: rebased. + - debian/patches/any/submitted-resolv-unaligned.diff: upstreamed. + - debian/patches/hurd-i386/local-fix-nss.diff: rebased. + - debian/patches/hurd-i386/local-no-bootstrap-fs-access.2.diff: rebased. + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update tests results for hurd-i386. + + -- Aurelien Jarno Thu, 22 Sep 2022 22:23:11 +0200 + + glibc (2.35-4) unstable; urgency=medium + + [ Luca Boccassi ] + * debian/debhelper.in/libc.preinst: libc6: create merged-usr symlinks via + preinst script. + + [ Aurelien Jarno ] + * debhelper.in/libc-bin.install, debhelper.in/libc-bin.lintian-overrides, + rules.d/build.mk, rules.d/debhelper.mk: install a /var/cache/ldconfig into + the libc-bin package. Closes: #1021577. + * debian/debhelper.in/libc-bin.lintian-overrides: add an override for the + ld.so manpage, provided by the manpages package. + + [ Samuel Thibault ] + * debian/control.in/libc: Break gnumach versions which don't have the FPU + context switch fix, to try to improve upgrading from 2021. + + -- Aurelien Jarno Tue, 25 Oct 2022 07:23:17 +0200 + + glibc (2.35-3) unstable; urgency=medium + + * debian/patches/arm/git-atomic-compiler-builtins.diff: backport an + upstream patch switching the arm32 atomics to GCC atomic builtins. + This fixes the flaky nptl/tst-rwlock9. Partially addresses: + #1020500. + * debian/control.in/libc: add back the Breaks: on heimdal-multidev + (<= 7.7.0+dfsg-4) to libc6-dev, now that the glibc 2.34 transition + is finished and that the package has transitioned to testing. It has + been temporarily removed in version 2.34-2. + * debian/patches/git-updates.diff: update from upstream stable branch: + - nscd: do not use stale values when a request needs to be resent. + Closes: #1020943, #1021455. + + -- Aurelien Jarno Sun, 09 Oct 2022 10:54:21 +0200 glibc (2.35-2) unstable; urgency=medium diff --cc debian/control index faaab5ebd,de2fa3235..9206d430f --- a/debian/control +++ b/debian/control @@@ -167,7 -167,7 +167,7 @@@ Recommends: libidn2-0 (>= 2.0.5~ Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386], libnss-nis, libnss-nisplus Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386] - Breaks: nscd (<< 2.35), locales (<< 2.35), locales-all (<< 2.35), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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.36), locales (<< 2.36), locales-all (<< 2.36), 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), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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~) ++Breaks: nscd (<< 2.36), locales (<< 2.36), locales-all (<< 2.36), 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), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.1-i686 [kfreebsd-i386], diff --cc debian/control.in/libc index fe833027f,55913d468..51bbf32ee --- 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-i386], libnss-nis, libnss-nisplus Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386] - Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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~) ++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), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), 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~) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc0.1-i686 [kfreebsd-i386], diff --cc debian/patches/series index e5140c35a,7f9ee209c..e7a02f999 --- a/debian/patches/series +++ b/debian/patches/series @@@ -21,10 -22,11 +21,8 @@@ alpha/submitted-makecontext.dif arm/local-sigaction.diff arm/unsubmitted-ldso-multilib.diff arm/local-arm-futex.diff + arm/git-atomic-compiler-builtins.diff - hppa/local-inlining.diff - # 2.36 - hurd-i386/pthread_key.diff - hurd-i386/git-spawni-reauth.diff - # 2.37 hurd-i386/git-htl-pthread-self-early.diff hurd-i386/git-static-pie.diff @@@ -37,6 -39,8 +35,7 @@@ hurd-i386/git-xpg_strerror.dif hurd-i386/git-readlink-fifo.diff hurd-i386/git-net-route.h.diff hurd-i386/git-SOMAXCONN.diff + hurd-i386/git-sigtimedwait.diff - hurd-i386/local-enable-ldconfig.diff hurd-i386/tg-sysvshm.diff hurd-i386/tg-thread-cancel.diff @@@ -60,7 -64,8 +59,6 @@@ hurd-i386/local-stack_chk_guard.dif i386/local-biarch.diff i386/unsubmitted-quiet-ldconfig.diff i386/local-setcontext-revert-eax-ecx-edx.patch - kfreebsd/submitted-waitid.diff - kfreebsd/submitted-auxv.diff kfreebsd/local-config_h_in.patch kfreebsd/local-grantpt.diff diff --cc debian/rules index 581e06d88,6dda9093a..83c46ae1e --- a/debian/rules +++ b/debian/rules @@@ -96,9 -96,9 +96,9 @@@ libc_so=$(shell awk 'BEGIN {FS="="} /^l BASE_CC = gcc BASE_CXX = g++ BASE_MIG = mig - DEB_GCC_VERSION ?= -11 + DEB_GCC_VERSION ?= -12 -RUN_TESTSUITE = yes +RUN_TESTSUITE = no TIMEOUTFACTOR = 25 # Set cross and native compiler names, including version. diff --cc sysdeps/x86_64/configure index d4dd0aa7d,44b6055e5..44b6055e5 mode 100644,100755..100644 --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure