From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 12 Oct 2023 02:51:58 +0000 (+0100)
Subject: Merge version 1.21.1-1+rpi1 and 1.21.2-1 to produce 1.21.2-1+rpi1
X-Git-Tag: archive/raspbian/1.21.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=718008aff11980e4012076022809522fd72a355a;p=golang-1.21.git

Merge version 1.21.1-1+rpi1 and 1.21.2-1 to produce 1.21.2-1+rpi1
---

718008aff11980e4012076022809522fd72a355a
diff --cc debian/changelog
index 2d62e29a,845fd6e7..0a8a39a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- golang-1.21 (1.21.1-1+rpi1) trixie-staging; urgency=medium
++golang-1.21 (1.21.2-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.21.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Oct 2023 14:01:26 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Oct 2023 14:01:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2023 02:51:57 +0000
++
+ golang-1.21 (1.21.2-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.21.2
+     + CVE-2023-39323: cmd/go: line directives allows arbitrary execution during
+       build
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Fri, 06 Oct 2023 19:35:37 +0800
  
  golang-1.21 (1.21.1-1) unstable; urgency=medium