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

diff --cc debian/changelog
index 3b420101a82a2528c9270bb4501cea6cce88255b,6461e434be7ddc2fd8ae2816ecfee2b6921841ed..0aa87c9f8ba99f93b4881689aa5599e61f9aa514
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,31 +1,41 @@@
- glibc (2.40-4+rpi1) trixie-staging; urgency=medium
++glibc (2.40-5+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>  Tue, 10 Dec 2024 20:58:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 15:04:05 +0000
++
+ glibc (2.40-5) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/patches/hurd-i386/git-MAP_NORESERVE.diff: Add MAP_NORESERVE flag.
+   * debian/patches/hurd-i386/git-signal-reply-port.diff: Fix hurd build
+     against gcc 14.
+ 
+   [ Bjarni Ingi Gislason ]
+   * debian/local/manpages/update-locale.8: fix issues reported by troff.
+     Closes: #1088003.
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/any/git-iconv-do-not-report-*.patch: backport iconv return
+     code with transliteration fix from upstream.  Closes: #1087670.
+   * debian/debhelper.in/locales.templates: add a note to clarify that the C,
+     C.UTF-8 and POSIX locales do not need to be generated.  Closes: #1091473.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+   * patches/any/git-posix-fix-system-when-a-child-cannot-be-created-BZ-3.patch:
+     backport patch from upstream to fix return value of system() when a child
+     process cannot be created.  Closes: #1088964.
+   * debian/rules.d/debhelper.mk: explicitly pass the library path to
+     dh_shlibdeps for multilib packages, to fix a FTBFS with rebootstrap which
+     does not install the g++-XX-multilib build-dependency.  Closes: #1088166.
+ 
+   [ Carles Pina i Estany ]
+   * Update Catalan debconf translation.  Closes: #1091705.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Fri, 03 Jan 2025 11:56:38 +0100
  
  glibc (2.40-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index de866d7ac9c4fc9954f4198c94bbbaf2ec47a105,f56823cc3bc9c79cb328df1e3c26685e44899bda..990149a9c46e3c78d26127f6cd6d16a7a4742ec7
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -28,6 -32,9 +28,8 @@@ hurd-i386/git-pthread_symbols.dif
  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/git-MAP_NORESERVE.diff
+ hurd-i386/git-signal-reply-port.diff
  hurd-i386/local-intr-msg-clobber.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
@@@ -87,4 -102,5 +89,6 @@@ any/git-iconv-Preserve-iconv-c-error-ex
  any/git-iconv-Support-in-place-conversions-bug-10460-bug-320.patch
  any/git-iconv-Multiple-on-command-line-should-not-fail-bug-3.patch
  any/git-iconv-Input-buffering-for-the-iconv-program-bug-6050.patch
+ any/git-iconv-do-not-report-error-exit-with-transliteration-.patch
+ any/git-posix-fix-system-when-a-child-cannot-be-created-BZ-3.patch
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931