Merge version 2.0.4-9+rpi1 and 2.0.4-9+deb9u1 to produce 2.0.4-9+rpi1+deb9u1

diff --cc debian/changelog
index 3fcaaa832b15821a4792fc5c96868149172fcf16,03546916923d913b6906f1d2036f55e80900b4fb..3b96d56cacf7d15bdf4b9d08b6e7fedcf798bb84
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- klibc (2.0.4-9+rpi1) stretch-staging; urgency=medium
++klibc (2.0.4-9+rpi1+deb9u1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green <plugwash@p10link.net> at Wed, 26 Nov 2014 22:01:00 +0000]
 +  * Change compiler settings to values suitable for raspberry pi
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 17 May 2016 23:45:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Jun 2021 17:56:21 +0000
++
+ klibc (2.0.4-9+deb9u1) stretch-security; urgency=high
+ 
+   * Never clean files in quilt status directory
+   * debian/rules: Use $(MAKE) for recursive make
+   * debian/rules: Change override_dh_auto_test rule to actually run tests
+   * Apply security fixes from 2.0.9 (Closes: #989505):
+     - malloc: Set errno on failure
+     - malloc: Fail if requested size > PTRDIFF_MAX (CVE-2021-31873)
+     - calloc: Fail if multiplication overflows (CVE-2021-31870)
+     - cpio: Fix possible integer overflow on 32-bit systems (CVE-2021-31872)
+     - cpio: Fix possible crash on 64-bit systems (CVE-2021-31871)
+ 
+  -- Ben Hutchings <benh@debian.org>  Mon, 28 Jun 2021 16:24:37 +0200
  
  klibc (2.0.4-9) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge