From 67cacfdf55eff7d5d35c63deec8bc74d8476b26e Mon Sep 17 00:00:00 2001
From: David Benoit <dbenoit@redhat.com>
Date: Thu, 23 May 2024 05:02:08 -0400
Subject: [PATCH] Update to Go 1.21.10

Resolves: RHEL-36993
---
 .gitignore  |  2 ++
 golang.spec | 16 +++++++++++-----
 sources     |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b40c9c1..6fa441f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ SOURCES/go1.19.4.tar.gz
 /go1.21.7-1-openssl-fips.tar.gz
 /go1.21.9.tar.gz
 /go1.21.9-1-openssl-fips.tar.gz
+/go1.21.10.tar.gz
+/go1.21.10-1-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 15ecf12..4e45d1b 100644
--- a/golang.spec
+++ b/golang.spec
@@ -92,7 +92,7 @@
 %endif
 
 %global go_api 1.21
-%global version 1.21.9
+%global version 1.21.10
 %global pkg_release 1
 
 Name:           golang
@@ -145,7 +145,6 @@ Patch1939923:   skip_test_rhbz1939923.patch
 
 Patch2:		disable_static_tests_part1.patch
 Patch3:		disable_static_tests_part2.patch
-Patch4:		skip-test-overlong-message.patch
 Patch5:		modify_go.env.patch
 
 # Having documentation separate was broken
@@ -243,9 +242,12 @@ Requires:       %{name} = %{version}-%{release}
 pushd ..
 tar -xf %{SOURCE1}
 popd
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
-patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
+patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
+# Add --no-backup-if-mismatch option to avoid creating .orig temp files
+for p in "$patch_dir"/*.patch; do
+       echo "Applying $p"
+      patch -p1 --no-backup-if-mismatch < $p
+done
 
 # Configure crypto tests
 pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@@ -518,6 +520,10 @@ cd ..
 %endif
 
 %changelog
+* Thu May 23 2024 David Benoit <dbenoit@redhat.com> - 1.21.10
+- Update to Go 1.21.10
+- Resolves: RHEL-36993
+
 * Fri Apr 12 2024 David Benoit <dbenoit@redhat.com> - 1.21.9-1
 - Fix CVE-2023-45288
 - Resolves: RHEL-31915
diff --git a/sources b/sources
index c39cd3b..e15184d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.21.9.tar.gz) = b254b8117141162ee9fd603b12df30d543da0eb43227505f4a6fab97593eb1411ff8908f6d5dbc7ab814f8f315ecdf8cf6c86c1d4571a23302a0fc700a160782
-SHA512 (go1.21.9-1-openssl-fips.tar.gz) = db406db14b3987c625c4daceabf85ca862710f397df326fe2b169a9012414d962215692b39122334bcab2b8807655c3b80cd97859c31c329892ee073b410bd08
+SHA512 (go1.21.10.tar.gz) = 029d5fceef24d6044c86d97605c066cf7ba632c984e33efe2eed1ea569ac2cd90d6a8d94622a827412a85be055668189fe66b9309669fcdddb46fdd3ffaef09b
+SHA512 (go1.21.10-1-openssl-fips.tar.gz) = 3bc8390ddaddbff79c323a400a2615fd89f4a3e73858a4c5f2cd1988c129e8a5beb64f7f38e6271dd9bc209dc800f41c6a01e5fcee47192448bcfc58e69c5030