Merge version 2.30-5+rpi1 and 2.30-7 to produce 2.30-7+rpi1

diff --cc debian/changelog
index 64566a6dbf4a7f5908bf2996cfa6587992298ca1,2245b70a23967e8cb2e597edd16c2db9548b78bd..3944b09b65a8a9ddbf50ff88b69fdce46b4dc64f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,38 @@@
- binutils (2.30-5+rpi1) buster-staging; urgency=medium
++binutils (2.30-7+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 10:00:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Mar 2018 02:07:28 +0000
++
+ binutils (2.30-7) unstable; urgency=medium
+ 
+   * Upload without build dependencies on the cross compilers and don't run
+     the testsuite for this upload.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2018 12:04:10 +0700
+ 
+ binutils (2.30-6) unstable; urgency=medium
+ 
+   * Update, taken from the 2.30 branch 20180308.
+     - Fix PR ld/15904, linker error with --no-keep-memory.
+     - Enable link time garbage collection for the IA64 target. Closes: #890909.
+     - Fix PR gas/22014, memory corruption in MIPS assembler.
+     - Fix PR ld/22758, a bug that would place executable and non-executables
+       pages in the same segment.
+     - Fix PR ld/22832 on SPARC.
+     - Fix AArch32 build attributes for Armv8.4-A.
+     - Update translations.
+   * CVE-2018-7208: Fix PR binutils/22741, taken from the trunk.
+   * CVE-2018-7568: Fix PR binutils/22894, taken from the trunk.
+   * CVE-2018-7569: Fix PR binutils/22895, taken from the trunk.
+   * CVE-2018-7642: Fix PR binutils/22887, taken from the trunk.
+   * CVE-2018-7643: Fix PR binutils/22905, taken from the trunk.
+   * CVE-2018-7570: PR binutils/22881 needs a proper backport.
+   * Update package descriptions for binutils-<target>. Closes: #891377.
+   * Build binutils-for-host for TARGET (Helmut Grohne). Closes: #891863.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2018 09:56:54 +0700
  
  binutils (2.30-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge