From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 15 Oct 2025 10:08:59 +0000 (+0300)
Subject: Update Go
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1057307640539f59b054bd0cefc386860668580364b9ee77c0a74d80a865016a;p=bass.git

Update Go
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index df791c9..a88f177 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -73,7 +73,7 @@
 /go1.17.13.tar.gz
 /go1.20.14.tar.gz
 /go1.23.5.tar.gz
-/go1.24.5.tar.gz
+/go1.25.2.tar.gz
 /go1.4.3.tar.gz
 /gocheese-4.2.0.tar.zst
 /gogost-6.1.0.tar.zst
@@ -82,8 +82,6 @@
 /gomodcache/
 /goredo-2.6.4.tar.zst
 /gosha3-v1.0.0-modcache
-/gostls13-1.24.5.patch.zst
-/gostls13.git/
 /gpgme-1.23.2.tar.bz2
 /graphviz-11.0.0.tar.xz
 /grep-3.11.tar.xz
diff --git a/build/distfiles/go1.24.5.tar.gz.meta4 b/build/distfiles/go1.24.5.tar.gz.meta4
deleted file mode 100644
index e2fc3ed..0000000
--- a/build/distfiles/go1.24.5.tar.gz.meta4
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="go1.24.5.tar.gz">
-    <hash type="blake3-256">acf47c9541f53e32847d9570a8802c1f49619403e879a170b76086937e4155f2</hash>
-    <hash type="blake2b-512">47d281c221ca87f7b668e5e44017b77c408c08543ded64c54de9515cd3759f92228983f878e39ae0d52e7bbdae4c09161381196bb7efb48e77f38694195c883e</hash>
-    <hash type="blake2b-256">3fce1520129cb72df5569eee58b60499a81a29b528a4922552838e8a518d3419</hash>
-    <hash type="skein-512">e8aab5c902508151117210827d57a26045a318618eb55ce0d93f4529a82c373780be9a7d789e4c7f3bf5a39ed42aed809fbfbeafe16795d83d9b6d5a8362bf6d</hash>
-    <hash type="sha-512">917cd6ac83e3370227da40f8490697e8638847e9279ed1806044a173d3b52829c67c429990db92d8aadcfba6a37bfc00114c1ecec3ac387a781bb7edc8dcab22</hash>
-    <hash type="sha-256">74fdb09f2352e2b25b7943e56836c9b47363d28dec1c8b56c4a9570f30b8f59f</hash>
-    <hash type="streebog-512">a8e861aa9ac1e4aa1fed1ce5a010b6937dccd5ed555408b637c659f46b5c22a3afba616923b8efdc92dcaa8a25c20dae6b0bbce9b8b7e3a808c375e090d28125</hash>
-    <hash type="streebog-256">ef22264ac778f3caf4269f1bde69506b20d1de366d0f115733cf4dc50ee00d35</hash>
-    <hash type="xxh3-128">6f1c0f25e69b885ca345a4c7ee8fa96e</hash>
-    <size>30792943</size>
-    <url>https://go.dev/dl/go1.24.5.src.tar.gz</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/go1.25.2.tar.gz.meta4 b/build/distfiles/go1.25.2.tar.gz.meta4
new file mode 100644
index 0000000..f590d34
--- /dev/null
+++ b/build/distfiles/go1.25.2.tar.gz.meta4
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="go1.25.2.tar.gz">
+    <hash type="blake3-256">30cc3a64ee1092b4fc9eb9646a85d0e528d2791f832e0ea727080e53ea73e256</hash>
+    <hash type="blake2b-512">c243e7d21a2b64879303ec1bdb1815517e2a73f8afbdeb553a4e5c7ca3f8358edbba17dd887e6e41898602d85c0b184ce20aa481ad15993083ab485dd6a792fb</hash>
+    <hash type="blake2b-256">094ad7bdaaac3fe03e6820ac5885cfe8ff698f4cb435c400040219e9a49e02ae</hash>
+    <hash type="skein-512">ff24edf3317d6ac80dc243d69fdf9fe8561ddd7164518912f35cae6f031b6e48174923ce2d3d107d4c21360aeaccdce2511d049309c9dc06739401c99b50a1dc</hash>
+    <hash type="sha-512">2700ceca314bb78b8ff97aa8703442b60eceb3acbad46b7959739bb0399174f27af372c7f72cd1adb83997adacbf43e2e2572e85fa5cf2a18271d0ef1ee0b8b4</hash>
+    <hash type="sha-256">3711140cfb87fce8f7a13f7cd860df041e6c12f7610f40cac6ec6fa2b65e96e4</hash>
+    <hash type="streebog-512">84632ffe563055dd50e635a28b9b40770734ddb417340977e5d5ab48f32f774b2f6194738574eb65bb9ef92a4ac535ede8a2a3f87b09725a4aa64c1f3b16e1e2</hash>
+    <hash type="streebog-256">eb65a034b0fc58ac1c4dbe8859a3e5967b0114e15c202040ff519bd329ec15d1</hash>
+    <hash type="xxh3-128">4f126dd684260ac859ace7ad31a124a3</hash>
+    <size>31978632</size>
+    <url>https://go.dev/dl/go1.25.2.src.tar.gz</url>
+  </file>
+</metalink>
diff --git a/build/distfiles/gostls13-1.24.5.patch.zst.do b/build/distfiles/gostls13-1.24.5.patch.zst.do
deleted file mode 100644
index f650e5e..0000000
--- a/build/distfiles/gostls13-1.24.5.patch.zst.do
+++ /dev/null
@@ -1,10 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-[ -d gostls13.git ] || git clone --depth 1 --bare git://git.cypherpunks.su/gostls13.git >&2
-cd gostls13.git
-tag=go1.24.5-gost
-git fetch origin tag $tag ${tag%-gost} >&2
-echo gostls13@cypherpunks.su ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuX3gTqrFb3G2oW/osn3LIa7X5spo0MTsEIRLKVfJrq >allowed-signers
-git config gpg.ssh.allowedSignersFile "$(realpath allowed-signers)"
-git tag --verify $tag >&2
-git diff ${tag%-gost}..$tag | $COMPRESSOR
diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do
index 7eb92b1..7a903d4 100644
--- a/build/skel/devel/go-stringer-0.18.0.do
+++ b/build/skel/devel/go-stringer-0.18.0.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/golang.org-x-tools-0.18.0-modcache
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/devel/goredo-2.6.4.do b/build/skel/devel/goredo-2.6.4.do
index 8aae05a..d258301 100644
--- a/build/skel/devel/goredo-2.6.4.do
+++ b/build/skel/devel/goredo-2.6.4.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/lang/go1.24.5.do b/build/skel/lang/go1.25.2.do
similarity index 67%
rename from build/skel/lang/go1.24.5.do
rename to build/skel/lang/go1.25.2.do
index 214cc45..2225448 100644
--- a/build/skel/lang/go1.24.5.do
+++ b/build/skel/lang/go1.25.2.do
@@ -6,10 +6,6 @@ bdeps="rc-paths stow archivers/zstd"
 command -v bash >/dev/null 2>/dev/null || bdeps="$bdeps lang/perl-5.32.1"
 goprev=go1.23.5
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz lang/$goprev
-[ -z "$GOSTLS13_ENABLED" ] ||
-    redo-ifchange \
-        "$DISTFILES"/gostls13-1.24.5.patch.zst \
-        "$DISTFILES"/gogost-6.1.0.tar.zst
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
@@ -20,20 +16,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd go
-if [ -n "$GOSTLS13_ENABLED" ] ; then
-    zstd -d <"$DISTFILES"/gostls13-1.24.5.patch.zst | patch >&2
-    cp "$DISTFILES"/gogost-6.1.0.tar.zst .
-    chmod +x debash gogost-install
-    ./gogost-install >&2
-    command -v bash >/dev/null 2>/dev/null || ./debash
-    cat >>src/crypto/tls/gost.go <<EOF
-func init() {
-	GOSTInstall()
-}
-EOF
-else
-    command -v bash >/dev/null 2>/dev/null || "$BASS_ROOT"/contrib/go-debash/v1
-fi
+command -v bash >/dev/null 2>/dev/null || "$BASS_ROOT"/contrib/go-debash/v1
 cd src
 GOROOT_BOOTSTRAP=$bootstrap ./make.bash >&2
 cd ../..
