From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 15 Jul 2024 18:34:59 +0000 (+0100)
Subject: Merge version 1.21.11-1+rpi1 and 1.21.12-1 to produce 1.21.12-1+rpi1
X-Git-Tag: archive/raspbian/1.21.12-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=22df7c183d648ee14c757cd23dbdb87e807aa662;p=golang-1.21.git

Merge version 1.21.11-1+rpi1 and 1.21.12-1 to produce 1.21.12-1+rpi1
---

22df7c183d648ee14c757cd23dbdb87e807aa662
diff --cc debian/changelog
index df7e0b50,10841efd..5e97f6e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- golang-1.21 (1.21.11-1+rpi1) trixie-staging; urgency=medium
++golang-1.21 (1.21.12-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Jun 2024 15:09:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Jul 2024 18:34:59 +0000
++
+ golang-1.21 (1.21.12-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.21.12
+     + CVE-2024-24791: net/http: denial of service due to improper 100-continue
+       handling
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Wed, 03 Jul 2024 16:04:00 +0800
  
  golang-1.21 (1.21.11-1) unstable; urgency=medium