Update Go

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 4baf43f63a712145db749d48df9e7edfec06249d5b6c00b36a92da33d4b8f252..048ee60779651359b710ef4a68100c1f526c87d43dc3a71b75b26d134fedc0c1 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -72,6 +72,7 @@
 /go1.20.14.tar.gz
 /go1.23.5.tar.gz
 /go1.25.6.tar.gz
+/go1.26.0.tar.gz
 /go1.4.3.tar.gz
 /gocheese-4.3.0.tar.zst
 /gogost-6.1.0.tar.zst

diff --git a/build/distfiles/go1.26.0.tar.gz.meta4 b/build/distfiles/go1.26.0.tar.gz.meta4
new file mode 100644 (file)
index 0000000..baf97c6
--- /dev/null
+++ b/build/distfiles/go1.26.0.tar.gz.meta4
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="go1.26.0.tar.gz">
+    <hash type="blake3-256">64759f7cbb415c863f4785c8c710fa61777512c0c5d92fc212b6b462e45e1a15</hash>
+    <hash type="blake2b-512">d751df83e4e7fa5657c7723c49223a4216bade8006dbe6ba9788f682cb7e8b3151669ef116b1834bbc7ab40e936f1bbc4c516869e899a3bcc14fa95f153a085f</hash>
+    <hash type="blake2b-256">f1d24204bc4836df5e9f54c37e5c95d5e7e796eeafd067db7fd64cadd80f06b3</hash>
+    <hash type="skein-512">6782fe48d69175de0f59ef7f42351010a93b7cbbd3d13277a6c821628c902bd816ee1560f35fbb6508e1c04b7e3677959bc4744e99e4c5fe0c90b890038a07ba</hash>
+    <hash type="shake128">7daef55d1aec053be15d2eacdedd99f095333b97beb82ce2666fe8d5601f0f97</hash>
+    <hash type="shake256">a16d1e53220862be947d92689ce9039178aa2db566de8f8ae1055621e7464a0df142e56e49cee70e35a8c3ab7661c874bdaf85172cb19998a3101767007c105a</hash>
+    <hash type="sha-512">93858b64ef0f0963af4efa5f7a0465e76827b80a9926e965da6abeb2ad1b261bcfb3c1911364edd8bc2488fda47cc56e13816b4d7174413b17656b681c139964</hash>
+    <hash type="sha-256">c9132a8a1f6bd2aa4aad1d74b8231d95274950483a4950657ee6c56e6e817790</hash>
+    <hash type="streebog-512">acb0df3b9194169236f68dfc9ac939885dd55dc3d06e4db01798af0b080b6b5b8af7e2241474596af2f96965c2f411a449147e3c0013630e6ff4c11d9d7d94ec</hash>
+    <hash type="streebog-256">dacdb8a24b57e011fca8a944e1132f4e6b93c546745e54bd7b856e403b129a3b</hash>
+    <hash type="xxh3-128">5da9d5b6102b17d25d4493b222639c50</hash>
+    <size>34095450</size>
+    <url priority="1">https://go.dev/dl/go1.26.0.src.tar.gz</url>
+    <url priority="20">http://distcache.FreeBSD.org/ports-distfiles/go1.26.0.src.tar.gz</url>
+    <url priority="21" location="eu">http://distcache.eu.FreeBSD.org/ports-distfiles/go1.26.0.src.tar.gz</url>
+    <url priority="21" location="us">http://distcache.us-east.FreeBSD.org/ports-distfiles/go1.26.0.src.tar.gz</url>
+    <url priority="21" location="us">http://distcache.us-west.FreeBSD.org/ports-distfiles/go1.26.0.src.tar.gz</url>
+  </file>
+</metalink>

diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do
index 1b12c1c12d7efde7b9f87fb913a1e8e35d31763efb527c701f18dd2f45642115..2260d315c5584b9d5cd8f5b41ba717eb87af04210d39560d7c50817ad1a6d7ec 100644 (file)
--- 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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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.9.1.do b/build/skel/devel/goredo-2.9.1.do
index 7d52ef67cc90bdb17e2a11a20dad05fb1b70abb50c35b85d295f738d644cedf0..4a34b9d651d5792e246ddf0e2f206c199a52750de250a14af06e5c8c1db48e92 100644 (file)
--- a/build/skel/devel/goredo-2.9.1.do
+++ b/build/skel/devel/goredo-2.9.1.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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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.23.5.do b/build/skel/lang/go1.23.5.do
index fc6915d533869d661875ead919f4639bdac4cb45345f1f30983b6a625158e4f8..d66777cc2633c0a21d8bffbbe28a08f2de80047545bce048a775035398989177 100644 (file)
--- a/build/skel/lang/go1.23.5.do
+++ b/build/skel/lang/go1.23.5.do
@@ -24,15 +24,4 @@ mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh
 mv go "$SKELBINS"/$ARCH/$NAME-$hsh/$NAME
 
 cd "$SKELBINS"/$ARCH
