Manual merge of version 2.36-9+rpi1+deb12u1 and 2.37-12 to produce 2.37-12+rpi1 archive/raspbian/2.37-12+rpi1 raspbian/2.37-12+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 5 Oct 2023 23:16:42 +0000 (23:16 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 5 Oct 2023 23:16:42 +0000 (23:16 +0000)
1  2 
debian/changelog
debian/control
debian/patches/series
debian/rules

index e2836cf2ee14693e07a4cbc298e55097e5bd09c5,c3f116c30845b4b557c2b43e243eb62094a9fef3..2d1580d78df76a468b19819fc0fdbbd8404627a6
@@@ -1,14 -1,7 +1,14 @@@
- glibc (2.36-9+rpi1+deb12u1) bookworm-staging; urgency=medium
++glibc (2.37-12+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
-   [changes brought forward from 2.35-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 02 Oct 2022 17:46:25 +0000]
-   * Remove valgrind breaks.
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Oct 2023 23:15:41 +0000
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2023 06:12:27 +0000
+ glibc (2.37-12) unstable; urgency=critical
  
- glibc (2.36-9+deb12u1) bookworm; urgency=medium
+   [ Samuel Thibault ]
+   * debian/testsuite-xfail-debian.mk: Update xfails for hurd-i386.
  
    [ Aurelien Jarno ]
    * debian/patches/git-updates.diff: update from upstream stable branch:
diff --cc debian/control
index b43c1c29b81c054d7fde4799623889e290fe1c6b,9d3b2dbb927f39c5cf6846e0d6879c177c5fda43..a6a086b47563b144aeaeb2f39aaafecb763df2b7
@@@ -165,12 -163,11 +163,11 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  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.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~)
+ Provides: libc6-sparcv9b [sparc sparc64], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-i686 [i386], libc6.1-alphaev67 [alpha]
 -Breaks: nscd (<< 2.37), locales (<< 2.37), locales-all (<< 2.37), 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~)
++Breaks: nscd (<< 2.37), locales (<< 2.37), locales-all (<< 2.37), 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~)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
-           libc0.1-i686 [kfreebsd-i386],
            libc0.3-i686 [hurd-i386],
            libc6-i686 [i386],
            libc6-x32 [x32],
index 6339bef11019a011ffa2e9387acd6e0856aff9ae,fda6014136e7beeb19231558dbc8922623a1b2b5..f01c44eeb17d344e34c07aef49172d39af003d08
@@@ -13,34 -13,32 +13,26 @@@ localedata/locale-en_DK.dif
  localedata/locale-zh_TW.diff
  localedata/tailor-iso14651_t1.diff
  localedata/submitted-es_MX-decimal_point.diff
 -
  alpha/local-gcc4.1.diff
  alpha/submitted-dl-support.diff
- alpha/local-string-functions.diff
  alpha/submitted-fts64.diff
  alpha/submitted-makecontext.diff
 -
  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.37
- hurd-i386/git-htl-pthread-self-early.diff
- hurd-i386/git-static-pie.diff
- hurd-i386/git-ipv6.diff
- hurd-i386/git-ip_mreqn.diff
- hurd-i386/git-bootstrap-enable_secure.diff
- hurd-i386/git-cond-destroy.diff
- hurd-i386/git-strerror_X.diff
- hurd-i386/git-xpg_strerror.diff
- 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/git-getrandom-chroot.diff
- hurd-i386/git-mach-headers-freestanding.diff
- hurd-i386/git-sem_wait_race.diff
 -
  # 2.38
  hurd-i386/git-intr-msg-cfa.diff
 -
+ hurd-i386/git-intr-msg-stack.diff
+ hurd-i386/git-ctty.diff
+ hurd-i386/git-tst-system.diff
+ hurd-i386/git-task_info_count.diff
 -
+ # 2.39
+ 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/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff
@@@ -64,15 -62,8 +56,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-auxv.diff
- kfreebsd/local-config_h_in.patch
- kfreebsd/local-grantpt.diff
- kfreebsd/local-sysdeps.diff
- kfreebsd/local-fbtl.diff
- kfreebsd/local-fbtl-depends.diff
- kfreebsd/local-scripts.diff
- kfreebsd/local-getaddrinfo-freebsd-kernel.diff
- kfreebsd/local-no-execfn.diff
 -
  m68k/local-dwarf2-buildfix.diff
  m68k/local-reloc.diff
  m68k/submitted-gcc34-seccomment.diff
@@@ -103,6 -97,4 +84,5 @@@ any/local-bootstrap-headers.dif
  any/local-cudacc-float128.diff
  any/local-test-install.diff
  any/local-cross.patch
- any/git-floatn-gcc-13-support.diff
- any/local-disable-tst-bz29951.diff
+ any/git-c-utf-8-language.diff
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931
diff --cc debian/rules
index 83c46ae1eacd5af1f7640d16a16368365feef47c,ffd98138af84ce0d3423b56cc7950ded576cb5e0..2954e37182df27440055356d08a2375537eee204
@@@ -96,9 -96,10 +96,10 @@@ libc_so=$(shell awk 'BEGIN {FS="="} /^l
  BASE_CC = gcc
  BASE_CXX = g++
  BASE_MIG = mig
+ # If you override DEB_GCC_VERSION, consider adding DEB_CFLAGS_APPEND=-Wno-error.
  DEB_GCC_VERSION ?= -12
  
 -RUN_TESTSUITE = yes
 +RUN_TESTSUITE = no
  TIMEOUTFACTOR = 25
  
  # Set cross and native compiler names, including version.