diff --git a/build/skel/misc/gocheese-4.2.0.do b/build/skel/misc/gocheese-4.2.0.do
index 5b1bd93..c07c29f 100644
--- a/build/skel/misc/gocheese-4.2.0.do
+++ b/build/skel/misc/gocheese-4.2.0.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/security/age-v1.1.1-23-g29b68c2.do b/build/skel/security/age-v1.1.1-23-g29b68c2.do
index 2fcbe73..37fb2bc 100644
--- a/build/skel/security/age-v1.1.1-23-g29b68c2.do
+++ b/build/skel/security/age-v1.1.1-23-g29b68c2.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst "$DISTFILES"/$NAME-modcache
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/security/gosha3-v1.0.0.do b/build/skel/security/gosha3-v1.0.0.do
index 75f2881..9b439cf 100644
--- a/build/skel/security/gosha3-v1.0.0.do
+++ b/build/skel/security/gosha3-v1.0.0.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME-modcache
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/sysutils/meta4ra-0.11.0.do b/build/skel/sysutils/meta4ra-0.11.0.do
index 815eed4..337733e 100644
--- a/build/skel/sysutils/meta4ra-0.11.0.do
+++ b/build/skel/sysutils/meta4ra-0.11.0.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/build/skel/textproc/fzf-0.66.0.do b/build/skel/textproc/fzf-0.66.0.do
index c6ee1c5..f7d1558 100644
--- a/build/skel/textproc/fzf-0.66.0.do
+++ b/build/skel/textproc/fzf-0.66.0.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd lang/go1.24.5"
+bdeps="rc-paths stow archivers/zstd lang/go1.25.2"
 redo-ifchange $bdeps "$DISTFILES"/$NAME-modcache
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
diff --git a/contrib/prepare-deps/steps/050-go1.24.5.dl b/contrib/prepare-deps/steps/050-go1.24.5.dl
deleted file mode 100644
index 8bf969e..0000000
--- a/contrib/prepare-deps/steps/050-go1.24.5.dl
+++ /dev/null
@@ -1 +0,0 @@
-dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 917cd6ac83e3370227da40f8490697e8638847e9279ed1806044a173d3b52829c67c429990db92d8aadcfba6a37bfc00114c1ecec3ac387a781bb7edc8dcab22
diff --git a/contrib/prepare-deps/steps/050-go1.24.5 b/contrib/prepare-deps/steps/050-go1.25.2
similarity index 100%
rename from contrib/prepare-deps/steps/050-go1.24.5
rename to contrib/prepare-deps/steps/050-go1.25.2
diff --git a/contrib/prepare-deps/steps/050-go1.25.2.dl b/contrib/prepare-deps/steps/050-go1.25.2.dl
new file mode 100644
index 0000000..ff45036
--- /dev/null
+++ b/contrib/prepare-deps/steps/050-go1.25.2.dl
@@ -0,0 +1 @@
+dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 2700ceca314bb78b8ff97aa8703442b60eceb3acbad46b7959739bb0399174f27af372c7f72cd1adb83997adacbf43e2e2572e85fa5cf2a18271d0ef1ee0b8b4