Merge version 1.15.9-1+rpi1 and 1.15.9-3 to produce 1.15.9-3+rpi1 archive/raspbian/1.15.9-3+rpi1 raspbian/1.15.9-3+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 13 May 2021 16:03:25 +0000 (17:03 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 13 May 2021 16:03:25 +0000 (17:03 +0100)
1  2 
debian/changelog

index 265a6196b4a89d3865289e98b1cc025e3678afec,14cc07e7c25f200fb6d48a33145947d9e1551283..9d3dc8f5a0904cd76a2cdcf922aee8d649cefdc5
@@@ -1,14 -1,26 +1,38 @@@
- golang-1.15 (1.15.9-1+rpi1) bullseye-staging; urgency=medium
++golang-1.15 (1.15.9-3+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from golang-1.10 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
 +  * Build with GOARM=6
 +  * Disable testsuite.
 +  * Fix clean target.
 +
 +  [changes introduced in golang-1.12 1.12.7-3+rpi1 by Peter Michael Green]
 +  * Further clean target fixing.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Mar 2021 19:28:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 May 2021 16:03:24 +0000
++
+ golang-1.15 (1.15.9-3) unstable; urgency=medium
+   * Fix failed TestDependencyVersionsConsistent test.
+     When dpkg-source unpack tarball, it produces .pc dir in source dir.
+     The last patch 0007-CVE-2021-31525.patch causes
+     go.mod/go.sum/modules.txt files in .pc dir with old content.
+     Then TestDependencyVersionsConsistent picks these old content in .pc
+     dir, results error:
+     --- FAIL: TestDependencyVersionsConsistent (0.00s)
+         moddeps_test.go:217: Modules within GOROOT require different versions of golang.org/x/net.
+         moddeps_test.go:229: std      requires v0.0.0-20201008223702-a5fa9d4b7c91
+         moddeps_test.go:229: std      requires v0.0.0-20210428183841-261fb518b1ed
+  -- Shengjing Zhu <zhsj@debian.org>  Sat, 08 May 2021 14:22:26 +0800
+ golang-1.15 (1.15.9-2) unstable; urgency=medium
+   * Team upload.
+   * Backport patch for CVE-2021-31525
+     net/http: ReadRequest can stack overflow due to recursion with very
+     large headers. https://github.com/golang/go/issues/45711
+  -- Shengjing Zhu <zhsj@debian.org>  Sat, 08 May 2021 02:45:35 +0800
  
  golang-1.15 (1.15.9-1) unstable; urgency=medium