Merge version 2.31-13+rpi1+deb11u11 and 2.31-13+deb11u12 to produce 2.31-13+rpi1...

diff --cc debian/changelog
index 8b44d1009ebb3815d1ab4aa0ce4e26c0d2359037,14ebe697d4174367db606b8847fca12d80f9980f..6df0a002af52e39dd5e26ba1086f31d60ba975e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,27 @@@
- glibc (2.31-13+rpi1+deb11u11) bullseye-staging; urgency=medium
++glibc (2.31-13+rpi1+deb11u12) bullseye-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 introduced in 2.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
 +  [changes introduced in 2.31-13+rpi1+deb11u3 by Peter Michael Green]
 +  * Change mode on sysdeps/x86_64/configure to 644, same dgit issue
 +    as above.
 + 
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Sep 2024 20:20:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Apr 2025 03:49:23 +0000
++
+ glibc (2.31-13+deb11u12) bullseye-security; urgency=high
+ 
+   * Non-maintainer upload by the LTS Security Team.
+   * debian/patches/local-CVE-2025-0395-{1,2}.diff:
+     Fix buffer overflow in assert() function.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 30 Apr 2025 09:01:35 +0800
  
  glibc (2.31-13+deb11u11) bullseye; urgency=medium