Merge version 2.30-2+rpi1 and 2.30-4 to produce 2.30-4+rpi1

diff --cc debian/changelog
index 08fdb5c1ddac2e29a70771dad96092f389c45971,19c3bc70765cf580c07a05621b6ba5c408d550d5..46fc7928dd2834a52de3ec609a5d0857a7719a91
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,41 +1,54 @@@
- glibc (2.30-2+rpi1) bullseye-staging; urgency=medium
++glibc (2.30-4+rpi1) bullseye-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.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 18 Mar 2020 19:27:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Apr 2020 12:05:10 +0000
++
+ glibc (2.30-4) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/debhelper.in/libc.preinst, debian/rules.d/debhelper.mk: there
+     is no easy way to check if a file belongs to a package with usrmerge.
+     Just drop all safety checks...  Closes: #954915.
+   * debian/patches/any/local-tst-system-disable-shell-tests.diff: disable
+     tests that rely on a particular shell until a fix is found upstream.
+ 
+   [ John Paul Adrian Glaubitz ]
+   * debian/testsuite-xfail-debian.mk: mark nptl/tst-cond8-static and
+     nptl/tst-mutex{,pi}8-static as XFAIL on sparc64.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Wed, 25 Mar 2020 13:56:56 +0100
+ 
+ glibc (2.30-3) unstable; urgency=medium
+ 
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix a defect in the PowerPC backtrace function that could cause an
+       out-of-bounds write when executed in a signal frame context
+       (CVE-2020-1751).
+     - Fix use-after-free vulnerability in the glob function when expanding
+       ~user (CVE-2020-1752).  Closes: #953788.
+   * debian/debhelper.in/libc.preinst, debian/rules.d/debhelper.mk: determine
+     ld.so ELF magic at build time instead of at run time to avoid using
+     "readlink -m".  Closes: #954374.
+   * debian/rules.d/build.mk: unset LANGUAGE when running the testsuite.
+   * debian/testsuite-xfail-debian.mk: ignore signal/tst-minsigstksz-1 and
+     signal/tst-minsigstksz-2 on i386, they fail on i386 with an AVX-512 CPUs
+     due to a kernel bug.  Closes: #954715.
+   * debian/control.in/libc, debian/rules.d/debhelper.mk: Make libcX-dev
+     declare a Breaks against libcX-dev-${DEB_HOST_ARCH}-cross
+     (<< ${CURRENT_UPSTREAM_VERSION}~).  Closes: #954393.
+   * debian/control.in/libc, debian/control.in/main: drop Conflicts, Breaks and
+     Replaces against package version older than the one available in
+     oldstable.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 24 Mar 2020 23:31:35 +0100
  
  glibc (2.30-2) unstable; urgency=medium