From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 16 Feb 2018 03:25:22 +0000 (+0000)
Subject: Merge version 1.9.3-1+rpi1 and 1.9.4-1 to produce 1.9.4-1+rpi1
X-Git-Tag: archive/raspbian/1.9.4-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6e3669b2ea54ad7518ec846a08eaa9ae73d19f3e;p=golang-1.9.git

Merge version 1.9.3-1+rpi1 and 1.9.4-1 to produce 1.9.4-1+rpi1
---

7dcd4ced38ca966a3004b0917a6ddd9b41d4ecf3
diff --cc debian/changelog
index 579bf9a,f2e4d07..f8dafaf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- golang-1.9 (1.9.3-1+rpi1) buster-staging; urgency=medium
++golang-1.9 (1.9.4-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.9.2-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 08 Nov 2017 00:15:02 +0000]
 +  * Build with goarm=6
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2018 12:54:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2018 03:25:22 +0000
++
+ golang-1.9 (1.9.4-1) unstable; urgency=medium
+ 
+   * New upstream version, fixing CVE-2018-6574.
+ 
+  -- Michael Hudson-Doyle <mwhudson@debian.org>  Thu, 08 Feb 2018 10:38:27 +1300
  
  golang-1.9 (1.9.3-1) unstable; urgency=medium