From: Raspbian automatic forward porter Date: Thu, 13 May 2021 16:03:25 +0000 (+0100) Subject: Merge version 1.15.9-1+rpi1 and 1.15.9-3 to produce 1.15.9-3+rpi1 X-Git-Tag: archive/raspbian/1.15.9-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1991e6573062acdf629e9fe643b283b66c9fc8b;p=golang-1.15.git Merge version 1.15.9-1+rpi1 and 1.15.9-3 to produce 1.15.9-3+rpi1 --- f1991e6573062acdf629e9fe643b283b66c9fc8b diff --cc debian/changelog index 265a6196,14cc07e7..9d3dc8f5 --- a/debian/changelog +++ b/debian/changelog @@@ -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 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 Thu, 18 Mar 2021 19:28:47 +0000 ++ -- Raspbian forward porter 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 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 Sat, 08 May 2021 02:45:35 +0800 golang-1.15 (1.15.9-1) unstable; urgency=medium