From d9de12e95626301545dbbed832c54220453cc47c Mon Sep 17 00:00:00 2001
From: guojunding <guojunding@kylinos.cn>
Date: Wed, 17 Jul 2024 16:33:12 +0800
Subject: [PATCH] Bump Go version to 1.21.12: GO-2024-2963 fix #18271

---
 0011-backport-fix-GO-2024-2963.patch | 75 ++++++++++++++++++++++++++++
 etcd.spec                            |  7 ++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 0011-backport-fix-GO-2024-2963.patch

diff --git a/0011-backport-fix-GO-2024-2963.patch b/0011-backport-fix-GO-2024-2963.patch
new file mode 100644
index 0000000..d1829de
--- /dev/null
+++ b/0011-backport-fix-GO-2024-2963.patch
@@ -0,0 +1,75 @@
+From 45d26bcc60bb31263b13a485cb8448fd298c15d6 Mon Sep 17 00:00:00 2001
+From: D Tripp <38776199+thedtripp@users.noreply.github.com>
+Date: Wed, 3 Jul 2024 05:26:39 +0000
+Subject: [PATCH] 3.4: Bump Go version to 1.21.12: GO-2024-2963 fix.
+
+Based on commit 74533d94b2ce4cb5bde19c02a652ade7fa9dc5d4 and https://github.com/etcd-io/etcd/pull/18130/
+
+Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
+---
+ .go-version                               | 2 +-
+ functional/scripts/docker-local-agent.sh  | 2 +-
+ functional/scripts/docker-local-tester.sh | 2 +-
+ go.mod                                    | 2 +-
+ tools/mod/go.mod                          | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/.go-version b/.go-version
+index 88863fd8e36..26d7b6e756e 100644
+--- a/.go-version
++++ b/.go-version
+@@ -1 +1 @@
+-1.21.11
++1.21.12
+diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
+index d35ab3ae665..60bf135dbd7 100755
+--- a/functional/scripts/docker-local-agent.sh
++++ b/functional/scripts/docker-local-agent.sh
+@@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
+ fi
+ 
+ if [[ -z "${GO_VERSION}" ]]; then
+-  GO_VERSION=1.21.11
++  GO_VERSION=1.21.12
+ fi
+ echo "Running with GO_VERSION:" ${GO_VERSION}
+ 
+diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
+index af7e0776609..9d1677a4ec8 100755
+--- a/functional/scripts/docker-local-tester.sh
++++ b/functional/scripts/docker-local-tester.sh
+@@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
+ fi
+ 
+ if [[ -z "${GO_VERSION}" ]]; then
+-  GO_VERSION=1.21.11
++  GO_VERSION=1.21.12
+ fi
+ echo "Running with GO_VERSION:" ${GO_VERSION}
+ 
+diff --git a/go.mod b/go.mod
+index db312b2e594..8083e9d462d 100644
+--- a/go.mod
++++ b/go.mod
+@@ -2,7 +2,7 @@ module go.etcd.io/etcd
+ 
+ go 1.21
+ 
+-toolchain go1.21.11
++toolchain go1.21.12
+ 
+ require (
+ 	github.com/bgentry/speakeasy v0.1.0
+diff --git a/tools/mod/go.mod b/tools/mod/go.mod
+index 9b76b9e850e..f7cce3cf8e3 100644
+--- a/tools/mod/go.mod
++++ b/tools/mod/go.mod
+@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3
+ 
+ go 1.21
+ 
+-toolchain go1.21.11
++toolchain go1.21.12
+ 
+ require (
+ 	github.com/gogo/protobuf v1.3.2
\ No newline at end of file
diff --git a/etcd.spec b/etcd.spec
index c33a6f8..ddf23f1 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -31,7 +31,7 @@ system.}
 %global gosupfiles      integration/fixtures/* etcdserver/api/v2http/testdata/*
 
 Name:           etcd
-Release:        13
+Release:        14
 Summary:        Distributed reliable key-value store for the most critical data of a distributed system
 
 # Upstream license specification: Apache-2.0
@@ -54,6 +54,7 @@ Patch7:         0007-fix-CVE-2022-34038.patch
 Patch8:         0008-fix-CVE-2023-32082.patch
 Patch9:         0009-fix-CVE-2021-28235.patch
 Patch10:        0010-backport-Suppress-noisy-basic-auth-token-deletion-log.patch
+Patch11:        0011-backport-fix-GO-2024-2963.patch
 
 BuildRequires:  golang
 BuildRequires:  python3-devel
@@ -78,6 +79,7 @@ Requires(pre):  shadow-utils
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %ifarch sw_64
 %patch3 -p1
 %endif
@@ -166,6 +168,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %endif
 
 %changelog
+* Wed Jul 17 2024 guojunding <guojunding@kylinos.cn> - 3.4.14-14
+- Bump Go version to 1.21.12: GO-2024-2963 fix
+
 * Fri Jul 5 2024 guojunding <guojunding@kylinos.cn> - 3.4.14-13
 - Suppress noisy basic auth token deletion log
 
-- 
Gitee