Merge version 2.29.1-13+rpi1 and 2.30-4 to produce 2.30-4+rpi1

diff --cc debian/changelog
index 74766f613f9da6abf6232b2e3c02be65144b5cae,66f0b7d7a0f8a9f105afacc3da75a81c2791370d..46d03993822e89f386fc33afdd435d7e3951e370
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,87 +1,94 @@@
- binutils (2.29.1-13+rpi1) buster-staging; urgency=medium
++binutils (2.30-4+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>  Thu, 11 Jan 2018 19:08:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2018 03:00:23 +0000
++
+ binutils (2.30-4) unstable; urgency=high
+ 
+   * Update, taken from the 2.30 branch 20180209.
+     - Fix PR binutils/22788 (CVE-2018-6872).
+   * binutils-multiarch: Add riscv64 support.
+   * Bump dpkg version to a version supporting riscv64.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 09 Feb 2018 19:24:28 +0100
+ 
+ binutils (2.30-3) unstable; urgency=high
+ 
+   * Update, taken from the 2.30 branch 20180208.
+     - Remove speculation barrier support, remove --speculate-indirect-jumps
+       support (PPC).
+     - Fix PR ld/22764.
+   * CVE-2018-6323: Fix PR binutils/22746, taken from the trunk.
+   * CVE-2018-6543: Fix PR binutils/22769, taken from the trunk.
+   * CVE-2018-6759: Fix PR binutils/22794, taken from the trunk.
+   * Build riscv64 cross packages. This is using a hack, making binutils
+     not building natively on riscv64. At the mercy of a dpkg update
+     to handle riscv64 in stretch ...
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 08 Feb 2018 10:22:10 +0100
+ 
+ binutils (2.30-2) unstable; urgency=medium
+ 
+   * Update, taken from the 2.30 branch 20180205.
+     - Fix PR ld/22762.
+     - gold: Add support for DWARF-4 line number tables.
+     - Update Brazillian portuguese and Russian translations.
+   * Apply approved patch for PR ld/22764 (AArch64). LP: #1746765.
+     Closes: #888789.
+   * Fix PR binutils/22734, taken from the trunk. Closes: #887729.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 05 Feb 2018 16:22:40 +0100
+ 
+ binutils (2.30-1) unstable; urgency=medium
+ 
+   * Binutils 2.30 release.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 29 Jan 2018 14:29:38 +0100
+ 
+ binutils (2.29.90.20180122-1) unstable; urgency=medium
+ 
+   * Snapshot, taken from the binutils 2.30 branch (20180122).
+   * Security issues addressed in 2.30: CVE-2017-13716, CVE-2017-14930,
+     CVE-2017-14932, CVE-2017-14933, CVE-2017-14934, CVE-2017-14938,
+     CVE-2017-14939, CVE-2017-14940, CVE-2017-15020, CVE-2017-15021,
+     CVE-2017-15022, CVE-2017-15023, CVE-2017-15024, CVE-2017-15025,
+     CVE-2017-15225, CVE-2017-15938, CVE-2017-15996, CVE-2017-16826,
+     CVE-2017-16827, CVE-2017-16828, CVE-2017-16829, CVE-2017-16830,
+     CVE-2017-16831, CVE-2017-16832, CVE-2017-17080, CVE-2017-17121,
+     CVE-2017-17122, CVE-2017-17123, CVE-2017-17124, CVE-2017-17125,
+     CVE-2017-17126.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 23 Jan 2018 04:11:38 +0100
+ 
+ binutils (2.29.51.20180110-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20180110).
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 10 Jan 2018 16:54:44 +0100
+ 
+ binutils (2.29.51.20171219-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20171219).
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 19 Dec 2017 14:50:11 +0100
+ 
+ binutils (2.29.51.20171208-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20171208).
+   * binutils-source: Depend on python3 instead of python.
+   * Override m68k, powerpcspe and m68k buildd admins to run the testsuite.
+   * Build binutils-x86-64-linux-gnu on arm64 and ppc64el. See #883769.
+   * Revived from the tombs, build a binutils-ia64-linux-gnu package.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 08 Dec 2017 15:19:09 +0100
+ 
+ binutils (2.29.51.20171128-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20171128).
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 28 Nov 2017 08:59:33 +0100
  
  binutils (2.29.1-13) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge