diff -Nru glibc-2.35/debian/changelog glibc-2.35/debian/changelog
--- glibc-2.35/debian/changelog 2022-09-22 20:02:00.000000000 +0000
+++ glibc-2.35/debian/changelog 2022-10-02 17:46:25.000000000 +0000
@@ -1,3 +1,16 @@
+glibc (2.35-1+rpi2) bookworm-staging; urgency=medium
+
+ * Remove valgrind breaks.
+
+ -- Peter Michael Green <plugwash@raspbian.org> Sun, 02 Oct 2022 17:46:25 +0000
+
+glibc (2.35-1+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.
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 29 Sep 2022 20:25:19 +0000
+
glibc (2.35-1) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru glibc-2.35/debian/control glibc-2.35/debian/control
--- glibc-2.35/debian/control 2022-09-22 20:02:00.000000000 +0000
+++ glibc-2.35/debian/control 2022-10-02 17:46:25.000000000 +0000
@@ -167,7 +167,7 @@
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~), valgrind (<< 1:3.19.0-1~)
+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~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
diff -Nru glibc-2.35/debian/control.in/libc glibc-2.35/debian/control.in/libc
--- glibc-2.35/debian/control.in/libc 2022-09-22 20:02:00.000000000 +0000
+++ glibc-2.35/debian/control.in/libc 2022-10-02 17:46:25.000000000 +0000
@@ -8,7 +8,7 @@
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~), valgrind (<< 1:3.19.0-1~)
+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~)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
diff -Nru glibc-2.35/debian/patches/auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931 glibc-2.35/debian/patches/auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931
--- glibc-2.35/debian/patches/auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931 1970-01-01 00:00:00.000000000 +0000
+++ glibc-2.35/debian/patches/auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931 2022-09-29 20:25:19.000000000 +0000
@@ -0,0 +1,61 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Subject: Automatically generated patch (2.34-7+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit de346af12a6cb5181ed2ab174fb35c88f3b64f4b
+Merge: d5d615e58 bf75deb1e
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu Sep 15 03:05:49 2022 +0000
+
+ Manual merge of version 2.33-8+rpi1 and 2.34-7 to produce 2.34-7+rpi1
+
+commit bf75deb1e0a596e20f3cd137443bccd254274826
+Merge: bfcf69abc 10648b8c1
+Author: Aurelien Jarno <aurel32@debian.org>
+Date: Sat Aug 27 12:38:11 2022 +0100
+
+ Merge glibc (2.34-7) import into refs/heads/workingbranch
+
+commit bfcf69abc86c46543cd675a7d6e4328d6857ca5e
+Author: GNU Libc Maintainers <debian-glibc@lists.debian.org>
+Date: Sat Aug 27 12:38:11 2022 +0100
+
+ git-localedef-check-magic
+
+ commit 56ea4bed7369f32e3c7c935f9e33ee38e9f78143
+ Author: Aurelien Jarno <aurelien@aurel32.net>
+ Date: Sun Dec 5 11:51:17 2021 +0100
+
+ localedef: check magic value on archive load [BZ #28650]
+
+ localedef currently blindly trust the archive header. When passed an
+ archive file with the wrong endianess, this leads to a segmentation
+ fault:
+
+ $ localedef --big-endian --list-archive /usr/lib/locale/locale-archive
+ Segmentation fault (core dumped)
+
+ When passed non-archive files, asserts are reported on the best case,
+ but sometimes it can lead to a segmentation fault:
+
+ $ localedef --list-archive /bin/true
+ localedef: programs/locarchive.c:1643: show_archive_content: Assertion `used < GET (head->namehash_used)' failed.
+ Aborted (core dumped)
+
+ $ localedef --list-archive /usr/lib/locale/C.utf8/LC_COLLATE
+ Segmentation fault (core dumped)
+
+ This patch improves the user experience by looking at the magic value,
+ which is always written, but never checked. It should still be possible
+ to trigger a segmentation fault with crafted files, but this already
+ catch many cases.
+
+
+ Gbp-Pq: Topic any
+ Gbp-Pq: Name git-localedef-check-magic.patch
+---
+
+diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
+old mode 100755
+new mode 100644
diff -Nru glibc-2.35/debian/patches/series glibc-2.35/debian/patches/series
--- glibc-2.35/debian/patches/series 2022-09-22 20:02:00.000000000 +0000
+++ glibc-2.35/debian/patches/series 2022-09-29 20:25:19.000000000 +0000
@@ -13,23 +13,18 @@
localedata/locale-zh_TW.diff
localedata/tailor-iso14651_t1.diff
localedata/submitted-es_MX-decimal_point.diff
-
alpha/local-gcc4.1.diff
alpha/submitted-dl-support.diff
alpha/local-string-functions.diff
alpha/submitted-fts64.diff
alpha/submitted-makecontext.diff
-
arm/local-sigaction.diff
arm/unsubmitted-ldso-multilib.diff
arm/local-arm-futex.diff
-
hppa/local-inlining.diff
-
# 2.36
hurd-i386/pthread_key.diff
hurd-i386/git-spawni-reauth.diff
-
# 2.37
hurd-i386/git-htl-pthread-self-early.diff
hurd-i386/git-static-pie.diff
@@ -41,7 +36,6 @@
hurd-i386/git-xpg_strerror.diff
hurd-i386/git-readlink-fifo.diff
hurd-i386/git-net-route.h.diff
-
hurd-i386/local-enable-ldconfig.diff
hurd-i386/tg-sysvshm.diff
hurd-i386/tg-thread-cancel.diff
@@ -62,11 +56,9 @@
hurd-i386/local-exec_filename.diff
hurd-i386/proc_reauth.diff
hurd-i386/local-stack_chk_guard.diff
-
i386/local-biarch.diff
i386/unsubmitted-quiet-ldconfig.diff
i386/local-setcontext-revert-eax-ecx-edx.patch
-
kfreebsd/submitted-waitid.diff
kfreebsd/submitted-auxv.diff
kfreebsd/local-config_h_in.patch
@@ -77,22 +69,16 @@
kfreebsd/local-scripts.diff
kfreebsd/local-getaddrinfo-freebsd-kernel.diff
kfreebsd/local-no-execfn.diff
-
m68k/local-dwarf2-buildfix.diff
m68k/local-reloc.diff
m68k/submitted-gcc34-seccomment.diff
-
mips/submitted-rld_map.diff
-
powerpc/local-powerpc8xx-dcbz.diff
-
sh4/local-fpscr_values.diff
-
all/local-alias-et_EE.diff
all/local-remove-manual.diff
all/local-ru_RU.diff
all/local-ldd.diff
-
any/local-asserth-decls.diff
any/local-fhs-linux-paths.diff
any/local-fhs-nscd.diff
@@ -114,3 +100,4 @@
any/local-cudacc-float128.diff
any/local-test-install.diff
any/local-cross.patch
+auto-2.34-7+rpi1-de346af12a6cb5181ed2ab174fb35c88f3b64f4b-1663212931
diff -Nru glibc-2.35/debian/rules glibc-2.35/debian/rules
--- glibc-2.35/debian/rules 2022-09-22 20:02:00.000000000 +0000
+++ glibc-2.35/debian/rules 2022-09-29 20:25:19.000000000 +0000
@@ -98,7 +98,7 @@
BASE_MIG = mig
DEB_GCC_VERSION ?= -11
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
TIMEOUTFACTOR = 25
# Set cross and native compiler names, including version.