From 17d6db212b3a7e63001de012c72d0815d417ebb1 Mon Sep 17 00:00:00 2001
From: okhex <gabrielluc983@proton.me>
Date: Thu, 9 Jan 2025 20:03:55 +0530
Subject: [PATCH] bump(main/golang): 1.23.4 Drop obsolete comment regarding rc
 versions. Drop use of a separate `_MAJOR_VERSION` variable as it is unused.
 Co-authored-by: TomIO <43716232+TomJo2000@users.noreply.github.com>

---
 packages/golang/build.sh                      |  6 ++----
 .../golang/patch-script/remove-pidfd.diff     | 20 ++++++++++---------
 scripts/build/setup/termux_setup_golang.sh    |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index 0e5df3b5382f37..782a82f848c0c0 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -2,11 +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"
-_MAJOR_VERSION=1.23
-# Use the ~ deb versioning construct in the future:
-TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.2
+TERMUX_PKG_VERSION=3:1.23.4
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
-TERMUX_PKG_SHA256=36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f
+TERMUX_PKG_SHA256=ad345ac421e90814293a9699cca19dd5238251c3f687980bbcae28495b263531
 TERMUX_PKG_DEPENDS="clang"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
 TERMUX_PKG_RECOMMENDS="resolv-conf"
diff --git a/packages/golang/patch-script/remove-pidfd.diff b/packages/golang/patch-script/remove-pidfd.diff
index 2a606c37b09b06..386e8f3ee34ec8 100644
--- a/packages/golang/patch-script/remove-pidfd.diff
+++ b/packages/golang/patch-script/remove-pidfd.diff
@@ -15,13 +15,13 @@ diff --git a/src/os/export_linux_test.go b/src/os/export_linux_test.go
 index 12434cb..da527f9 100644
 --- a/src/os/export_linux_test.go
 +++ b/src/os/export_linux_test.go
-@@ -8,7 +8,6 @@
+@@ -8,7 +8,6 @@ var (
  	PollCopyFileRangeP  = &pollCopyFileRange
  	PollSpliceFile      = &pollSplice
  	GetPollFDAndNetwork = getPollFDAndNetwork
 -	CheckPidfdOnce      = checkPidfdOnce
  )
-
+ 
  const StatusDone = statusDone
 diff --git a/src/os/export_pidfd_test.go b/src/os/export_pidfd_test.go
 new file mode 100644
@@ -39,10 +39,10 @@ index 0000000..7705ddb
 +
 +var CheckPidfdOnce = checkPidfdOnce
 diff --git a/src/os/pidfd_linux.go b/src/os/pidfd_linux.go
-index 0404c4f..4bdc289 100644
+index 0bfef77..e3c6674 100644
 --- a/src/os/pidfd_linux.go
 +++ b/src/os/pidfd_linux.go
-@@ -2,12 +2,17 @@
+@@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
@@ -51,9 +51,10 @@ index 0404c4f..4bdc289 100644
  // Support for pidfd was added during the course of a few Linux releases:
  //  v5.1: pidfd_send_signal syscall;
  //  v5.2: CLONE_PIDFD flag for clone syscall;
- //  v5.3: pidfd_open syscall, clone3 syscall;
- //  v5.4: P_PIDFD idtype support for waitid syscall;
- //  v5.6: pidfd_getfd syscall.
+@@ -12,6 +14,9 @@
+ // N.B. Alternative Linux implementations may not follow this ordering. e.g.,
+ // QEMU user mode 7.2 added pidfd_open, but CLONE_PIDFD was not added until
+ // 8.0.
 +//
 +// On Android systems the pidfd_open call reportedly triggers a SIGSYS signal,
 +// (issue #69065), so don't use pidfd on Android.
@@ -61,7 +62,7 @@ index 0404c4f..4bdc289 100644
  package os
  
 diff --git a/src/os/pidfd_linux_test.go b/src/os/pidfd_linux_test.go
-index 8375937..47b3dad 100644
+index c1f41d0..f49ac81 100644
 --- a/src/os/pidfd_linux_test.go
 +++ b/src/os/pidfd_linux_test.go
 @@ -2,6 +2,8 @@
@@ -74,7 +75,7 @@ index 8375937..47b3dad 100644
  
  import (
 diff --git a/src/os/pidfd_other.go b/src/os/pidfd_other.go
-index 5780432..fcb0d3c 100644
+index ba9cbcb..78e09fb 100644
 --- a/src/os/pidfd_other.go
 +++ b/src/os/pidfd_other.go
 @@ -2,7 +2,7 @@
@@ -85,3 +86,4 @@ index 5780432..fcb0d3c 100644
 +//go:build (unix && (android || !linux)) || (js && wasm) || wasip1 || windows
  
  package os
+ 
diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh
index 07906dc176a340..5e49cc6328dd7e 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.23.2
-		local TERMUX_GO_SHA256=542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e
+		local TERMUX_GO_VERSION=go1.23.4
+		local TERMUX_GO_SHA256=6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971
 		if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then
 			TERMUX_GO_VERSION=go1.22.6
 			TERMUX_GO_SHA256=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616