diff --git a/disable_static_tests_part2.patch b/disable_static_tests_part2.patch index aa2d91c0bd249b12df302b9e9e348cb6d27a86b9..494de221c702153c51c029b4e6f355f1f3ed9d7a 100644 --- a/disable_static_tests_part2.patch +++ b/disable_static_tests_part2.patch @@ -1,13 +1,13 @@ diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index 9f26606..2408505 100644 +index 36a20e8b2a..8c2dd1b44b 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go -@@ -1259,7 +1259,7 @@ func (t *tester) registerCgoTests() { +@@ -1125,7 +1125,7 @@ func (t *tester) registerCgoTests(heading string) { } else { panic("unknown linkmode with static build: " + linkmode) } - gt.tags = append(gt.tags, "static") + gt.tags = append(gt.tags, "static", "no_openssl") } + gt.ldflags = strings.Join(ldflags, " ") - t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...) diff --git a/download b/download index c3379ce696181054e68ab1701393c544ebdeece3..27483112441024ab7c9fb2ad00e45927207e4f0a 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -0c9728efea933bed07844876916b3ca8 go1.20.12-2-openssl-fips.tar.gz -15df1e4abd8a1eaa69ca79be9a9cded4 go1.20.12.tar.gz +2f25a32ddb3746dc472ddf3aad9f264c go1.21.7-1-openssl-fips.tar.gz +90359cb50dd85dcc051c7e616f2f56fe go1.21.7.tar.gz diff --git a/fix-memleak-rsa-ecdh.patch b/fix-memleak-setupRSA.patch similarity index 100% rename from fix-memleak-rsa-ecdh.patch rename to fix-memleak-setupRSA.patch diff --git a/golang.spec b/golang.spec index f07e45bb428d1a3913265fe2865eb68400dc9a4f..b6cca83b3160e02a1780749b08bffebc138c0276 100644 --- a/golang.spec +++ b/golang.spec @@ -30,20 +30,20 @@ # Define GOROOT macros %global goroot %{_prefix}/lib/%{name} %global gopath %{_datadir}/gocode -%global golang_arches x86_64 aarch64 ppc64le s390x loongarch64 +%global golang_arches x86_64 aarch64 ppc64le s390x %global golibdir %{_libdir}/%{name} # Golang build options. # Build golang using external/internal(close to cgo disabled) linking. -%ifarch x86_64 ppc64le %{arm} aarch64 s390x loongarch64 +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global external_linker 1 %else %global external_linker 0 %endif # Build golang with cgo enabled/disabled(later equals more or less to internal linking). -%ifarch x86_64 ppc64le %{arm} aarch64 s390x loongarch64 +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global cgo_enabled 1 %else %global cgo_enabled 0 @@ -57,7 +57,7 @@ %endif # Controls what ever we fail on failed tests -%ifarch x86_64 %{arm} aarch64 ppc64le s390x loongarch64 +%ifarch x86_64 %{arm} ppc64le s390x %global fail_on_tests 1 %else %global fail_on_tests 0 @@ -91,17 +91,14 @@ %ifarch s390x %global gohostarch s390x %endif -%ifarch loongarch64 -%global gohostarch loong64 -%endif -%global go_api 1.20 -%global version 1.20.12 -%global pkg_release 2 +%global go_api 1.21 +%global version 1.21.7 +%global pkg_release 1 Name: golang Version: %{version} -Release: 8%{anolis_release}%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -118,9 +115,6 @@ Source1: https://github.com/golang-fips/go/archive/refs/tags/go%{version}- # make possible to override default traceback level at build time by setting build tag rpm_crashtraceback Source2: fedora.go -Source3: loongarch64.tar.gz -Source4: loongarch64.patches - # The compiler is written in Go. Needs go(1.4+) compiler for build. # Actual Go based bootstrap compiler provided by above source. %if !%{golang_bootstrap} @@ -144,17 +138,16 @@ Requires: %{name}-src = %{version}-%{release} Requires: openssl-devel Requires: diffutils - # Proposed patch by jcajka https://golang.org/cl/86541 Patch221: fix_TestScript_list_std.patch -Patch222: skip-test-overlong-message.patch +Patch229: fix-memleak-setupRSA.patch Patch1939923: skip_test_rhbz1939923.patch Patch2: disable_static_tests_part1.patch Patch3: disable_static_tests_part2.patch - -Patch229: fix-memleak-rsa-ecdh.patch +Patch4: skip-test-overlong-message.patch +Patch5: modify_go.env.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -251,10 +244,9 @@ Requires: %{name} = %{version}-%{release} pushd .. tar -xf %{SOURCE1} popd - -for patch in ../go-go%{version}-%{pkg_release}-openssl-fips/patches/*.patch; do - patch -p1 < "${patch}" -done +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 # Configure crypto tests pushd ../go-go%{version}-%{pkg_release}-openssl-fips @@ -262,25 +254,9 @@ ln -s ../go-go%{version} go ./scripts/configure-crypto-tests.sh popd -## Apply loongarch64 patches -tar xf %{SOURCE3} -for p in $(cat %{SOURCE4}); do - patch -p1 -s -i loongarch64/$p -done - -## Delete loongarch64 directory -rm -rf loongarch64 - -%patch2 -p1 -%patch3 -p1 - -%patch221 -p1 -%patch222 -p1 - -%patch229 -p1 - -%patch1939923 -p1 +%autopatch -p1 +sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION cp %{SOURCE2} ./src/runtime/ @@ -351,7 +327,7 @@ rm -rf pkg/bootstrap/bin # install everything into libdir (until symlink problems are fixed) # https://code.google.com/p/go/issues/detail?id=5830 -cp -apv api bin doc lib pkg src misc test VERSION \ +cp -apv api bin doc lib pkg src misc test go.env VERSION \ $RPM_BUILD_ROOT%{goroot} # bz1099206 @@ -538,42 +514,47 @@ cd .. %files -f go-pkg.list bin %{_bindir}/go %{_bindir}/gofmt +%{goroot}/go.env %if %{shared} %files -f go-shared.list shared %endif %changelog -* Mon May 13 2024 Chang Gao - 1.20.12-8.0.1 +* Mon May 27 2024 Chang Gao - 1.21.7-2.0.1 - disable DISABLE_BoringCertAlgs_TEST test -- Add LoongArch64 support. (limeidan@loongson.cn) - -* Wed Apr 10 2024 David Benoit - 1.20.12-8 -- Update sources file -- Related: RHEL-27928 -* Tue Apr 09 2024 David Benoit - 1.20.12-7 +* Mon Apr 1 2024 Archana Ravindar - 1.21.7-2 - Fix CVE-2024-1394 -- Resolves: RHEL-27928 - -* Mon Apr 08 2024 Derek Parker - 1.20.12-6 -- Fix CVE-2023-45288 -- Resolves: RHEL-31914 - -* Wed Dec 13 2023 David Benoit - 1.20.12-2 -- Fix sources file -- Related: RHEL-19231 - -* Tue Dec 12 2023 David Benoit - 1.20.12-1 -- Update to Go 1.20.12 -- Fix CVE-2023-39326 -- Resolves: RHEL-19231 - -* Fri Oct 13 2023 David Benoit - 1.20.10-1 -- Update to Go 1.20.10 -- Fix CVE-2023-39325 -- Midstream patches -- Resolves: RHEL-12619 +- Resolves RHEL-24300 + +* Tue Feb 13 2024 Alejandro Sáez - 1.21.7-1 +- Rebase to Go 1.21.7 +- Add release information +- Set GOTOOLCHAIN to local +- Skip TestOverlongMessagePKCS1v15 +- Resolves: RHEL-24082 +- Resolves: RHEL-18363 +- Resolves: RHEL-18382 + +* Wed Nov 08 2023 David Benoit - 1.21.3-4 +- Do not remove GOPROXY/GOSUMDB +- Related: RHEL-12620 + +* Thu Nov 02 2023 David Benoit - 1.21.3-3 +- Fix go.env in Go 1.21 +- Related: RHEL-12620 + +* Tue Oct 31 2023 Archana Ravindar - 1.21.3-2 +- Rebase disable_static_tests_part2.patch to Go 1.21.3 +- Add missing strict fips runtime detection patch +- Temporarily disable FIPS tests on aarch64 due to builder kernel bugs +- Remove fix-memory-leak patch as it is fixed upstream +- Resolves: RHEL-12620 + +* Fri Oct 20 2023 Archana Ravindar - 1.21.3-1 +- Rebase Go to 1.21.3 +- Resolves: RHEL-12620 * Mon Aug 14 2023 Alejandro Sáez - 1.20.6-2 - Retire golang-race package diff --git a/loongarch64.patches b/loongarch64.patches deleted file mode 100644 index 36d30363f32c7136ae3bfa795398facb2f689fe7..0000000000000000000000000000000000000000 --- a/loongarch64.patches +++ /dev/null @@ -1,97 +0,0 @@ -0001-oldabi-fix-misc-cgo-test-sigaltstack-size-on-loong64.patch -0002-oldabi-fix-mabi-to-lp64-for-loong64.patch -0003-oldabi-fix-runtime-defs_linux_loong64.patch -0004-oldabi-fix-test-issue11656-for-loong64.patch -0005-oldabi-fixup-stack-growth-after-fork-in-runtime.sigf.patch -0006-cmd-asm-add-RDTIME-L-H-.W-RDTIME.D-support-for-loong.patch -0007-runtime-implement-cputicks-with-the-stable-counter-o.patch -0008-runtime-remove-the-fake-mstart-caller-in-systemstack.patch -0009-cmd-internal-obj-loong64-save-LR-after-decrementing-.patch -0010-runtime-refactor-the-linux-loong64-entrypoint.patch -0011-cmd-internal-obj-loong64-remove-invalid-branch-delay.patch -0012-runtime-calculate-nanoseconds-in-usleep-on-linux-loo.patch -0013-cmd-internal-obj-remove-redundant-cnames-on-loong64.patch -0014-runtime-save-fetch-g-register-during-VDSO-on-loong64.patch -0015-runtime-save-restore-callee-saved-registers-in-loong.patch -0016-runtime-add-comment-for-sys_linux_loong64.patch -0017-runtime-mark-morestack_noctxt-SPWRITE-for-linux-loon.patch -0018-cmd-internal-obj-loong64-add-the-PCALAU12I-instructi.patch -0019-runtime-add-support-for-buildmode-c-shared-on-loong6.patch -0020-cmd-compile-add-support-for-buildmode-c-shared-on-lo.patch -0021-cmd-internal-obj-loong64-cmd-internal-objabi-add-c-s.patch -0022-cmd-link-add-support-for-buildmode-c-shared-on-loong.patch -0023-cmd-internal-sys-enable-c-shared-feature-on-loong64.patch -0024-cmd-dist-misc-cgo-testcshared-enable-c-shared-test-o.patch -0025-cmd-compile-cmd-link-cmd-internal-runtime-support-bu.patch -0026-cmd-link-cmd-internal-runtime-support-buildmode-plug.patch -0027-cmd-asm-link-loong64-Implement-the-IE-model-to-acces.patch -0028-cmd-compile-cmd-dist-cmd-go-enable-pie-buildmode-for.patch -0029-cmd-internal-runtime-enable-memory-sanitizer-on-loon.patch -0030-enable-test-for-msan.patch -0031-cmd-internal-runtime-enable-address-sanitizer-on-loo.patch -0032-enable-test-for-asan.patch -0033-enable-test-for-buildmode-share-plugin.patch -0034-net-disable-TestLookupDotsWithRemoteSource-and-TestL.patch -0035-enable-c-archive-test-on-linux-loong64.patch -0036-runtime-no-need-to-save-these-registers-in-load_g-sa.patch -0037-cmd-internal-obj-loong64-add-support-for-movgr2cf-an.patch -0038-runtime-save-and-restore-fcc-registers-in-async-pree.patch -0039-cmd-cmd-vendor-pick-up-updates-for-golang.org-x-arch.patch -0040-cmd-internal-objfile-add-loong64-disassembler-suppor.patch -0041-cmd-compile-disable-address-folding-for-globals-for-.patch -0042-runtime-remove-the-meaningless-offset-of-8-for-duffz.patch -0043-cmd-compiler-remove-the-meaningless-offset-of-8-for-.patch -0044-cmd-compile-internal-runtime-use-NOOP-for-hardware-N.patch -0045-cmd-link-internal-loong64-use-BREAK-0-as-the-code-pa.patch -0046-cmd-asm-runtime-remove-the-RSB-register-from-loong64.patch -0047-cmd-internal-obj-loong64-realize-all-unconditional-j.patch -0048-cmd-internal-obj-loong64-clean-up-code-for-short-con.patch -0049-cmd-internal-obj-loong64-assemble-BEQ-BNEs-comparing.patch -0050-cmd-internal-obj-loong64-remove-Optab.family-and-reo.patch -0051-cmd-asm-support-the-PCALIGN-directive-on-loong64.patch -0052-internal-bytealg-runtime-align-some-loong64-asm-loop.patch -0053-cmd-link-bump-loong64-function-alignment-to-16-bytes.patch -0054-cmd-compile-optimize-multiplication-on-loong64.patch -0055-cmd-compile-split-DIVV-DIVVU-op-on-loong64.patch -0056-cmd-internal-obj-loong64-auto-align-loop-heads-to-16.patch -0057-cmd-internal-obj-loong64-add-atomic-memory-access-in.patch -0058-cmd-compiler-runtime-internal-atomic-optimize-xchg-a.patch -0059-cmd-compiler-runtime-internal-atomic-optimize-xadd-a.patch -0060-cmd-compiler-runtime-internal-atomic-optimize-And-32.patch -0061-syscall-implement-Ptrace-Set-Get-Regs-using-PTRACE_-.patch -0062-cmd-internal-obj-loong64-remove-the-invalid-plan9-fo.patch -0063-internal-sysinfo-print-cpu-type-from-cpuinfo-when-in.patch -0064-cmd-compiler-runtime-internal-atomic-Implementing-xc.patch -0065-cmd-compiler-runtime-internal-atomic-Implementing-xa.patch -0066-cmd-compiler-runtime-internal-atomic-Implementing-An.patch -0067-cmd-internal-obj-loong64-correct-the-instruction-for.patch -0068-cmd-internal-obj-loong64-recheck-jump-offset-boundar.patch -0069-runtime-fix-the-vDSO-symbol-version-for-kernel-4.19-.patch -0070-cmd-link-internal-loadelf-correct-the-relocation-siz.patch -0071-cmd-compile-cmd-internal-runtime-change-the-register.patch -0072-cmd-compile-add-ABI-register-definations-for-loong64.patch -0073-cmd-compile-cmd-internal-runtime-change-registers-on.patch -0074-internal-abi-define-loong64-regABI-constants.patch -0075-cmd-compile-internal-add-register-info-for-loong64-r.patch -0076-cmd-compile-internal-add-spill-support-for-loong64-r.patch -0077-cmd-compile-update-loong64-CALL-ops.patch -0078-runtime-make-duff-device-as-ABIInternal-for-loong64.patch -0079-runtime-support-regABI-and-add-spill-functions-in-ru.patch -0080-reflect-runtime-add-reflect-support-for-regABI-on-lo.patch -0081-internal-bytealg-add-regABI-support-in-bytealg-funct.patch -0082-runtime-add-regABI-support-in-memclr-and-memmove-fun.patch -0083-cmd-internal-obj-set-morestack-arg-spilling-and-rega.patch -0084-cmd-compile-fix-If-lowering-on-loong64.patch -0085-runtime-internal-syscall-use-ABIInternal-for-Syscall.patch -0086-cmd-compile-internal-buildcfg-enable-regABI-on-loong.patch -0087-internal-abi-internal-buildcfg-always-enable-registe.patch -0088-all-delete-loong64-non-register-ABI-fallback-path.patch -0089-cmd-internal-obj-loong64-using-LookupABI-to-find-duf.patch -0090-cmd-internal-cmd-link-unify-the-relocation-nameing-s.patch -0091-oldabi-fix-the-definition-of-members-in-the-PtraceRe.patch -0092-cmd-internal-obj-loong64-remove-unused-register-alia.patch -0093-cmd-internal-runtime-change-the-LR-parameter-registe.patch -0094-syscall-add-a-Go-directive-go-nocheckptr-to-forkAndE.patch -0095-src-runtime-mark-asanread-and-asanwrite-functions-as.patch -0096-cmd-dist-update-isUnsupportedVMASize-test-skip.patch - diff --git a/loongarch64.tar.gz b/loongarch64.tar.gz deleted file mode 100644 index c2cdaab8bbcf2c8e710334504febcb82ca264cdc..0000000000000000000000000000000000000000 Binary files a/loongarch64.tar.gz and /dev/null differ diff --git a/modify_go.env.patch b/modify_go.env.patch new file mode 100644 index 0000000000000000000000000000000000000000..398f5c0c990e1d6cf448090e69ce5f40e576d1d7 --- /dev/null +++ b/modify_go.env.patch @@ -0,0 +1,22 @@ +From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= +Date: Fri, 9 Feb 2024 20:06:16 +0100 +Subject: [PATCH] Set GOTOOLCHAIN to local + +--- + go.env | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/go.env b/go.env +index 6ff2b921d4..e87f6e7b6d 100644 +--- a/go.env ++++ b/go.env +@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org + + # Automatically download newer toolchains as directed by go.mod files. + # See https://go.dev/doc/toolchain for details. +-GOTOOLCHAIN=auto ++GOTOOLCHAIN=local +-- +2.43.0 +