diff --git a/.golang.checksum b/.golang.checksum index 0ffb0b45636b2feeea2d93cb586b35807d0076a8..dc573b071216a2db99a16fe7f62b75116bff4602 100644 --- a/.golang.checksum +++ b/.golang.checksum @@ -1 +1 @@ -c1eb99c4d2872b8dfc9530b257ce88136849b91f4d0d3e75ab942daaf65898b8 +3fbacc1471ad62e0f0dcbc1e093eb7e17fa35828c145664cf477cf7905b00eee diff --git a/.golang.metadata b/.golang.metadata index 775f25374d4c754c7ac9db50ef725bf658f7ed1e..083433af78e14a85c2f677ae2e5e766073c86a71 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1,2 +1,2 @@ -1b4f338d9350ce7fb88bb9368223a0b9caecbce049ac78617f10509f68dce68d SOURCES/go1.20.12-1-openssl-fips.tar.gz +8cd0ee0631f0d14fdf114a02e8d96f50374f3757f5b56b46c5a240e301703df8 SOURCES/go1.20.12-2-openssl-fips.tar.gz 895824daee8f67b0cc7678f1d99d3259c8d3f9e0fba50eecd4c9f7f7110ffcd5 SOURCES/go1.20.12.tar.gz diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 6c22f33587599bfa0995ae8ccf01adaceb654463..9985f0326db85a4c7b658eb49ce930893db8ef3f 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