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

diff --cc debian/changelog
index 7296ce5aed164c6a4d4e30dfcb343a34e8ecb9b1,4372b6dac392ed85734c23b24faafb902c84e606..9b6a26c69b7d65ec6e3c21287099ff5ad569a85d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- glibc (2.40-2+rpi1) trixie-staging; urgency=medium
++glibc (2.40-3+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 14 Sep 2024 03:53:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Oct 2024 12:21:08 +0000
++
+ glibc (2.40-3) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/testsuite-xfail-debian.mk: Avoid tests overflowing memory.
+   * debian/testsuite-xfail-debian.mk: Update hurd xfails.
+ 
+   [ Aurelien Jarno ]
+   * debian/rules: build with gcc-14.
+   * debian/control.in/main: adjust g++-for-host version on arm64 to ensure
+     PAC/BTI support.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+   * debian/patches/any/git-iconv-*: backport iconv fixes and improvement from
+     upstream master.  Closes: #328303, #1000652.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 24 Sep 2024 21:46:16 +0200
  
  glibc (2.40-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 05a526c55df165b1e3b46894934db1880dca2c7f,957b6e2cf84dceddbe728e6af6f07c4491a07cc0..e7e950daf09bda6fe948445e08d79b3e96d657f5
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -79,4 -92,11 +79,11 @@@ any/local-bootstrap-headers.dif
  any/local-cudacc-float128.diff
  any/local-test-install.diff
  any/local-cross.patch
 -
+ any/git-iconv-Fix-matching-of-multi-character-transliteratio.patch
+ any/git-iconv-Base-tests-for-buffer-management.patch
+ any/git-iconv-Do-not-use-mmap-in-iconv-the-program-bug-17703.patch
+ any/git-iconv-Preserve-iconv-c-error-exit-on-invalid-inputs-.patch
+ 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
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931

diff --cc debian/rules
index a4ae01a10cfe5649070fe57b16343fad351a32cc,1922d0573ceea443fbf8af9a8c5c2f93476e01f7..95e668db9de26ba653141664506be5db79248c30
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -98,9 -98,9 +98,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 ?= -13
+ DEB_GCC_VERSION ?= -14
  
 -RUN_TESTSUITE = yes
 +RUN_TESTSUITE = no
  TIMEOUTFACTOR = 25
  
  # Set cross and native compiler names, including version.