-mkdir -p $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst
-cat >$NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add <<EOF2
-#!/bin/sh -e
-_localpath="\$(realpath local)"
-cat >>rc <<EOF
-export GOPATH="\$_localpath/go"
-PATH="\$_localpath/$NAME/bin:\\\$PATH"
-EOF
-EOF2
-chmod +x $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add
-
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/lang/go1.25.6.do b/build/skel/lang/go1.25.6.do
index 2225448807b9b0b49ec66df1f2237abee506a590ac683212dbcbe92c1f93868b..6f57cb1780de8cd6ff53faf6ba05644517526595159e34242f02d4a171112b92 100644 (file)
--- a/build/skel/lang/go1.25.6.do
+++ b/build/skel/lang/go1.25.6.do
@@ -24,15 +24,4 @@ mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh
 mv go "$SKELBINS"/$ARCH/$NAME-$hsh/$NAME
 
 cd "$SKELBINS"/$ARCH
-mkdir -p $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst
-cat >$NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add <<EOF2
-#!/bin/sh -e
-_localpath="\$(realpath local)"
-cat >>rc <<EOF
-export GOPATH="\$_localpath/go"
-PATH="\$_localpath/$NAME/bin:\\\$PATH"
-EOF
-EOF2
-chmod +x $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add
-
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/lang/go1.26.0.do b/build/skel/lang/go1.26.0.do
new file mode 100644 (file)
index 0000000..3c7c599
--- /dev/null
+++ b/build/skel/lang/go1.26.0.do
@@ -0,0 +1,38 @@
+[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
+sname=$1.do . "$BASS_ROOT"/lib/rc
+. "$BASS_ROOT"/build/skel/common.rc
+
+bdeps="rc-paths stow archivers/zstd"
+command -v bash >/dev/null 2>/dev/null || bdeps="$bdeps lang/perl-5.32.1"
+goprev=go1.26.0
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz lang/$goprev
+hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
+
+. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps lang/$goprev
+. ./rc
+bootstrap="$(realpath local/$goprev)"
+$TAR xf "$DISTFILES"/$NAME.tar.gz
+"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
+
+cd go
+command -v bash >/dev/null 2>/dev/null || "$BASS_ROOT"/contrib/go-debash/v1
+cd src
+GOROOT_BOOTSTRAP=$bootstrap ./make.bash >&2
+cd ../..
+mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh
+mv go "$SKELBINS"/$ARCH/$NAME-$hsh/$NAME
+
+cd "$SKELBINS"/$ARCH
+mkdir -p $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst
+cat >$NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add <<EOF2
+#!/bin/sh -e
+_localpath="\$(realpath local)"
+cat >>rc <<EOF
+export GOPATH="\$_localpath/go"
+PATH="\$_localpath/$NAME/bin:\\\$PATH"
+EOF
+EOF2
+chmod +x $NAME-$hsh/skelpkg/$NAME-$hsh/hooks/postinst/01rc-add
+
+"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/misc/gocheese-4.3.0.do b/build/skel/misc/gocheese-4.3.0.do
index 8c0d095ab37598381bf654f8c8775d26570745c756a773bcdd033fbdd69feca8..5eeb4034d343834a537c3c80e56cc49b63a46dd1a9f5f9d31dd804ccdf9a164c 100644 (file)
--- a/build/skel/misc/gocheese-4.3.0.do
+++ b/build/skel/misc/gocheese-4.3.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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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.3.0.do b/build/skel/security/age-v1.3.0.do
index 4da59033956ce62ad129afb2b84eed275269e14b9acc13718837e2dd8ec8ea07..91f092d29b51503910f219cbb187792b252cf3e68ec92714b489ad8c58f5e887 100644 (file)
--- a/build/skel/security/age-v1.3.0.do
+++ b/build/skel/security/age-v1.3.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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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.1.0.do b/build/skel/security/gosha3-v1.1.0.do
index 3a5847b4b8c0a28664e0dfa37c4926a2900b5d92dd8770c5498b217b0b7455b7..849570eb9b370361bafb6bdd81e23e3e03145589ffebe1bad362a222cf887887 100644 (file)
--- a/build/skel/security/gosha3-v1.1.0.do
+++ b/build/skel/security/gosha3-v1.1.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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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.12.0.do b/build/skel/sysutils/meta4ra-0.12.0.do
index a2eebc4d9681e6ae9f40dfaeba053a609cd9d814bc10fe3161732d0cdbd1c71a..d6f36bafcded27041cca3ac8b8127621e4979e4dcbdb9ea23b69d61ccc59402c 100644 (file)
--- a/build/skel/sysutils/meta4ra-0.12.0.do
+++ b/build/skel/sysutils/meta4ra-0.12.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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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 02827a30ceed37793d6f2088262cc655675a44652548d2baa0dda37fb7773a42..0a7814688508bb5f0e8ec0fc347fca1e27dcd4d7d5ce33062b9c2e85b9305f7d 100644 (file)
--- 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.25.6"
+bdeps="rc-paths stow archivers/zstd lang/go1.26.0"
 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/link-from-distfiles b/contrib/prepare-deps/link-from-distfiles
index f37afcfa095779bbffc887d33dca0c23d1629a4c2bb78a6e72e625f81f46fbf4..9813898c73a440ac5b64f28a42e08bffb358cd4c8172a6d4373bcc0c3318e92b 100755 (executable)
--- a/contrib/prepare-deps/link-from-distfiles
+++ b/contrib/prepare-deps/link-from-distfiles
@@ -2,11 +2,12 @@
 
 mkdir -p distfiles
 cd distfiles
+ln -f ../../../build/distfiles/go1.4.3.tar.gz go1.4.3.src.tar.gz
 ln -f ../../../build/distfiles/go1.17.12.tar.gz go1.17.12.src.tar.gz
 ln -f ../../../build/distfiles/go1.20.14.tar.gz go1.20.14.src.tar.gz
 ln -f ../../../build/distfiles/go1.23.5.tar.gz go1.23.5.src.tar.gz
 ln -f ../../../build/distfiles/go1.25.6.tar.gz go1.25.6.src.tar.gz
-ln -f ../../../build/distfiles/go1.4.3.tar.gz go1.4.3.src.tar.gz
+ln -f ../../../build/distfiles/go1.26.0.tar.gz go1.26.0.src.tar.gz
 ln -f ../../../build/distfiles/goredo-2.9.1.tar.zst
 ln -f ../../../build/distfiles/meta4ra-0.12.0.tar.zst
 ln -f ../../../build/distfiles/zstd-1.5.7.tar.gz

diff --git a/contrib/prepare-deps/steps/050-go1.25.6 b/contrib/prepare-deps/steps/050-go1.25.6
index effe997c7e9b9620ae27bcdfe0be0ffd6cae67f3cfbdf3efa76d645c8bfc09d6..3bbe9d763d871bd1ecc95e192162d65cd5b3a0cacb09ecfe7561661f2d7988fd 100644 (file)
--- a/contrib/prepare-deps/steps/050-go1.25.6
+++ b/contrib/prepare-deps/steps/050-go1.25.6
@@ -5,5 +5,3 @@ cd $name
 command -v bash >/dev/null 2>/dev/null || $ROOT/../go-debash/v1
 cd src
 GOROOT_BOOTSTRAP=$(realpath $DIR/go1.23.5) ./make.bash
-cd ../..
-mv $name $DIR/local/go

diff --git a/contrib/prepare-deps/steps/060-go1.26.0 b/contrib/prepare-deps/steps/060-go1.26.0
new file mode 100644 (file)
index 0000000..e39e438
--- /dev/null
+++ b/contrib/prepare-deps/steps/060-go1.26.0
@@ -0,0 +1,9 @@
+rm -fr go
+tar xf $DISTFILES/$name.src.tar.gz
+mv go $name
+cd $name
+command -v bash >/dev/null 2>/dev/null || $ROOT/../go-debash/v1
+cd src
+GOROOT_BOOTSTRAP=$(realpath $DIR/go1.25.6) ./make.bash
+cd ../..
+mv $name $DIR/local/go

diff --git a/contrib/prepare-deps/steps/060-go1.26.0.dl b/contrib/prepare-deps/steps/060-go1.26.0.dl
new file mode 100644 (file)
index 0000000..b81b173
--- /dev/null
+++ b/contrib/prepare-deps/steps/060-go1.26.0.dl
@@ -0,0 +1 @@
+dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 93858b64ef0f0963af4efa5f7a0465e76827b80a9926e965da6abeb2ad1b261bcfb3c1911364edd8bc2488fda47cc56e13816b4d7174413b17656b681c139964