From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 3 Feb 2019 17:03:12 +0000 (+0000)
Subject: Merge version 1.7.4-2+rpi1 and 1.7.4-2+deb9u1 to produce 1.7.4-2+rpi1+deb9u1
X-Git-Tag: archive/raspbian/1.7.4-2+rpi1+deb9u1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5eaa83672f04ecc1ea569f06fb947427d5dad8e1;p=golang-1.7.git

Merge version 1.7.4-2+rpi1 and 1.7.4-2+deb9u1 to produce 1.7.4-2+rpi1+deb9u1
---

c9a7748032f6fc97d2a8fc1db64d19eb92a6b2de
diff --cc debian/changelog
index 1e461a7,68ac6d5..5d711cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- golang-1.7 (1.7.4-2+rpi1) stretch-staging; urgency=medium
++golang-1.7 (1.7.4-2+rpi1+deb9u1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from golang 2:1.5.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Jan 2016 20:49:39 +0000]
 +  * Force build for armv6.
 +  
 +  [changes introduced in golang 2:1.6.1-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 20:36:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Feb 2019 17:03:11 +0000
++
+ golang-1.7 (1.7.4-2+deb9u1) stretch-security; urgency=high
+ 
+   * Team upload.
+   * Add patch to fix CVE-2019-6486
+   * Add patch to fix CVE-2018-7187
+ 
+  -- Dr. Tobias Quathamer <toddy@debian.org>  Mon, 28 Jan 2019 22:24:55 +0100
  
  golang-1.7 (1.7.4-2) unstable; urgency=medium