Merge version 2.37-13+rpi1 and 2.37-15~deb13u1 to produce 2.37-15~deb13u1+rpi1

diff --cc debian/changelog
index 3973f172e82ba649a4a338cf4a91cc277ac72874,e8391ef7d1b298c948e9d8a53457f71f9cb333be..5dad0e83f455d7378be404e8b93b96cd7a908c26
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,44 @@@
- glibc (2.37-13+rpi1) trixie-staging; urgency=medium
++glibc (2.37-15~deb13u1+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>  Sat, 06 Jan 2024 17:03:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 18:25:17 +0000
++
+ glibc (2.37-15~deb13u1) trixie; urgency=medium
+ 
+   * Rebuild for trixie.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Wed, 31 Jan 2024 21:45:37 +0100
+ 
+ glibc (2.37-15) unstable; urgency=critical
+ 
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix a heap buffer overflow in __vsyslog_internal (CVE-2023-6246).
+     - Fix an off-by-one heap buffer overflow in __vsyslog_internal
+       (CVE-2023-6779).
+     - Fix an integer overflow in __vsyslog_internal (CVE-2023-6780).
+   * debian/patches/any/local-qsort-memory-corruption.patch: Fix a memory
+     corruption in qsort() when using nontransitive comparison functions.
+   * Set urgency to critical given the security issues.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 30 Jan 2024 19:20:04 +0100
+ 
+ glibc (2.37-14) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/debhelper.in/locales.config: always ask for the default locale,
+     even if none are generated. This enables choosing C.UTF-8 as the default
+     locale.  Closes: #1060288.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+   * debian/tests/control: disable autopkgtest on arm64, as the debci runners
+     to do not have enough resources for some of the tests anymore.  Closes:
+     #1060202.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 23 Jan 2024 07:13:18 +0100
  
  glibc (2.37-13) unstable; urgency=medium
  

diff --cc debian/patches/series
index 1ac9341f4bf4345e437b4bd8e656b152ef07f7db,0146e0ea3cd94ec751008f54d5d441a968ad8381..b3cd1430eca15710d41b32ccf547ef15225a5857
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -90,4 -103,4 +90,5 @@@ any/local-cudacc-float128.dif
  any/local-test-install.diff
  any/local-cross.patch
  any/git-c-utf-8-language.diff
+ any/local-qsort-memory-corruption.patch
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931