From 0176a371f8658b7c93079734fdf1bec0fb253f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Fri, 5 Aug 2022 12:43:02 +0200
Subject: [PATCH] Update to Go 1.18.4

Resolves: rhbz#2109180
---
 .gitignore  |  1 +
 golang.spec | 18 ++++++++++--------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index edf2d0b..a341a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /go-go-1.17.2-1-openssl-fips.tar.gz
 /go-go-1.17.5-1-openssl-fips.tar.gz
 /go1.18.2-1-openssl-fips.tar.gz
+/go1.18.4-1-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 3d60c0f..9a15bf9 100644
--- a/golang.spec
+++ b/golang.spec
@@ -96,12 +96,12 @@
 %endif
 
 %global go_api 1.18
-%global go_version 1.18.2
+%global go_version 1.18.4
 %global pkg_release 1
 
 Name:           golang
 Version:        %{go_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
@@ -238,11 +238,8 @@ Requires:       %{name} = %{version}-%{release}
 %setup -q -n go-go%{go_version}-%{pkg_release}-openssl-fips
 
 %patch215 -p1
-
 %patch221 -p1
-
 %patch223 -p1
-
 %patch224 -p1
 
 cp %{SOURCE1} ./src/runtime/
@@ -439,17 +436,18 @@ export GO_TEST_RUN=""
 
 ./run.bash --no-rebuild -v -v -v -k $GO_TEST_RUN
 
-export OPENSSL_FORCE_FIPS_MODE=1
+#export OPENSSL_FORCE_FIPS_MODE=1
 # Run tests with FIPS enabled.
+GOLANG_FIPS=1 
 pushd crypto
   # Run all crypto tests but skip TLS, we will run FIPS specific TLS tests later
-  GOLANG_FIPS=1 go test $(go list ./... | grep -v tls) -v
+  go test $(go list ./... | grep -v tls) -v
   # Check that signature functions have parity between boring and notboring
   CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v
 popd
 # Run all FIPS specific TLS tests
 pushd crypto/tls
-  GOLANG_FIPS=1 go test -v -run "Boring"
+  go test -v -run "Boring"
 popd
 %else
 ./run.bash --no-rebuild -v -v -v -k || :
@@ -512,6 +510,10 @@ cd ..
 %endif
 
 %changelog
+* Fri Aug 05 2022 Alejandro Sáez <asm@redhat.com> - 1.18.4-1
+- Update to Go 1.18.4
+- Resolves: rhbz#2109180
+
 * Fri Jun 10 2022 David Benoit <dbenoit@redhat.com> - 1.18.2-2
 - Update deprecated openssl algorithms patch
 - Rebuild against openssl-3.0.1-33
diff --git a/sources b/sources
index fc339d8..e40521d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.18.2-1-openssl-fips.tar.gz) = 419221baddafd0654132f5f85001bdfe81691d73fa91f05150c9d39fdacce5acb2140cbfe5f9fa11f7934bde9554cea3eded493069162eebe554bf1e3b917302
+SHA512 (go1.18.4-1-openssl-fips.tar.gz) = 935f3ba3c2427b4e274b1f49b85f0702d6a2872580b70c5a500c82418a3b1729c0678e05d9ed5eb8eb0f0bc49e1302171f769fb7e15d90694db71f0223ecaa56