Merge version 2.36-9+rpi1+deb12u1 and 2.36-9+deb12u3 to produce 2.36-9+rpi1+deb12u3

diff --cc debian/changelog
index e2836cf2ee14693e07a4cbc298e55097e5bd09c5,bfc0360fcf9e88125192c4b029e4ec1c76fb367e..9b77ee91c8321027f54f2c8952d26489aadde599
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,26 +1,36 @@@
- glibc (2.36-9+rpi1+deb12u1) bookworm-staging; urgency=medium
++glibc (2.36-9+rpi1+deb12u3) bookworm-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.35-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 02 Oct 2022 17:46:25 +0000]
 +  * Remove valgrind breaks.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2023 06:12:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 04 Oct 2023 15:52:45 +0000
++
+ glibc (2.36-9+deb12u3) bookworm-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>  Sat, 30 Sep 2023 10:31:05 +0200
+ 
+ glibc (2.36-9+deb12u2) bookworm; urgency=medium
+ 
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix the value of F_GETLK/F_SETLK/F_SETLKW with __USE_FILE_OFFSET64 on
+       ppc64el.  Closes: #1050592.
+     - Fix a stack read overflow in getaddrinfo in no-aaaa mode
+       (CVE-2023-4527).  Closes: #1051958.
+     - Fix use after free in getcanonname (CVE-2023-4806, CVE-2023-5156).
+     - Update the x86 cacheinfo code to look at the per-thread L3 cache to
+       determine the non-temporal threshold. This improves memory and string
+       functions on modern CPUs.
+     - Fix _dl_find_object to return correct values even during early startup.
+     - Always call destructors in reverse constructor order.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Thu, 28 Sep 2023 22:50:47 +0200
  
  glibc (2.36-9+deb12u1) bookworm; urgency=medium
  

diff --cc debian/patches/series
index 6339bef11019a011ffa2e9387acd6e0856aff9ae,56ec600c6c64df1deb9ed1dbda2578ac3afa6f46..bbe8307fb08530ab5f64f3322d7b70bb247fde25
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -105,4 -119,4 +105,5 @@@ any/local-test-install.dif
  any/local-cross.patch
  any/git-floatn-gcc-13-support.diff
  any/local-disable-tst-bz29951.diff
+ any/local-CVE-2023-4911.patch
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931