Merge version 2.31-13+rpi1+deb11u6 and 2.31-13+deb11u7 to produce 2.31-13+rpi1+deb11u7

diff --cc debian/changelog
index 157c12b7a2d3fbdf0eb937a272a3eaaa42ed96dd,8acd10be499789447380731a5253ffa4c1cfaff7..45a46fd43d9bd01c0b11cf11c0f9735a5dd40ebf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,27 @@@
- glibc (2.31-13+rpi1+deb11u6) bullseye-staging; urgency=medium
++glibc (2.31-13+rpi1+deb11u7) 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.
 + 
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 20 May 2023 09:21:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 04 Oct 2023 15:00:45 +0000
++
+ glibc (2.31-13+deb11u7) bullseye-security; urgency=medium
+ 
+   * debian/patches/any/local-CVE-2023-4911.patch: Fix a buffer overflow in the
+     dynamic loader's processing of the GLIBC_TUNABLES environment variable
+     (CVE-2023-4911).
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Mon, 02 Oct 2023 22:22:57 +0200
  
  glibc (2.31-13+deb11u6) bullseye; urgency=medium