From f4b49d9f794ac2d5dcdebe5bd33b65e8cc14e9e6 Mon Sep 17 00:00:00 2001
From: Twaik Yont <9674930+twaik@users.noreply.github.com>
Date: Wed, 5 Mar 2025 23:15:11 +0200
Subject: [PATCH] bump(main/golang): 1.24.1

---
 packages/golang/build.sh                   |  9 +++--
 packages/mediamtx/build.sh                 |  7 ++--
 packages/sops/build.sh                     |  7 +---
 packages/sops/go-sockaddr.diff             | 40 ----------------------
 packages/step-cli/build.sh                 |  1 +
 scripts/build/setup/termux_setup_golang.sh |  4 +--
 6 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 packages/sops/go-sockaddr.diff

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index cb1914e29e44aeb..9db278d579e73d6 100644
--- 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
index 3c67b7aa5b387b4..c908c1227cd05a6 100644
--- a/packages/mediamtx/build.sh
+++ b/packages/mediamtx/build.sh
@@ -3,20 +3,19 @@ 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
index 5705688257e0085..769ee637086bc97 100644
--- 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
deleted file mode 100644
index f4210f5f3b0cc25..000000000000000
--- a/packages/sops/go-sockaddr.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/route_info_android.go b/route_info_android.go
-index 9885915a..94c25789 100644
---- a/route_info_android.go
-+++ b/route_info_android.go
-@@ -5,10 +5,6 @@ import (
- 	"os/exec"
- )
-
--type routeInfo struct {
--	cmds map[string][]string
--}
--
- // NewRouteInfo returns a Android-specific implementation of the RouteInfo
- // interface.
- func NewRouteInfo() (routeInfo, error) {
-diff --git a/route_info_default.go b/route_info_default.go
-index 6df864ba..db0052fa 100644
---- a/route_info_default.go
-+++ b/route_info_default.go
-@@ -1,5 +1,5 @@
--//go:build android || nacl || plan9 || js
--// +build android nacl plan9 js
-+//go:build nacl || plan9 || js
-+// +build nacl plan9 js
-
- package sockaddr
-
-@@ -8,12 +8,3 @@ func getDefaultIfName() (string, error) {
- 	return "", ErrNoInterface
- }
-
--func NewRouteInfo() (routeInfo, error) {
--	return routeInfo{}, ErrNoRoute
--}
--
--// GetDefaultInterfaceName returns the interface name attached to the default
--// route on the default interface.
--func (ri routeInfo) GetDefaultInterfaceName() (string, error) {
--	return "", ErrNoInterface
--}
diff --git a/packages/step-cli/build.sh b/packages/step-cli/build.sh
index cfab81b3c30ca8b..3596e4ed9fc1e89 100644
--- 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
index 52414f31aa9794e..bc8694903e7eab6 100644
--- 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