bump(main/golang): 1.24.1

termux · Mar 8, 2025 · 7ebd5c2 · 7ebd5c2
1 parent 89853e9
commit 7ebd5c2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 56 deletions.
diff --git a/packages/golang/build.sh b/packages/golang/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3:1.24.0
+TERMUX_PKG_VERSION="3:1.24.1"
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
-TERMUX_PKG_SHA256=d14120614acb29d12bcab72bd689f257eb4be9e0b6f88a8fb7e41ac65f8556e5
+TERMUX_PKG_SHA256=8244ebf46c65607db10222b5806aeb31c1fcf8979c1b6b12f60c677e9a3c0656
 TERMUX_PKG_DEPENDS="clang"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
 TERMUX_PKG_RECOMMENDS="resolv-conf"
@@ -51,8 +51,7 @@ termux_step_make_install() {
 	cp pkg/include/* $TERMUX_GODIR/pkg/include/
 	cp -Rf lib/* $TERMUX_GODIR/lib
 	cp -Rf misc/ $TERMUX_GODIR/
-}
 
-termux_step_post_massage() {
-	find . -path '*/testdata*' -delete
+	# testdata directories are not needed on the installed system
+	find $TERMUX_GODIR/src -path '*/testdata*' -delete
 }
diff --git a/packages/mediamtx/build.sh b/packages/mediamtx/build.sh
@@ -3,20 +3,20 @@ TERMUX_PKG_DESCRIPTION="Ready-to-use SRT / WebRTC / RTSP / RTMP / LL-HLS media s
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.11.3"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/bluenviron/mediamtx/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cdd46bbbfe2be95057df8eb5016b88328063255c38e0e42d27abccd7d3ebbad6
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_AUTO_UPDATE=true
 
-termux_step_host_build() {
+termux_step_post_get_source() {
 	termux_setup_golang
-	pushd "${TERMUX_PKG_SRCDIR}"
 	go generate ./...
-	popd
 }
 
 termux_step_make() {
+	termux_setup_golang
 	echo "v${TERMUX_PKG_VERSION}" > "${TERMUX_PKG_SRCDIR}"/internal/core/VERSION
 	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
 

diff --git a/packages/sops/build.sh b/packages/sops/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Simple and flexible tool for managing secrets"
 TERMUX_PKG_LICENSE="MPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.9.4"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/getsops/sops/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3e0fc9a43885e849eba3b099d3440c3147ad0a0cd5dd77a9ef87c266a8488249
 TERMUX_PKG_AUTO_UPDATE=true
@@ -17,12 +18,6 @@ termux_step_make_install() {
 	cd "${GOPATH}/src/github.com/getsops/sops" || return 9
 	go get -d -v
 
-	local d
-	for d in ${GOPATH}/pkg/mod/github.com/hashicorp/go-sockaddr*; do
-		chmod +w -R "${d}"
-		patch --silent -p1 -d "${d}" < "$TERMUX_PKG_BUILDER_DIR/go-sockaddr.diff" || :
-	done
-
 	make install
 
 	install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops"

diff --git a/packages/sops/go-sockaddr.diff b/packages/sops/go-sockaddr.diff
diff --git a/packages/step-cli/build.sh b/packages/step-cli/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="An easy-to-use CLI tool for building, operating, and aut
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.28.5"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/smallstep/cli/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4188648a7a4bd43e7cf418c8a053d36183bc4844251329c371ab33c75749fc4b
 TERMUX_PKG_AUTO_UPDATE=true

diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh
@@ -1,8 +1,8 @@
 # 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.24.0
-		local TERMUX_GO_SHA256=dea9ca38a0b852a74e81c26134671af7c0fbe65d81b0dc1c5bfe22cf7d4c8858
+		local TERMUX_GO_VERSION=go1.24.1
+		local TERMUX_GO_SHA256=cb2396bae64183cdccf81a9a6df0aea3bce9511fc21469fb89a0c00470088073
 		if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then
 			TERMUX_GO_VERSION=go1.22.6
 			TERMUX_GO_SHA256=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616