diff -Nru glibc-2.33/debian/changelog glibc-2.33/debian/changelog --- glibc-2.33/debian/changelog 2022-07-10 20:29:34.000000000 +0000 +++ glibc-2.33/debian/changelog 2022-07-23 07:19:44.000000000 +0000 @@ -1,3 +1,16 @@ +glibc (2.33-8+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.25-2+rpi1 by Peter Michael Green at Wed, 29 Nov 2017 03:00:21 +0000] + * Disable testsuite. + + [changes introduced in 2.32-4+rpi1 by Peter Michale Green] + * Change mode on sysdeps/x86_64/configure to 644, dgit does + like modes being changed by patches, the corresponding files + for other architectures are all 644 and we don't really care + about x86-64 in raspbian anyway. + + -- Raspbian forward porter Sat, 23 Jul 2022 07:19:44 +0000 + glibc (2.33-8) unstable; urgency=medium [ Samuel Thibault ] diff -Nru glibc-2.33/debian/patches/git-updates.diff glibc-2.33/debian/patches/git-updates.diff --- glibc-2.33/debian/patches/git-updates.diff 2022-07-09 08:48:36.000000000 +0000 +++ glibc-2.33/debian/patches/git-updates.diff 2022-07-23 07:19:44.000000000 +0000 @@ -9399,8 +9399,6 @@ $(make-target-directory) rm -f $@ diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure -old mode 100644 -new mode 100755 index 198554d788..75c96d60d4 --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure diff -Nru glibc-2.33/debian/rules glibc-2.33/debian/rules --- glibc-2.33/debian/rules 2022-07-09 08:51:07.000000000 +0000 +++ glibc-2.33/debian/rules 2022-07-23 07:19:44.000000000 +0000 @@ -97,7 +97,7 @@ BASE_MIG = mig DEB_GCC_VERSION ?= -10 -RUN_TESTSUITE = yes +RUN_TESTSUITE = no TIMEOUTFACTOR = 25 # Set cross and native compiler names, including version.