From aec400e35eb33e1b2306bdf898215a1e9622bd70 Mon Sep 17 00:00:00 2001
From: Milinda Brantini <C_A_T_T_E_R_Y@outlook.com>
Date: Wed, 18 Sep 2024 21:17:27 +0800
Subject: [PATCH] golang: Update to 1.23.1

go1.23.1 (released 2024-09-05) includes security fixes to the , ,
and packages, as well as bug fixes to the compiler, the command,
the runtime, and the , , , , and packages.
See the Go 1.23.1 milestone on our issue tracker for details.

Co-authored-by: Tianling Shen <cnsztl@immortalwrt.org>
Co-authored-by: Zephyr Lykos <git@mochaa.ws>
Signed-off-by: Milinda Brantini <C_A_T_T_E_R_Y@outlook.com>
---
 lang/golang/golang-build.sh    | 2 +-
 lang/golang/golang-compiler.mk | 2 +-
 lang/golang/golang-values.mk   | 3 ++-
 lang/golang/golang/Makefile    | 9 +++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lang/golang/golang-build.sh b/lang/golang/golang-build.sh
index fe8718ee761eb8..01df4aa427a5b8 100644
--- a/lang/golang/golang-build.sh
+++ b/lang/golang/golang-build.sh
@@ -120,7 +120,7 @@ build() {
 	if [ "$GO_GO_GENERATE" = 1 ]; then
 		log "Calling go generate"
 		# shellcheck disable=SC2086
-		GOOS='' GOARCH='' GO386='' GOARM='' GOMIPS='' GOMIPS64='' \
+		GOOS='' GOARCH='' GO386='' GOARM='' GOARM64='' GOMIPS='' GOMIPS64='' GORISCV64=''\
 		go generate -v $targets
 		log
 	fi
diff --git a/lang/golang/golang-compiler.mk b/lang/golang/golang-compiler.mk
index 50cc44905165c8..54d359b7740fa6 100644
--- a/lang/golang/golang-compiler.mk
+++ b/lang/golang/golang-compiler.mk
@@ -25,7 +25,7 @@ endef
 define GoCompiler/Default/Make
 	( \
 		cd "$(1)/src" ; \
-		$(if $(2),GOROOT_FINAL="$(2)/lib/go-$(3)") \
+		$(if $(2),GOROOT="$(2)/lib/go-$(3)") \
 		$(4) \
 		$(BASH) make.bash \
 		$(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \
diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk
index a2a10f04d33c26..9e0abde026f206 100644
--- a/lang/golang/golang-values.mk
+++ b/lang/golang/golang-values.mk
@@ -59,11 +59,13 @@ unexport \
 # Architecture-specific environment variables:
 unexport \
   GOARM \
+  GOARM64 \
   GO386 \
   GOAMD64 \
   GOMIPS \
   GOMIPS64 \
   GOPPC64 \
+  GORISCV64 \
   GOWASM
 
 # Environment variables for use with code coverage:
@@ -74,7 +76,6 @@ unexport \
 unexport \
   GCCGOTOOLDIR \
   GOEXPERIMENT \
-  GOROOT_FINAL \
   GO_EXTLINK_ENABLED
 # Unmodified:
 #   GIT_ALLOW_PROTOCOL
diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile
index b1ee96c76de123..6ac58507ec5c2e 100644
--- a/lang/golang/golang/Makefile
+++ b/lang/golang/golang/Makefile
@@ -7,8 +7,8 @@
 
 include $(TOPDIR)/rules.mk
 
-GO_VERSION_MAJOR_MINOR:=1.22
-GO_VERSION_PATCH:=7
+GO_VERSION_MAJOR_MINOR:=1.23
+GO_VERSION_PATCH:=1
 
 PKG_NAME:=golang
 PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
 
 PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f
+PKG_HASH:=6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d
 
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -65,6 +65,7 @@ HOST_GO_VALID_OS_ARCH:= \
   wasip1_wasm \
   \
   freebsd_riscv64 \
+  openbsd_riscv64 \
   \
   linux_ppc64 linux_ppc64le \
   linux_mips linux_mipsle linux_mips64 linux_mips64le \
@@ -394,7 +395,7 @@ define Build/Compile
 		cd "$(PKG_BUILD_DIR)/bin" ; \
 		export $(GO_PKG_TARGET_VARS) ; \
 		$(CP) go go-host ; \
-		GOROOT_FINAL="$(PKG_GO_ROOT)" \
+		GOROOT="$(PKG_GO_ROOT)" \
 		GO_GCC_HELPER_CC="$(TARGET_CC)" \
 		GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
 		$(PKG_GO_VARS) \