From: Sergey Matveev Date: Wed, 7 Aug 2024 09:38:26 +0000 (+0300) Subject: Update Go X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d28a6540122728b63b475509d14d8f7ac130274e2deeeb52415ed896ebb5441f;p=bass.git Update Go --- diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 67f0b33..d246a56 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -67,16 +67,16 @@ /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz -/go1.22.5.tar.gz +/go1.22.6.tar.gz /go1.4.3.tar.gz /gocheese-4.2.0.tar.zst -/gogost-6.0.0.tar.zst -/gogost-v6.0.0-modcache +/gogost-6.0.1.tar.zst +/gogost-v6.0.1-modcache /golang.org-x-tools-0.18.0-modcache /gomodcache/ /goredo-2.6.2.tar.zst /gosha3-v1.0.0-modcache -/gostls13-1.22.5.patch.zst +/gostls13-1.22.6.patch.zst /gostls13.git/ /gpgme-1.23.2.tar.bz2 /graphviz-11.0.0.tar.xz diff --git a/build/distfiles/go1.22.5.tar.gz.meta4 b/build/distfiles/go1.22.5.tar.gz.meta4 deleted file mode 100644 index db0bc47..0000000 --- a/build/distfiles/go1.22.5.tar.gz.meta4 +++ /dev/null @@ -1,18 +0,0 @@ - - - - a679eed63bfcfd3e9bb76e87ef86d1f4732e0c70cd077c61e831a74a4057adfc - f166dd9f1c55addf422f2612f3f6a084fa96d3e2cb7455f03286cf23778ce2bd83097de621c69f9c1f23912d55039c926608dbee25da13f084ca9a5e0f04f249 - 6f3e317e9e34f96875535a09544e10d7271d76333b694bb5ca97c892f297cda3 - 4ef48aff9fd62c8a1cafdce9fb746f54fec5446578786cfd5b9011cd5f59b8ff81c0fe4ce1ba7adc73f515bc4a8e1fda386d9918883af003152a7c5b142c48af - e9ea06103b6445b10121c3265287d536eb1650f3e5877e21ae05c70bbadd36be - 88d8daa320424cfcf58f00c00b69076eef415ece1be20547bd1c7a9d5697a75be927a5de3dd5454ea8433b5bde8a000294b5cd16ba1fd346e86a8865b7cd7aa6 - 798c2bd5d59be1fb5d7af98893fa7bb68322117facfdee546a37175ec5e8be634f2bed2d8d0e7d4d0555b354c8e9d72b3829c39670d3be2d2328376a00a48576 - ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 - 3703a0c66945af70d49e18a4ce18d035e70b33734707c3fa66fd3f564b39b7fd7fb5dcf24a0ea810ac8db4ce36d6a59910d394153fa6f934a520fee9d662336d - f2d96e709d516e3dab4e584f27ac51f82d9632fa86355485ac6f95aff17afc95 - 1e9686511a9fc1126e9ed4824f65480c - 27559458 - https://go.dev/dl/go1.22.5.src.tar.gz - - diff --git a/build/distfiles/go1.22.6.tar.gz.meta4 b/build/distfiles/go1.22.6.tar.gz.meta4 new file mode 100644 index 0000000..2784d4c --- /dev/null +++ b/build/distfiles/go1.22.6.tar.gz.meta4 @@ -0,0 +1,18 @@ + + + + 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/gogost-6.0.0.tar.zst.meta4 b/build/distfiles/gogost-6.0.0.tar.zst.meta4 deleted file mode 100644 index 49cf880..0000000 --- a/build/distfiles/gogost-6.0.0.tar.zst.meta4 +++ /dev/null @@ -1,40 +0,0 @@ - - - - 5c9f875df0189aa79f43435e80820b8f3b6fd4950948429fe5fba70e5989d7f7 - 44c5dca0c2d47004d7ce3aa3942c820097a4ecc94ced560b2621e1d4b0154365a5d51ac49c97d7e4440b761d9ea964456f3ad77abd7c278aaab43394b6294428 - 3ee79481531966f5b9c4f79eea78a375a7f67fb4a97bae5b7ebef1b1fa34f9b5 - 23ee7f71a5415ff916a29c8204a5621132f9f3daff46e54a51228d595572d58815ff354649193062c55ab3c7ef5d50f2ea0ba547f882f383dd2e4631f90751c5 - 123c3cc93c5c9abf6d0e0c146c5a2d323da2848844a228d9bf2cbb330ec719b8 - 962ec5fba0f1f17fb597c70bd5f8b22e1f40aa7e89651c3cce148abfb3af4f0c5e2e81a688fc1c39132e2932706f2417fc5fa16484f5e950663d5e4821765ea8 - 27a0965faee507d429074ea6dad57357754aa30e6890aeb5db567fb3c281c8bc5aa917a68a134b8d5f11772d08b380b1c48a62909f72e8a46fb2c92e73c20ed1 - a6e9037809e2fcf84d65885d621b3d94a70b8538272675c067c2d922724dfb04 - 5967e8ab58eb4f28cd8e4b60279468aa7b1bdd2bc775853fd3bae6c22becdb7cb2e9ab908f1a918f132567cbc83d611c29e0f6b0c942cb4ed3c58a9a51ef673a - fd782282ec7f72ffc921437276e4075cc35c03dc1c85f5e3eee5f4d6dfb0e0d4 - 176aaeeec2c6446c6329f5b3857bfe20 - - - 87756 - http://www.gogost.cypherpunks.su/gogost-6.0.0.tar.zst - http://y.www.gogost.cypherpunks.su/gogost-6.0.0.tar.zst - - diff --git a/build/distfiles/gogost-6.0.1.tar.zst.meta4 b/build/distfiles/gogost-6.0.1.tar.zst.meta4 new file mode 100644 index 0000000..8704ad5 --- /dev/null +++ b/build/distfiles/gogost-6.0.1.tar.zst.meta4 @@ -0,0 +1,40 @@ + + + + 1b10874bb964e6b166c028b6de787dd1e11b9ea29a2e117dff24359f2697309d + a03fdb7e3402b1f98260003fd5363e45794c4bee6d014bd61d5746b75396fbd2f1f9a76d3bddfa55d363b6e307c521caaf6fe4f9912036659bb0e2224749891d + 682144d933b798b819cbc6a4a81b73def6672ca2a9fb373e5bd7a72e44579d67 + 4cf34222f68900ea9d16dc41ffb1c24e0573b7d79ee275287e2c70b38840f66fc0e55f88ccd99677a7a5dd59f6fe2ae05560506eb6c62db9d55005f988d171c9 + 0a993856c2e095a3b10e450903fbdeadc9fbe54613cd31c48f69a1eca9e797f9 + 260f7581368cce334b58e99857993649c13dcb6f7b3472b62ad464b00e593d4c044ba1cb64c83ba5e0ebd2e0284fa09747b3dacf71561128d21246188308dc93 + e4ed080896cd62fbd975233a259a6f2b9ec1640ab45bf485bfac0cbffe9b5822c8f0020706d321ec9cd679e7baf05b2285879383ac8d8eec3da1d874737fb61c + 132206124f2b6b92f0d077075d487f4529feb7e941fc854dff47a7414c84b89f + 8704b13c9d7269aeb11723c867c03a35491780a1b46fc184291823dc888ba1b191c8584ae5003ee1ce660a667f237783e69691fe3cfce7cef097cdb459d2a96a + d858b9cbc5c8f09124a641f348d3a686267c92e8789cadfe6f0a89dda608b39f + fdc12044b2d0975a51b8827804dcb3cd + + + 87752 + http://www.gogost.cypherpunks.su/gogost-6.0.1.tar.zst + http://y.www.gogost.cypherpunks.su/gogost-6.0.1.tar.zst + + diff --git a/build/distfiles/gogost-v6.0.0-modcache.do b/build/distfiles/gogost-v6.0.1-modcache.do similarity index 95% rename from build/distfiles/gogost-v6.0.0-modcache.do rename to build/distfiles/gogost-v6.0.1-modcache.do index e830739..7fff5b8 100644 --- a/build/distfiles/gogost-v6.0.0-modcache.do +++ b/build/distfiles/gogost-v6.0.1-modcache.do @@ -4,7 +4,7 @@ cd "$GOMODCACHE" mkdir -p cache/download/go.cypherpunks.ru/gogost/v6/@v cd cache/download/go.cypherpunks.ru/gogost/v6/@v for ext in info mod zip ziphash ziphash.sig ; do - fn=v6.0.0.$ext + fn=v6.0.1.$ext [ ! -s $fn ] || continue $JUSTDL tmp http://proxy.go.cypherpunks.su/go.cypherpunks.su/gogost/v6/@v/$fn $FSYNC tmp diff --git a/build/distfiles/gostls13-1.22.5.patch.zst.do b/build/distfiles/gostls13-1.22.6.patch.zst.do similarity index 96% rename from build/distfiles/gostls13-1.22.5.patch.zst.do rename to build/distfiles/gostls13-1.22.6.patch.zst.do index 0fe055b..b0cc607 100644 --- a/build/distfiles/gostls13-1.22.5.patch.zst.do +++ b/build/distfiles/gostls13-1.22.6.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.5-gost +tag=go1.22.6-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 12dd112..4f1c58d 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 4ee4fc1..c8fa7b7 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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.5.do b/build/skel/lang/go1.22.6.do similarity index 88% rename from build/skel/lang/go1.22.5.do rename to build/skel/lang/go1.22.6.do index 9f55293..3ea3ba9 100644 --- a/build/skel/lang/go1.22.5.do +++ b/build/skel/lang/go1.22.6.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.5.patch.zst "$DISTFILES"/gogost-6.0.0.tar.zst + redo-ifchange "$DISTFILES"/gostls13-1.22.6.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,8 +19,8 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz cd go if [ -n "$GOSTLS13_ENABLED" ] ; then - zstd -d <"$DISTFILES"/gostls13-1.22.5.patch.zst | patch >&2 - cp "$DISTFILES"/gogost-6.0.0.tar.zst . + zstd -d <"$DISTFILES"/gostls13-1.22.6.patch.zst | patch >&2 + cp "$DISTFILES"/gogost-6.0.1.tar.zst . chmod +x debash gogost-install ./gogost-install >&2 command -v bash >/dev/null 2>/dev/null || ./debash diff --git a/build/skel/misc/gocheese-4.2.0.do b/build/skel/misc/gocheese-4.2.0.do index f9c3bde..487b029 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 0bb5028..fb56a9b 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 68b0509..e1518b3 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 87e8deb..278acad 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 cb40b6b..99774d0 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.5" +bdeps="rc-paths stow archivers/zstd lang/go1.22.6" 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 cc52fc7..2aefc6e 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.5.done + 040-go1.22.6.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 9e9ea9a..dd54813 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.5.tar.gz go1.22.5.src.tar.gz +ln -f ../../../build/distfiles/go1.22.6.tar.gz go1.22.6.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.5.dl b/contrib/prepare-deps/steps/040-go1.22.5.dl deleted file mode 100644 index 8788132..0000000 --- a/contrib/prepare-deps/steps/040-go1.22.5.dl +++ /dev/null @@ -1 +0,0 @@ -dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 798c2bd5d59be1fb5d7af98893fa7bb68322117facfdee546a37175ec5e8be634f2bed2d8d0e7d4d0555b354c8e9d72b3829c39670d3be2d2328376a00a48576 diff --git a/contrib/prepare-deps/steps/040-go1.22.5 b/contrib/prepare-deps/steps/040-go1.22.6 similarity index 100% rename from contrib/prepare-deps/steps/040-go1.22.5 rename to contrib/prepare-deps/steps/040-go1.22.6 diff --git a/contrib/prepare-deps/steps/040-go1.22.6.dl b/contrib/prepare-deps/steps/040-go1.22.6.dl new file mode 100644 index 0000000..039bc56 --- /dev/null +++ b/contrib/prepare-deps/steps/040-go1.22.6.dl @@ -0,0 +1 @@ +dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 59f84ba390203271d9fe2d3f04624449d54d3bb73c2b6e54b5f7dc9e9e2dce2192bae07ef56a2afee871cff84d457b90f8a00f4433e072028b97af987f3799e1 diff --git a/example/goredo/steps/00prerequisites b/example/goredo/steps/00prerequisites index daa300e..9ce026c 100755 --- a/example/goredo/steps/00prerequisites +++ b/example/goredo/steps/00prerequisites @@ -1,4 +1,4 @@ #!/bin/sh -ex cd .. -$BASS_ROOT/build/bin/pkg-inst go-stringer-0.18.0 sharness-1.2.0 go1.22.5 perl-5.32.1 +$BASS_ROOT/build/bin/pkg-inst go-stringer-0.18.0 sharness-1.2.0 go1.22.6 perl-5.32.1