From b53fd755a361f5b31baf0885a8683e06e51b84f6 Mon Sep 17 00:00:00 2001
From: Archana <aravinda@redhat.com>
Date: Thu, 11 Jul 2024 18:08:56 +0530
Subject: [PATCH] - Rebase to Go1.22.5 to fix CVE-2024-24791 - Resolves:
 RHEL-46973

---
 .gitignore  | 2 ++
 golang.spec | 8 ++++++--
 sources     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6ba692..b77af13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,5 @@
 /go1.22.3-3-openssl-fips.tar.gz
 /go1.22.4.tar.gz
 /go1.22.4-1-openssl-fips.tar.gz
+/go1.22.5.tar.gz
+/go1.22.5-1-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 89a7cec..25cd6d2 100644
--- a/golang.spec
+++ b/golang.spec
@@ -93,13 +93,13 @@
 %endif
 
 %global go_api 1.22
-%global go_version 1.22.4
+%global go_version 1.22.5
 %global version %{go_version}
 %global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -530,6 +530,10 @@ cd ..
 %files -n go-toolset
 
 %changelog
+* Thu Jul 11 2024 Archana <aravinda@redhat.com> - 1.22.5-1
+- Rebase to Go1.22.5 to address CVE-2024-24791
+- Resolves: RHEL-46973
+
 * Thu Jun 27 2024 David Benoit <dbenoit@redhat.com> - 1.22.4-2
 - Fix panic in standard crypto mode without openssl
 - Resolves: RHEL-45359
diff --git a/sources b/sources
index 0ff7936..917fa45 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.22.4.tar.gz) = 0d12fed902663294530887e59c70ae2499c7fefae093cf9b5f77243e94948ac687199284765e38fb5adf1ba32bdbe4abb210877f3ce097679e4ed612ef163225
-SHA512 (go1.22.4-1-openssl-fips.tar.gz) = c383eb261594dd141394ba57612b288309c24bab1c3a968fa5b99f110e1c913973efd163a5093b4658932f3747faa97830005b1b5b3b9be370fe62a81e1e8f37
+SHA512 (go1.22.5.tar.gz) = e0208d239ce4a4965d3c33fe5befbb1e919a0a695c9ef87c9dfc42d8b888c34301a6eb06a848a4eb662459bc06445d2a1f07275aa5d5e4b0cadb83e0bca0cab7
+SHA512 (go1.22.5-1-openssl-fips.tar.gz) = 230fa331c2470a7a42c916cd1bec79fa423e913d7722235b4386b0aaf678e9baefc71d5c201a6d2c63d5936d06f2756b945ba54513109b046d569daeecc1cef3