Merge version 2.40-3+rpi1 and 2.40-4 to produce 2.40-4+rpi1

diff --cc debian/changelog
index 9b6a26c69b7d65ec6e3c21287099ff5ad569a85d,cdf5c5ef332fa06362be432d6219054ce85dd245..3b420101a82a2528c9270bb4501cea6cce88255b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,32 @@@
- glibc (2.40-3+rpi1) trixie-staging; urgency=medium
++glibc (2.40-4+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>  Fri, 18 Oct 2024 12:21:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 10 Dec 2024 20:58:13 +0000
++
+ glibc (2.40-4) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/testsuite-xfail-debian.mk: Update hurd xfails.
+   * debian/patches/hurd-i386/git-default_pager.h.diff: Ship
+     mach/default_pager.h again.
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix memory corruption with ancient i386 binaries using stdio. Closes:
+       #1080244.
+     - Fix FTBFS with gcc-14 on hppa.  Closes: #1084052.
+     - Drop debian/patches/sparc/submitted-sparc-clone.diff (merged).
+   * debian/patches/arm/git-hwcap2-constants.diff: backport for upstream to
+     support HWCAP2 values on arm32.  Closes: #1086502.
+   * debian/control: add Recommends: libc-dev (= ${binary:Version}) to
+     libc-devtools.  Closes: #1087881.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sat, 23 Nov 2024 14:57:03 +0100
  
  glibc (2.40-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index e7e950daf09bda6fe948445e08d79b3e96d657f5,8beb25842ba0813f2f76459f2e3eaeef2f0ffc73..de866d7ac9c4fc9954f4198c94bbbaf2ec47a105
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,13 -21,19 +20,15 @@@ alpha/submitted-makecontext.dif
  arm/local-sigaction.diff
  arm/unsubmitted-ldso-multilib.diff
  arm/local-arm-futex.diff
 -
+ arm/git-hwcap2-constants.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/git-default_pager.h.diff
  hurd-i386/local-intr-msg-clobber.diff
- hppa/local-inlining.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff
@@@ -53,10 -61,14 +55,9 @@@ 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
 -
  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