From: Sergey Matveev Date: Sat, 5 Oct 2024 07:25:49 +0000 (+0300) Subject: Update Go X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=aa7146ce8bcea6395263a911cb886bdd05d3c007880658e99f712a494a429583;p=bass.git Update Go --- diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index ca93ca8..c23fba4 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -70,7 +70,7 @@ /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz -/go1.22.6.tar.gz +/go1.23.2.tar.gz /go1.4.3.tar.gz /gocheese-4.2.0.tar.zst /gogost-6.0.1.tar.zst @@ -79,7 +79,7 @@ /gomodcache/ /goredo-2.6.2.tar.zst /gosha3-v1.0.0-modcache -/gostls13-1.22.6.patch.zst +/gostls13-1.23.2.patch.zst /gostls13.git/ /gpgme-1.23.2.tar.bz2 /graphviz-11.0.0.tar.xz diff --git a/build/distfiles/go1.22.6.tar.gz.meta4 b/build/distfiles/go1.22.6.tar.gz.meta4 deleted file mode 100644 index 2784d4c..0000000 --- a/build/distfiles/go1.22.6.tar.gz.meta4 +++ /dev/null @@ -1,18 +0,0 @@ - - - - 66f84c3d1cc58997d51cd868203d92f0952063f48b8cabf9bf72da1345530a52 - 55ce88dc2039d68f14aea0792ed6a1b45c8e262aa73f76f852941aed12019318b3be7938c954fb7c03d7583f930f7a0e5164effc1ec10fc6d0fc282484390e49 - 0693aad50fb6b48af0a6c5fdbd73f1a0b0606e709b1bd2efa19d031edbae67e4 - 0a92f792c074923f30eb33eef2d0b3dd787535b02bad1f0b4456869cd3a37cd7c9f34e83a601ef4138283c53b2ccad8943bfcde4da1440bcd89f6d43cd10e75c - 90c0bb2af555a87944e239688d62b1fd76e0682d0ceff99758c0faaab249f102 - a4ce61c14a93441b13f9f6a2840a3737defd7ab732ef9588a8e2a2a8c3d4a71cd081c11d0b08e16fd4a45fdcc9676270be6efc5f66cbd9554d13b2bf5fe923a0 - 59f84ba390203271d9fe2d3f04624449d54d3bb73c2b6e54b5f7dc9e9e2dce2192bae07ef56a2afee871cff84d457b90f8a00f4433e072028b97af987f3799e1 - 9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51 - 8d4753234374f83ec4c08da9b6509428a7898940280c200921f61d936638c850749bd99b647e8261bf4dcee2f66df0908efe61d7bb1b0d841ce31d8f4d6902af - 6b9ddf5c693493d7bbea1ea6dd0f7c3c048f3ab4303aacc5710701c6a2bfc778 - 76fd4051584f331018b4db2d3295b6b2 - 27561569 - https://go.dev/dl/go1.22.6.src.tar.gz - - diff --git a/build/distfiles/go1.23.2.tar.gz.meta4 b/build/distfiles/go1.23.2.tar.gz.meta4 new file mode 100644 index 0000000..f92051b --- /dev/null +++ b/build/distfiles/go1.23.2.tar.gz.meta4 @@ -0,0 +1,18 @@ + + + + c3fc2ffda5a76042c6dce1d23c944c7d90f00857bccb35de05f043095cd31ffd + d97e6c974ac6a18bb3c6d3fe68448f7bbdb7f27be65c2ded0ad40132105702447ca652251d7594000a716bf34f102f5ff8e2e10f27591a2b222f8f463fb22716 + 90b758d0da595b894c36dbc2528f5a05bc0e03f48fc27fc4f2ca7a62ebb138d7 + 46f408002b577555bc4e630bc67a33a85c3ff9432981600a8932f0611bdf89ea4e5ee111157388d0ca4503208fa983854acea95a2b7a66b1f8675a4cfb6573bb + b51778b8e13ac932e94c34315f8e13080a18310e111698e1ca9c994235c30fe0 + 4222555097294602c0a6f74a8312ade38a5a7c276cf58bbf312bc1db9bff702f17f6026c1a4a902ee08f333fa3a475d1095e5d0e62d02ca9c6cb8714e83c3b79 + e4f9d17ed7888b89b6a72966f8681bbacb5b8bebb7959e530dc058d2fa94012d45067d1884eccd352a0fc8279e6814a932260a46140b65593679d28598bf4d5c + 36930162a93df417d90bd22c6e14daff4705baac2b02418edda671cdfa9cd07f + cdca77d0a8cf3b051f5698ff14c540513ec184e289b6740b0ba6698c4b3e0692db8226dd9ad34f90507835f16f70095c40b08410abe8ea56c3585a9a77816561 + f0814830a8bce7c807b417e898276da9188518f4da3d36fe60b671de55768d05 + 9a195b6c594d34caba04a8d5dc805a04 + 28171276 + https://go.dev/dl/go1.23.2.src.tar.gz + + diff --git a/build/distfiles/gostls13-1.22.6.patch.zst.do b/build/distfiles/gostls13-1.23.2.patch.zst.do similarity index 96% rename from build/distfiles/gostls13-1.22.6.patch.zst.do rename to build/distfiles/gostls13-1.23.2.patch.zst.do index b0cc607..60f7a65 100644 --- a/build/distfiles/gostls13-1.22.6.patch.zst.do +++ b/build/distfiles/gostls13-1.23.2.patch.zst.do @@ -2,7 +2,7 @@ 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.22.6-gost +tag=go1.23.2-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)" diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do index 4f1c58d..e264a72 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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.2.do b/build/skel/devel/goredo-2.6.2.do index c8fa7b7..bd2460d 100644 --- a/build/skel/devel/goredo-2.6.2.do +++ b/build/skel/devel/goredo-2.6.2.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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.22.6.do b/build/skel/lang/go1.23.2.do similarity index 92% rename from build/skel/lang/go1.22.6.do rename to build/skel/lang/go1.23.2.do index 3ea3ba9..5e50f46 100644 --- a/build/skel/lang/go1.22.6.do +++ b/build/skel/lang/go1.23.2.do @@ -7,7 +7,7 @@ command -v bash >/dev/null 2>/dev/null || bdeps="$bdeps lang/perl-5.32.1" goprev=go1.20.14 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz lang/$goprev [ -z "$GOSTLS13_ENABLED" ] || - redo-ifchange "$DISTFILES"/gostls13-1.22.6.patch.zst "$DISTFILES"/gogost-6.0.1.tar.zst + redo-ifchange "$DISTFILES"/gostls13-1.23.2.patch.zst "$DISTFILES"/gogost-6.0.1.tar.zst hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc @@ -19,7 +19,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz cd go if [ -n "$GOSTLS13_ENABLED" ] ; then - zstd -d <"$DISTFILES"/gostls13-1.22.6.patch.zst | patch >&2 + zstd -d <"$DISTFILES"/gostls13-1.23.2.patch.zst | patch >&2 cp "$DISTFILES"/gogost-6.0.1.tar.zst . chmod +x debash gogost-install ./gogost-install >&2 diff --git a/build/skel/misc/gocheese-4.2.0.do b/build/skel/misc/gocheese-4.2.0.do index 487b029..88c1c89 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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 fb56a9b..9bf1cce 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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 e1518b3..38d51dd 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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.10.0.do b/build/skel/sysutils/meta4ra-0.10.0.do index 278acad..00f99ef 100644 --- a/build/skel/sysutils/meta4ra-0.10.0.do +++ b/build/skel/sysutils/meta4ra-0.10.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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.53.0.do b/build/skel/textproc/fzf-0.53.0.do index 99774d0..755ee25 100644 --- a/build/skel/textproc/fzf-0.53.0.do +++ b/build/skel/textproc/fzf-0.53.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.22.6" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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/README b/contrib/prepare-deps/README index 2aefc6e..0797c06 100644 --- a/contrib/prepare-deps/README +++ b/contrib/prepare-deps/README @@ -12,7 +12,7 @@ Make, C compiler are prerequired. Go, goredo, meta4ra, zstd will be built. 010-go1.4.3.done 020-go1.17.13.done 030-go1.20.14.done - 040-go1.22.6.done + 040-go1.23.2.done and symlink your Go to ./go1.4.3, ./go1.17.13, ./go1.20.14 * Start build process itself: $ /path/to/prepare-deps/do diff --git a/contrib/prepare-deps/link-from-distfiles b/contrib/prepare-deps/link-from-distfiles index dd54813..0ec1c01 100755 --- a/contrib/prepare-deps/link-from-distfiles +++ b/contrib/prepare-deps/link-from-distfiles @@ -4,7 +4,7 @@ mkdir -p distfiles cd distfiles ln -f ../../../build/distfiles/go1.17.13.tar.gz go1.17.13.src.tar.gz ln -f ../../../build/distfiles/go1.20.14.tar.gz go1.20.14.src.tar.gz -ln -f ../../../build/distfiles/go1.22.6.tar.gz go1.22.6.src.tar.gz +ln -f ../../../build/distfiles/go1.23.2.tar.gz go1.23.2.src.tar.gz ln -f ../../../build/distfiles/go1.4.3.tar.gz go1.4.3.src.tar.gz ln -f ../../../build/distfiles/goredo-2.6.2.tar.zst ln -f ../../../build/distfiles/meta4ra-0.10.0.tar.zst diff --git a/contrib/prepare-deps/steps/040-go1.22.6.dl b/contrib/prepare-deps/steps/040-go1.22.6.dl deleted file mode 100644 index 039bc56..0000000 --- a/contrib/prepare-deps/steps/040-go1.22.6.dl +++ /dev/null @@ -1 +0,0 @@ -dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 59f84ba390203271d9fe2d3f04624449d54d3bb73c2b6e54b5f7dc9e9e2dce2192bae07ef56a2afee871cff84d457b90f8a00f4433e072028b97af987f3799e1 diff --git a/contrib/prepare-deps/steps/040-go1.22.6 b/contrib/prepare-deps/steps/040-go1.23.2 similarity index 100% rename from contrib/prepare-deps/steps/040-go1.22.6 rename to contrib/prepare-deps/steps/040-go1.23.2 diff --git a/contrib/prepare-deps/steps/040-go1.23.2.dl b/contrib/prepare-deps/steps/040-go1.23.2.dl new file mode 100644 index 0000000..29d8e3d --- /dev/null +++ b/contrib/prepare-deps/steps/040-go1.23.2.dl @@ -0,0 +1 @@ +dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz e4f9d17ed7888b89b6a72966f8681bbacb5b8bebb7959e530dc058d2fa94012d45067d1884eccd352a0fc8279e6814a932260a46140b65593679d28598bf4d5c