Merge version 2.38-8+rpi1 and 2.38-12 to produce 2.38-12+rpi1

diff --cc debian/changelog
index 69be7b8a3d3fe8871c137f082d3bf0e289440cd6,a656176c1235a346dcde44e1853402f3cabbd7a0..95657e604ce3858d15a6065dc5997e95cd40089b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,60 +1,70 @@@
- glibc (2.38-8+rpi1) trixie-staging; urgency=medium
++glibc (2.38-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.37-12+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 17 Oct 2023 12:00:24 +0000]
 +  * Remove valgrind conflicts.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 May 2024 16:39:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Jun 2024 08:24:46 +0000
++
+ glibc (2.38-12) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/debhelper.in/libc.postinst: do not try to call telinit if it is
+     provided by systemd, it is just broken.  Closes: #1071462.
+   * debian/debhelper.in/libc.postinst: test for $DPKG_ROOT first.
+   * debian/debhelper.in/libc.postinst: emit libc-upgrade trigger on every
+     upgrade and libc-major-upgrade on major glibc upgrade. This interface
+     should be used by depending packages to restart themselves if needed.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+ 
+   [ Dominik Stadler ]
+   * debian/local/usr_sbin/update-locale: improve error reporting in
+    update-locale.  Closes: #1071084.
+ 
+   [ Bjarni Ingi Gislason ]
+   * debian/local/manpages/gencat.1: editorial fixes.  Closes: #1071549.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sat, 01 Jun 2024 23:16:35 +0200
+ 
+ glibc (2.38-11) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/testsuite-xfail-debian.mk: ignore a few math failures due to GCC
+     13 on hppa.  Closes: #1070875.
+   * debian/patches/any/submitted-static-*.diff: add proposed patches to fix
+     various missing math function in libm.a.  Closes: #1070872.
+   * debian/testsuite-xfail-debian.mk: mark tst-support_descriptors as XFAIL,
+     due to sbuild bug #1070003.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sat, 11 May 2024 23:17:18 +0200
+ 
+ glibc (2.38-10) unstable; urgency=medium
+ 
+   * debian/control.in/main, debian/rules.d/control.mk: build-depends on
+     g++$(DEB_GCC_VERSION)-for-host instead of listing cross-build-dependency
+     per architecture. Also depends on g++$(DEB_GCC_VERSION)-multilib instead
+     of hardcoding the version.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Fri, 10 May 2024 17:59:41 +0200
+ 
+ glibc (2.38-9) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/rules: build with gcc-13.
+   * debian/tests/control: re-enable autopkgtest on arm64, the memory
+     consumption should be lower with gcc-13.
+   * debian/testsuite-xfail-debian.mk: remove now fixed riscv64 XFAILs.
+   * debian/debhelper.in/libc-bin.{install,lintian-overrides}: move ldconfig to
+     /usr/sbin.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+ 
+   [ M. Buecher ]
+   * debian/local/usr_sbin/locale-gen: enhance to support referencing locales
+     in /usr/local/share/i18n/locales through copy.  Closes: #1066887
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Fri, 10 May 2024 15:59:00 +0200
  
  glibc (2.38-8) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 04f507677c4c04ed550866512704f684f8232fdc,b046530401ff02b6d34c46ad67c514ea88fc3d0a..7104425ed38916f2786f1e518c5d79c30ee3deca
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -102,4 -119,8 +102,9 @@@ any/local-cross.patc
  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 debian/rules
index 2954e37182df27440055356d08a2375537eee204,ce0de43e0aa7ef5f924c2bf0ff680dcf7823040d..d208bd9b22e8a5f94b779912823c461957121275
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -97,9 -97,9 +97,9 @@@ BASE_CC = gc
  BASE_CXX = g++
  BASE_MIG = mig
  # If you override DEB_GCC_VERSION, consider adding DEB_CFLAGS_APPEND=-Wno-error.
- DEB_GCC_VERSION ?= -12
+ DEB_GCC_VERSION ?= -13
  
 -RUN_TESTSUITE = yes
 +RUN_TESTSUITE = no
  TIMEOUTFACTOR = 25
  
  # Set cross and native compiler names, including version.