Manual merge of version 2.35-1+rpi2 and 2.35-2 to produce 2.35-2+rpi1

diff --cc debian/changelog
index e6e846126118d9c560739437b47edfcee2786a67,c811cb08e1a1f90255cdf3649f40806aba017a56..aee8e4129b98b4dae007771aa8ff410c5386ebd5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,24 +1,34 @@@
- glibc (2.35-1+rpi2) bookworm-staging; urgency=medium
++glibc (2.35-2+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>  Sun, 02 Oct 2022 17:46:25 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 11 Oct 2022 17:24:59 +0000
 +
- glibc (2.35-1+rpi1) bookworm-staging; urgency=medium
+ glibc (2.35-2) unstable; 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.
+   [ Samuel Thibault ]
+   * debian/patches/hurd-i386/git-SOMAXCONN.diff: Bump SOMAXCONN to 4096.
+   * debian/debhelper.in/libc-udeb.install.hurd-i386: Allow installing
+     /lib/ld.so, it's required on hurd-i386.
  
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Sep 2022 20:25:19 +0000
+   [ Aurelien Jarno ]
+   * debian/control.in/libc: add a Breaks against firefox (<< 91~) and
+     firefox-esr (<< 91~) to ensure a seccomp filter compatible with glibc
+     2.34.  Closes: #1020894.
+   * debian/sysdeps/sparc64.mk: pass --disable-default-pie to configure.
+     Closes: #1020974.
+   * debian/rules.d/control.mk: add the arc architecture to the control file.
+     Closes: #1021167.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix initialization of dp register.  Closes: #1020857.
+     - Fix SIGILL on Haswell CPUs without BMI1/BMI2 instructions. Closes:
+       #1019855.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 04 Oct 2022 07:07:58 +0200
  
  glibc (2.35-1) unstable; urgency=medium
  

diff --cc debian/control
index d651138c0d747fa15c9394d8daf1a2605e6303d1,3fd101488ddaea44b33dcccd1f13f33da9502c99..faaab5ebdce26b6bd71b26bb9810638968f46605
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -167,7 -167,7 +167,7 @@@ Recommends: libidn2-0 (>= 2.0.5~
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386], libnss-nis, libnss-nisplus
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
  Conflicts: libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386]
- Breaks: nscd (<< 2.35), locales (<< 2.35), locales-all (<< 2.35), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~)
 -Breaks: nscd (<< 2.35), locales (<< 2.35), locales-all (<< 2.35), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
++Breaks: nscd (<< 2.35), locales (<< 2.35), locales-all (<< 2.35), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), firefox (<< 91~), firefox-esr (<< 91~)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
            libc0.1-i686 [kfreebsd-i386],

diff --cc debian/control.in/libc
index 585a367f2385cf6bb31a8c1807842a869431ff03,2f292c12bca898ff427daf3f0f58f32f1c57acba..fe833027f00ec0da4fb68a7f5883cbd856d2daa8
--- 1/debian/control.in/libc
--- 2/debian/control.in/libc
+++ b/debian/control.in/libc
@@@ -8,7 -8,7 +8,7 @@@ Recommends: libidn2-0 (>= 2.0.5~
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386], libnss-nis, libnss-nisplus
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
  Conflicts: libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386]
- Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~)
 -Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), valgrind (<< 1:3.19.0-1~), firefox (<< 91~), firefox-esr (<< 91~)
++Breaks: nscd (<< @DEB_VERSION_UPSTREAM@), locales (<< @DEB_VERSION_UPSTREAM@), locales-all (<< @DEB_VERSION_UPSTREAM@), hurd (<< 1:0.9.git20220301-2), libtirpc1 (<< 0.2.3), r-cran-later (<< 0.7.5+dfsg-2), nocache (<< 1.1-1~), iraf-fitsutil (<< 2018.07.06-4), wcc (<< 0.0.2+dfsg-3), openssh-server (<< 1:8.1p1-5), macs (<< 2.2.7.1-3~), openarena (<< 0.8.8+dfsg-4~), ioquake3 (<< 1.36+u20200211.f2c61c1~dfsg-2~), busybox (<< 1.30.1-6), libgegl-0.4-0 (<< 0.4.18), aide (<< 0.17.3-4+b3), python3-iptables (<< 1.0.0-2), fakechroot (<< 2.19-3.5), tinydns (<< 1:1.05-14), chrony (<< 4.2-3~), firefox (<< 91~), firefox-esr (<< 91~)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
            libc0.1-i686 [kfreebsd-i386],

diff --cc debian/patches/series
index 415bebefc7ed008104e6f45f014045ecfb18d2f5,475800f1dc3d4db0ab4729b2ff5917abb7570a87..e5140c35ad99f74e5705ac0fceede9481b68ed95
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -36,6 -41,8 +36,7 @@@ hurd-i386/git-strerror_X.dif
  hurd-i386/git-xpg_strerror.diff
  hurd-i386/git-readlink-fifo.diff
  hurd-i386/git-net-route.h.diff
 -
+ hurd-i386/git-SOMAXCONN.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff