From 6675af6177f12e3ed7f96c979f17015e47b4cebc Mon Sep 17 00:00:00 2001
From: jackeyji <jackeyji@tencent.com>
Date: Tue, 24 Jun 2025 17:13:38 +0800
Subject: [PATCH] upgrade to 1.24.4 to fix CVE-2025-22874

Signed-off-by: jackeyji <jackeyji@tencent.com>
---
 apply-patches                                 |  2 +-
 golang.spec                                   |  8 +++++--
 ...h64-1.24.2.conf => loongarch64-1.24.4.conf | 24 +++++++++++++++++++
 sources                                       |  4 ++--
 4 files changed, 33 insertions(+), 5 deletions(-)
 rename loongarch64-1.24.2.conf => loongarch64-1.24.4.conf (72%)

diff --git a/apply-patches b/apply-patches
index aead6cc..5e6e6f5 100644
--- a/apply-patches
+++ b/apply-patches
@@ -2,7 +2,7 @@
 
 set -ex
 
-goversion="1.24.2"
+goversion="1.24.4"
 
 if [ ! -d loongarch64 ]; then
 	tar -xf loongarch64-${goversion}.tar.gz
diff --git a/golang.spec b/golang.spec
index d9584be..7f1d58a 100644
--- a/golang.spec
+++ b/golang.spec
@@ -1,7 +1,7 @@
 # after we have putting golang into repo, we should shift bootstrap closing.
 %bcond_with bootstrap
 
-%global baserelease 2
+%global baserelease 1
 
 %global golibdir %{_libdir}/golang
 
@@ -75,7 +75,7 @@
 
 
 Name:           golang
-Version:        1.24.2
+Version:        1.24.4
 Release:        %{baserelease}%{?dist}
 Summary:        An open source programming language supported by Google
 License:        BSD and Public Domain
@@ -369,6 +369,10 @@ fi
 
 
 %changelog
+* Tue Jun 24 2025 jackeyji <jackeyji@tencent.com> - 1.24.4-1
+- [Type] security
+- [DESC] upgrade to 1.24.4 to fix CVE-2025-22874
+
 * Thu Apr 24 2025 jackeyji <jackeyji@tencent.com> - 1.24.2-2
 - [Type] bugfix
 - [DESC] Because some usecases fail under loongarch64, disable it now
diff --git a/loongarch64-1.24.2.conf b/loongarch64-1.24.4.conf
similarity index 72%
rename from loongarch64-1.24.2.conf
rename to loongarch64-1.24.4.conf
index a0c951f..260b285 100644
--- a/loongarch64-1.24.2.conf
+++ b/loongarch64-1.24.4.conf
@@ -60,3 +60,27 @@
 0060-runtime-delete-redundant-branch-jumps-in-memclrNoHea.patch
 0061-cmd-compile-set-unalignedOK-to-make-memcombine-work-.patch
 0062-runtime-optimize-the-function-memmove-using-SIMD-on-.patch
+0063-internal-chacha8rand-implement-func-block-in-assembl.patch
+0064-cmd-internal-obj-loong64-cmd-asm-add-V-XV-SET-EQ-NE-.patch
+0065-runtime-optimize-the-function-memequal-using-SIMD-on.patch
+0066-cmd-internal-obj-add-new-assembly-format-for-BFPT-an.patch
+0067-runtime-internal-fuzz-add-comparison-tracing-for-lib.patch
+0068-crypto-sha256-improve-performance-of-loong64.patch
+0069-crypto-sha512-improve-performance-of-loong64.patch
+0070-cmd-internal-obj-loong64-add-X-VFRINT-RNE-RZ-RP-RM-..patch
+0071-runtime-optimize-the-function-indexbyte-using-SIMD-o.patch
+0072-cmd-internal-obj-loong64-add-X-VF-ADD-SUB-MUL-DIV-.-.patch
+0073-internal-bytealg-optimize-the-function-compare-using.patch
+0074-cmd-internal-obj-loong64-add-X-VFCLASS.-S-D-instruct.patch
+0075-cmd-intarnal-obj-add-new-assembly-format-for-VANDB-o.patch
+0076-cmd-compile-fold-negation-into-addition-subtraction-.patch
+0077-cmd-internal-obj-loong64-Add-preld-x-instructions-su.patch
+0078-cmd-compile-add-prefetch-intrinsic-support-on-loong6.patch
+0079-cmd-compile-fix-the-implementation-of-NORconst-on-lo.patch
+0080-crypto-subtle-optimize-function-xorBytes-using-SIMD-.patch
+0081-cmd-compile-add-rules-about-ORN-and-ANDN.patch
+0082-runtime-check-for-gsignal-in-racecall-on-loong64.patch
+0083-crypto-sha512-use-const-table-for-key-loading-on-loo.patch
+0084-crypto-sha256-use-const-table-for-key-loading-on-loo.patch
+0085-runtime-add-reference-to-debugPinnerV1.patch
+0086-cmd-internal-obj-loong64-add-X-VLDREPL.-B-H-W-D-inst.patch
diff --git a/sources b/sources
index c457f90..a937d15 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (go1.24.2.src.tar.gz) = 6366a32f6678e7908b138f62dafeed96f7144b3b93505e75fba374b33727da8b1d087c1f979f493382b319758ebfcbeb30e9d7dadcb2923b628c8abe7db41c6f
-SHA512 (loongarch64-1.24.2.tar.gz) = d10c00174ed2e87dd806dabe3777e695f023281ec6d2e1aa16bb3a315ad8730e7581a62bdc92f7c1e6dd04350ed63d8b32a8d75fbe078bfe944c0b0f7cad433a
+SHA512 (go1.24.4.src.tar.gz) = b785583fc53d62094b2de793a0e3281a26d2de17897a35b378fc2d13cb912ca473c37a7bae54a50660141809d5d0a70a97663d406cf30d7f0221ecbb5ffddec6
+SHA512 (loongarch64-1.24.4.tar.gz) = 2fa9f4ef418929bb00f29a1d39e45d8715de7b8b3f0937fe4e524ba9ebfaa96bcb9ccc6d056b12990987f21e1918dfa0bd7bf4e56f944822ca0490609bc8dc08
-- 
Gitee