Merge version 2.36-6+rpi1 and 2.36-7 to produce 2.36-7+rpi1

diff --cc debian/changelog
index 8b9d9843fbb50c57c4dab46500ee5bc8f16f20ee,5df4ae474dd571c1ae450048495237957e0ef56c..19c425003eb2d7bf7d65203d853077f78f747a82
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,35 +1,45 @@@
- glibc (2.36-6+rpi1) bookworm-staging; urgency=medium
++glibc (2.36-7+rpi1) 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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 20 Dec 2022 13:06:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jan 2023 07:42:05 +0000
++
+ glibc (2.36-7) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/debhelper.in/libc.templates (glibc/kernel-too-old),
+     debian/debhelper.in/libc.preinst: Note that upgrading a kernel also means
+     rebooting it. Also, the libc package is usually in an odd state at that
+     point and apt -f install needs to be used.
+   * debian/patches/hurd-i386/git-getrandom-chroot.diff: Fix calling getrandom
+     inside a minimal chroot. Fixes openssh-server >= 1:9.1.
+   * debian/patches/hurd-i386/local-static_pthread_setcancelstate.diff: Fix
+     ldconfig crashing on libxeddsa2.
+   * debian/testsuite-xfail-debian.mk: Update hurd results.
+ 
+   [ Flavio Cruz ]
+   * debian/patches/hurd-i386/git-mach-headers-freestanding.diff: Force use of
+     -ffreestanding when checking for gnumach headers.
+ 
+   [ Aurelien Jarno ]
+   * debian/glibc-source.filelist: update following recent changes.
+   * debian/patches/any/git-floatn-gcc-13-support.diff: backport FloatN support
+     for GCC 13 from upstream.  Closes: #1022166.
+   * Update Spanish debconf translation, by Camaleón.  Closes: #1026786.
+   * debian/debhelper.in/locales-all.NEWS: drop to make lintian happy, as it
+     only contains a very old entry.
+   * debian/local/manpages/locale.gen.5, debian/local/manpages/update-locale.8:
+     fix issues reported by the manpage-l10n project.  Closes: #1026321.
+ 
+   [ Helmut Grohne ]
+   * Use conjunction for libgd-dev profiles.
+   * Annotate B-D libcap-dev with stage2 profile.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sun, 25 Dec 2022 19:42:32 +0100
  
  glibc (2.36-6) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index e7a02f999a0c228ba24e6c6b353e71f2aba42a36,9f006662fa43807d80b6c4fb9a297dbaf0a97b11..607749e2df79d9aec25b271bed535b72d96e8bfd
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -36,6 -40,9 +36,8 @@@ hurd-i386/git-readlink-fifo.dif
  hurd-i386/git-net-route.h.diff
  hurd-i386/git-SOMAXCONN.diff
  hurd-i386/git-sigtimedwait.diff
 -
+ hurd-i386/git-getrandom-chroot.diff
+ hurd-i386/git-mach-headers-freestanding.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff
@@@ -98,4 -113,4 +100,5 @@@ any/local-bootstrap-headers.dif
  any/local-cudacc-float128.diff
  any/local-test-install.diff
  any/local-cross.patch
+ any/git-floatn-gcc-13-support.diff
 +auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931