diff -Nru glibc-2.33/debian/changelog glibc-2.33/debian/changelog
--- glibc-2.33/debian/changelog	2022-01-26 22:01:02.000000000 +0000
+++ glibc-2.33/debian/changelog	2022-02-03 11:20:32.000000000 +0000
@@ -1,3 +1,16 @@
+glibc (2.33-5+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 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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 11:20:32 +0000
+
 glibc (2.33-5) unstable; urgency=medium
 
   * debian/patches/git-updates.diff: update from upstream stable branch:
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-01-26 21:56:46.000000000 +0000
+++ glibc-2.33/debian/patches/git-updates.diff	2022-02-03 11:20:32.000000000 +0000
@@ -6895,9 +6895,7 @@
 +
 +#include <support/test-driver.c>
 diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
-old mode 100644
-new mode 100755
-index 198554d788..75c96d60d4
+index 84f82c2406..fc1840e23f
 --- a/sysdeps/x86_64/configure
 +++ b/sysdeps/x86_64/configure
 @@ -107,39 +107,6 @@ if test x"$build_mathvec" = xnotset; then
diff -Nru glibc-2.33/debian/rules glibc-2.33/debian/rules
--- glibc-2.33/debian/rules	2022-01-26 17:51:28.000000000 +0000
+++ glibc-2.33/debian/rules	2022-02-03 11:20:32.000000000 +0000
@@ -96,7 +96,7 @@
 BASE_MIG = mig
 DEB_GCC_VERSION ?= -10
 
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
 TIMEOUTFACTOR = 25
 
 # Set cross and native compiler names, including version.