From d6a7dc110e592188620a1a9df7fe69d9b3c90bcb Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 23 Apr 2024 01:25:50 +0000
Subject: [PATCH] import UBI golang-1.20.12-8.module+el8.9.0+21735+6a7c8cc8

---
 .gitignore        |  2 +-
 .golang.metadata  |  2 +-
 SPECS/golang.spec | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 064d926..cfa204d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/go1.20.12-1-openssl-fips.tar.gz
+SOURCES/go1.20.12-2-openssl-fips.tar.gz
 SOURCES/go1.20.12.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 7fa7699..07c4ff0 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1,2 +1,2 @@
-551cf7aae2d428bb376cf2b8d56443ab2ee7d133 SOURCES/go1.20.12-1-openssl-fips.tar.gz
+f57205df5fc5d2e0392ca39c795c6d60d22f0c80 SOURCES/go1.20.12-2-openssl-fips.tar.gz
 6d5bc127443fc42b1af8d9ba4115abe18554feb7 SOURCES/go1.20.12.tar.gz
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index 6c22f33..9985f03 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -93,11 +93,11 @@
 
 %global go_api 1.20
 %global version 1.20.12
-%global pkg_release 1
+%global pkg_release 2
 
 Name:           golang
 Version:        %{version}
-Release:        3%{?dist}
+Release:        8%{?dist}
 
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -244,9 +244,10 @@ 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
+
+for patch in ../go-go%{version}-%{pkg_release}-openssl-fips/patches/*.patch; do
+  patch -p1 < "${patch}"
+done
 
 # Configure crypto tests
 pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@@ -525,10 +526,18 @@ cd ..
 %endif
 
 %changelog
-* Tue Mar 05 2024 David Benoit <dbenoit@redhat.com> - 1.20.12-3
+* Wed Apr 10 2024 David Benoit <dbenoit@redhat.com> - 1.20.12-8
+- Update sources file
+- Related: RHEL-27928
+
+* Tue Apr 09 2024 David Benoit <dbenoit@redhat.com> - 1.20.12-7
 - Fix CVE-2024-1394
 - Resolves: RHEL-27928
 
+* Mon Apr 08 2024 Derek Parker <deparker@redhat.com> - 1.20.12-6
+- Fix CVE-2023-45288
+- Resolves: RHEL-31914
+
 * Wed Dec 13 2023 David Benoit <dbenoit@redhat.com> - 1.20.12-2
 - Fix sources file
 - Related: RHEL-19231