diff --git a/packages/golang/build.sh b/packages/golang/build.sh index cddd48fb0176fb..8b266f8fa801fc 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/ TERMUX_PKG_DESCRIPTION="Go programming language compiler" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -_MAJOR_VERSION=1.22 +_MAJOR_VERSION=1.23 # Use the ~ deb versioning construct in the future: -TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.5 +TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.0 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${TERMUX_PKG_VERSION#*:}.src.tar.gz -TERMUX_PKG_SHA256=ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 +TERMUX_PKG_SHA256=42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 TERMUX_PKG_DEPENDS="clang" TERMUX_PKG_ANTI_BUILD_DEPENDS="clang" TERMUX_PKG_RECOMMENDS="resolv-conf" @@ -44,6 +44,7 @@ termux_step_make_install() { cp bin/$TERMUX_GOLANG_DIRNAME/{go,gofmt} $TERMUX_GODIR/bin/ ln -sfr $TERMUX_GODIR/bin/go $TERMUX_PREFIX/bin/go ln -sfr $TERMUX_GODIR/bin/gofmt $TERMUX_PREFIX/bin/gofmt + cp go.env $TERMUX_GODIR/ cp VERSION $TERMUX_GODIR/ cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/ cp -Rf src/* $TERMUX_GODIR/src/ diff --git a/packages/golang/fix-GOPROXY-and-GOSUMDB-default-is-empty.patch b/packages/golang/fix-GOPROXY-and-GOSUMDB-default-is-empty.patch deleted file mode 100644 index c17284999aa381..00000000000000 --- a/packages/golang/fix-GOPROXY-and-GOSUMDB-default-is-empty.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/golang/go/commit/7aa85e01376d840acc8bb931156d607a00b64a60 - -diff -uNr go/src/cmd/go/internal/cfg/cfg.go go.mod/src/cmd/go/internal/cfg/cfg.go ---- go/src/cmd/go/internal/cfg/cfg.go 2023-08-05 04:14:06.000000000 +0800 -+++ go.mod/src/cmd/go/internal/cfg/cfg.go 2023-08-12 16:33:35.167682584 +0800 -@@ -417,8 +417,8 @@ - GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", buildcfg.GOPPC64)) - GOWASM = envOr("GOWASM", fmt.Sprint(buildcfg.GOWASM)) - -- GOPROXY = envOr("GOPROXY", "") -- GOSUMDB = envOr("GOSUMDB", "") -+ GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct") -+ GOSUMDB = envOr("GOSUMDB", "sum.golang.org") - GOPRIVATE = Getenv("GOPRIVATE") - GONOPROXY = envOr("GONOPROXY", GOPRIVATE) - GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index 01fb55a3aea601..5dc899f6630a34 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -1,11 +1,11 @@ # Utility function for golang-using packages to setup a go toolchain. termux_setup_golang() { if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - local TERMUX_GO_VERSION=go1.22.5 - local TERMUX_GO_SHA256=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 + local TERMUX_GO_VERSION=go1.23.0 + local TERMUX_GO_SHA256=905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3 if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then - TERMUX_GO_VERSION=go1.21.12 - TERMUX_GO_SHA256=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5 + TERMUX_GO_VERSION=go1.22.6 + TERMUX_GO_SHA256=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616 fi local TERMUX_GO_PLATFORM=linux-amd64