From fe706d653c740b39d34f618e52130e307d5dfbf993f73d045e59131a28f38c90 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 25 Jul 2024 13:40:22 +0300 Subject: [PATCH] Update Go --- build/distfiles/.gitignore | 4 ++-- build/distfiles/go1.22.4.tar.gz.meta4 | 18 ------------------ build/distfiles/go1.22.5.tar.gz.meta4 | 18 ++++++++++++++++++ ...st.do => gostls13-debash-1.22.5.tar.zst.do} | 4 ++-- build/skel/devel/go-stringer-0.18.0.do | 2 +- build/skel/devel/goredo-2.6.2.do | 2 +- build/skel/lang/{go1.22.4.do => go1.22.5.do} | 2 +- build/skel/misc/gocheese-4.2.0.do | 2 +- build/skel/security/age-v1.1.1-23-g29b68c2.do | 2 +- build/skel/security/gosha3-v1.0.0.do | 2 +- build/skel/sysutils/meta4ra-0.10.0.do | 2 +- build/skel/textproc/fzf-0.53.0.do | 2 +- contrib/prepare-deps/README | 2 +- contrib/prepare-deps/steps/040-go1.22.4.dl | 1 - .../steps/{040-go1.22.4 => 040-go1.22.5} | 0 contrib/prepare-deps/steps/040-go1.22.5.dl | 1 + example/goredo/steps/00prerequisites | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 build/distfiles/go1.22.4.tar.gz.meta4 create mode 100644 build/distfiles/go1.22.5.tar.gz.meta4 rename build/distfiles/{gostls13-debash-1.22.4.tar.zst.do => gostls13-debash-1.22.5.tar.zst.do} (85%) rename build/skel/lang/{go1.22.4.do => go1.22.5.do} (97%) delete mode 100644 contrib/prepare-deps/steps/040-go1.22.4.dl rename contrib/prepare-deps/steps/{040-go1.22.4 => 040-go1.22.5} (100%) create mode 100644 contrib/prepare-deps/steps/040-go1.22.5.dl diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index b92fb54..691968f 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -67,7 +67,7 @@ /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz -/go1.22.4.tar.gz +/go1.22.5.tar.gz /go1.4.3.tar.gz /gocheese-4.2.0.tar.zst /gogost-v6.0.0-modcache @@ -75,7 +75,7 @@ /gomodcache/ /goredo-2.6.2.tar.zst /gosha3-v1.0.0-modcache -/gostls13-debash-1.22.4.tar.zst +/gostls13-debash-1.22.5.tar.zst /gostls13.git/ /gpgme-1.23.2.tar.bz2 /graphviz-11.0.0.tar.xz diff --git a/build/distfiles/go1.22.4.tar.gz.meta4 b/build/distfiles/go1.22.4.tar.gz.meta4 deleted file mode 100644 index bc6da1f..0000000 --- a/build/distfiles/go1.22.4.tar.gz.meta4 +++ /dev/null @@ -1,18 +0,0 @@ - - - - 7de8f3dafa64455084002968504666623b4179ea8dc000114089bc264df0be4b - 00a6a3430e38fe5b63df3d453bd58ff51f3cff7814f3e05520725ef2093d1f2547c214f6e58c9bbd078334b51be2407dfe5b68eac5b7eeaa2a33bd3c3a13f3f4 - c27f79265f8a74e418c4ad18e794f196678c882f949d1618f7d24ca06e966f77 - 83f7a58f30bd1ae7fbde55a1b6e65091068af76a20e2c4ad2f698a1a3fddfe99544fd6fd782fd6ec6612c89de7670a6e435a7518ea93ba91cda951ec4153404f - 5c406cdbde5433a3635e18f54b5a4d82801675163815cf8045af6191368f4fe5 - 511c48235364993df0ce762664efe0ff7bbd564cc1556f742c32a2c5667712d2e8f3600ba0dd30ef3d5f6b0b09c781bdd3db7030c0469f3c8aa918ddecc9c401 - 4855ba7e277b2eb79eb52e3ad2a52f18b3a4cd3adc20b7a17d29fabae74141265bf31399307b8d3f35110031d11ad7f583016aa903f3e36eeb6d1f64cfc8a5ad - fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784 - 9a9f00f2a5f2cc8af5802bd22123c1763715b06b0d2d7181e1a5f17a8c39838b207cc2cabbed5ad9fec2010dba34c989ccbd4449d345e6c2caffaaa1cfec0c59 - 88b61be2d4a8f6627486b53aa2965cb28d0b6705a5892a7efe005cdd22edac0d - dc60ff71e96a41898c4b3ff7b7c679c6 - 27555503 - https://go.dev/dl/go1.22.4.src.tar.gz - - diff --git a/build/distfiles/go1.22.5.tar.gz.meta4 b/build/distfiles/go1.22.5.tar.gz.meta4 new file mode 100644 index 0000000..db0bc47 --- /dev/null +++ b/build/distfiles/go1.22.5.tar.gz.meta4 @@ -0,0 +1,18 @@ + + + + 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/gostls13-debash-1.22.4.tar.zst.do b/build/distfiles/gostls13-debash-1.22.5.tar.zst.do similarity index 85% rename from build/distfiles/gostls13-debash-1.22.4.tar.zst.do rename to build/distfiles/gostls13-debash-1.22.5.tar.zst.do index a071126..54345ef 100644 --- a/build/distfiles/gostls13-debash-1.22.4.tar.zst.do +++ b/build/distfiles/gostls13-debash-1.22.5.tar.zst.do @@ -2,9 +2,9 @@ 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.4-gost +tag=go1.22.5-gost git fetch origin tag $tag >&2 -echo gostls13@cypherpunks.ru ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuX3gTqrFb3G2oW/osn3LIa7X5spo0MTsEIRLKVfJrq >allowed-signers +echo gostls13@cypherpunks.su ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuX3gTqrFb3G2oW/osn3LIa7X5spo0MTsEIRLKVfJrq >allowed-signers git config gpg.ssh.allowedSignersFile "$(realpath allowed-signers)" git tag --verify $tag >&2 git archive --prefix=${1%.tar.zst}/ $tag debash | $COMPRESSOR diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do index 903ce81..12dd112 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 20bee0b..4ee4fc1 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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.4.do b/build/skel/lang/go1.22.5.do similarity index 97% rename from build/skel/lang/go1.22.4.do rename to build/skel/lang/go1.22.5.do index 133aad0..6b9683a 100644 --- a/build/skel/lang/go1.22.4.do +++ b/build/skel/lang/go1.22.5.do @@ -5,7 +5,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc bdeps="rc-paths stow archivers/zstd" command -v bash >/dev/null 2>/dev/null || bdeps="$bdeps lang/perl-5.32.1" goprev=go1.20.14 -debash=gostls13-debash-1.22.4 +debash=gostls13-debash-1.22.5 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz \ "$DISTFILES"/$debash.tar.zst lang/$goprev hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) diff --git a/build/skel/misc/gocheese-4.2.0.do b/build/skel/misc/gocheese-4.2.0.do index 1ba606a..f9c3bde 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 921985d..0bb5028 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 c78e4da..68b0509 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 dd21e4a..87e8deb 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 d923225..cb40b6b 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.4" +bdeps="rc-paths stow archivers/zstd lang/go1.22.5" 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 922e5f0..cc52fc7 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.4.done + 040-go1.22.5.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/steps/040-go1.22.4.dl b/contrib/prepare-deps/steps/040-go1.22.4.dl deleted file mode 100644 index 3af67ed..0000000 --- a/contrib/prepare-deps/steps/040-go1.22.4.dl +++ /dev/null @@ -1 +0,0 @@ -dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 4855ba7e277b2eb79eb52e3ad2a52f18b3a4cd3adc20b7a17d29fabae74141265bf31399307b8d3f35110031d11ad7f583016aa903f3e36eeb6d1f64cfc8a5ad diff --git a/contrib/prepare-deps/steps/040-go1.22.4 b/contrib/prepare-deps/steps/040-go1.22.5 similarity index 100% rename from contrib/prepare-deps/steps/040-go1.22.4 rename to contrib/prepare-deps/steps/040-go1.22.5 diff --git a/contrib/prepare-deps/steps/040-go1.22.5.dl b/contrib/prepare-deps/steps/040-go1.22.5.dl new file mode 100644 index 0000000..8788132 --- /dev/null +++ b/contrib/prepare-deps/steps/040-go1.22.5.dl @@ -0,0 +1 @@ +dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz 798c2bd5d59be1fb5d7af98893fa7bb68322117facfdee546a37175ec5e8be634f2bed2d8d0e7d4d0555b354c8e9d72b3829c39670d3be2d2328376a00a48576 diff --git a/example/goredo/steps/00prerequisites b/example/goredo/steps/00prerequisites index 2f8cf6d..daa300e 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.4 perl-5.32.1 +$BASS_ROOT/build/bin/pkg-inst go-stringer-0.18.0 sharness-1.2.0 go1.22.5 perl-5.32.1 -- 2.48.1