From 80319cb6c3086e6305a6eb6c2f56eb14770a8be3ff0ba88873f7f196548d8b94 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 17 Jan 2025 12:55:20 +0300 Subject: [PATCH] Update Go 1.23 --- build/distfiles/.gitignore | 8 ++-- build/distfiles/go1.23.3.tar.gz.meta4 | 18 --------- build/distfiles/go1.23.5.tar.gz.meta4 | 18 +++++++++ build/distfiles/gogost-6.0.1.tar.zst.meta4 | 40 ------------------- build/distfiles/gogost-6.0.2.tar.zst.meta4 | 40 +++++++++++++++++++ ...-modcache.do => gogost-v6.0.2-modcache.do} | 2 +- ...ch.zst.do => gostls13-1.23.5.patch.zst.do} | 2 +- build/skel/devel/go-stringer-0.18.0.do | 2 +- build/skel/devel/goredo-2.6.4.do | 2 +- build/skel/lang/{go1.23.3.do => go1.23.5.do} | 6 +-- 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/link-from-distfiles | 2 +- contrib/prepare-deps/steps/040-go1.23.2.dl | 1 - .../steps/{040-go1.23.2 => 040-go1.23.5} | 0 contrib/prepare-deps/steps/040-go1.23.5.dl | 1 + 20 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 build/distfiles/go1.23.3.tar.gz.meta4 create mode 100644 build/distfiles/go1.23.5.tar.gz.meta4 delete mode 100644 build/distfiles/gogost-6.0.1.tar.zst.meta4 create mode 100644 build/distfiles/gogost-6.0.2.tar.zst.meta4 rename build/distfiles/{gogost-v6.0.1-modcache.do => gogost-v6.0.2-modcache.do} (95%) rename build/distfiles/{gostls13-1.23.3.patch.zst.do => gostls13-1.23.5.patch.zst.do} (96%) rename build/skel/lang/{go1.23.3.do => go1.23.5.do} (88%) delete mode 100644 contrib/prepare-deps/steps/040-go1.23.2.dl rename contrib/prepare-deps/steps/{040-go1.23.2 => 040-go1.23.5} (100%) create mode 100644 contrib/prepare-deps/steps/040-go1.23.5.dl diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 3263429..dda0c41 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -70,16 +70,16 @@ /gnutls-3.8.6.tar.xz /go1.17.13.tar.gz /go1.20.14.tar.gz -/go1.23.3.tar.gz +/go1.23.5.tar.gz /go1.4.3.tar.gz /gocheese-4.2.0.tar.zst -/gogost-6.0.1.tar.zst -/gogost-v6.0.1-modcache +/gogost-6.0.2.tar.zst +/gogost-v6.0.2-modcache /golang.org-x-tools-0.18.0-modcache /gomodcache/ /goredo-2.6.4.tar.zst /gosha3-v1.0.0-modcache -/gostls13-1.23.3.patch.zst +/gostls13-1.23.5.patch.zst /gostls13.git/ /gpgme-1.23.2.tar.bz2 /graphviz-11.0.0.tar.xz diff --git a/build/distfiles/go1.23.3.tar.gz.meta4 b/build/distfiles/go1.23.3.tar.gz.meta4 deleted file mode 100644 index 55d78ab..0000000 --- a/build/distfiles/go1.23.3.tar.gz.meta4 +++ /dev/null @@ -1,18 +0,0 @@ - - - - 511ba62816f92e19232a01c0a14d4385d2db6311716328b68361ea934b0c33bc - 70b228c2163eb054186daff96ca017243f2b16a61f1117fe3dc3ca89bda65c626c5721bc213c377c58e4af2c631634f236211f0e80663bb218d8498563b188bd - af2dc12b6fda81e885f26f181f5629cd9e4c12fe658cbaa994386a581afe1439 - b61861c30f4c0566823754a0c6d32498b9096059f0c80dfa0684d52cb777bb51298ea8e6d0e09fa596eeafa284dccc230fc689d5b76ff9e0e40c39bbb5d8a22e - 0309b4980a0bad96f34ecd75eac99d1e8ec618d2b540969b11d0b3e0bf063e0f - 5f550618a9233bb4b0abe15380193643ea198b9e4b68ad5235c2bc148e37d0b5edc7e7c3c3977e2218090e3187d7b0de5e47d2d5c8342d09f93f9453fb08515f - b9b0d36aa1c42f45434b839037f95201f20a1ac8e1c4a1ee4a646f49c85273038854540d36fca0ea3a9edc314431b410717331397d20a8d20c4bead78c060bbb - 8d6a77332487557c6afa2421131b50f83db4ae3c579c3bc72e670ee1f6968599 - bb5f26fb7ab650bc224e0a123acce684985f732b64f3e1b5c68688edef810abad32b2f9b1469829545eab5cdcc976fde37891fe00579d9b17b8f4cb2d7120974 - c0ff7fafcc5de05248f6c136cfd8a740d35fcb31450a950d9d0fbd42c895ccf7 - ca75f90dcd4bd478441b53c5db1548d5 - 28173788 - https://go.dev/dl/go1.23.3.src.tar.gz - - diff --git a/build/distfiles/go1.23.5.tar.gz.meta4 b/build/distfiles/go1.23.5.tar.gz.meta4 new file mode 100644 index 0000000..cf79089 --- /dev/null +++ b/build/distfiles/go1.23.5.tar.gz.meta4 @@ -0,0 +1,18 @@ + + + + 9a2a98db36e8724916d46ee83bc2da06114e49d82c715c125f487cbdabcae6dd + 6fe6101054a0c10ce415aea65367a48ef8397c88d66bad01b7c72107a6c60daf0b9a47f7c1cd6c8da9855ab04309f25941cc867e6a9f90ac51d1ab0c54662313 + f80796332736e595db7fc30283b7449fa740f5afa083da629388e7127d6f3260 + 2dc0d04efe728881b4e11b8334917f0cb4ddfc0c388fc0c24f1f1cf3a4736a2d1e5166de4b4b332de9a3d5ce6555813dc565a59d8d1053b9f24dea8084bf3dde + d2b58ce135147a8f93f4a7a06df1116aee3908edf242068d0b8045980fa8ffc6 + 6a86b4fcf6e9c95bb6b22c4a1d38cabdfb4f684c1795f70caeda44ed9a147d6788a90f023401877d6b1783cc94c040f287c59fffae882131ec8ee677fb65b34d + b04317afeab2d0ced7c36b8682dd32ac085d95d874cf3f614daa34859d7f7f2b75138132e7a64e237c6b4d711d5b03a4d20533f92a44840915630f4ea7cfafa2 + a6f3f4bbd3e6bdd626f79b668f212fbb5649daf75084fb79b678a0ae4d97423b + 7c654b9afc83e6a4c5542b5c310fdbeae18de0c2fc69ec81ff45d04b3a5edda5844076063b019969115a93c1359d6e0175cee610d28d97f373de3d7af36a22cf + a751ef458333f5c9fdbbd26404e7e84a97446d6d292a3f0b462496714aeb376f + f29361c3964031a8dfd35d3647b0c2df + 28179014 + https://go.dev/dl/go1.23.5.src.tar.gz + + diff --git a/build/distfiles/gogost-6.0.1.tar.zst.meta4 b/build/distfiles/gogost-6.0.1.tar.zst.meta4 deleted file mode 100644 index 8704ad5..0000000 --- a/build/distfiles/gogost-6.0.1.tar.zst.meta4 +++ /dev/null @@ -1,40 +0,0 @@ - - - - 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-6.0.2.tar.zst.meta4 b/build/distfiles/gogost-6.0.2.tar.zst.meta4 new file mode 100644 index 0000000..4301e88 --- /dev/null +++ b/build/distfiles/gogost-6.0.2.tar.zst.meta4 @@ -0,0 +1,40 @@ + + + + a15dabb95b7407d4275be8aa895056142604f1614b4689b14595c3e767c791ac + f241c5b9998ec77d9f73484a39a83ca92d9b0551ec2a6f33355197fb1669d41dae41a6d0b5c92fce15c5561b72ce6c3d721d254a0a04a2c191f5a1141dfbd846 + 16151ea03472fe6ee1708017800aa953f69d7ac3c768e2e36e39964954acaffa + 3d32807ff4f50d4cc0811c8931a7e316a67116dce691f5faade33888e13eb53e7095ae925b800335ff21a0a2f4f99f6654dd6a66da9d05d97b39a3db5261c494 + 653f82a3392b2c8cf948f2d1498e9675a8ed8056902bda5f408951ccc24d0360 + cf0662fe2a50a6fe7d5178937caccfe7497c5a0f6a31759d69b06990eee323a0c2ab9af4d8cc1dd4e7a9fa688798ba1a6454ce76add31001a2fd29a878694d22 + 25f4d46e51fc4edd0facdaab377a3938f5094f784463486192c3b6040ce576128a2539a2d6b8799cbedfd18f843832cc1d52dcb5f5994edebcb7aa788756ec16 + 1990722da4cae37f5ea12ab08f290264ddcd71680bef04565ff2f9071a378092 + a2afeae39d1ea21d8bcf1b8b4d6555bc6edf084a893e328810861291535cd8b99f0381d8e7cc34e6c1e2d543619d63fc239f91c5eda884e9c57dad42b7b7ec85 + e17ce1e6009c2101b849dc1c5bda32b0bce3cdc3ae3a3e5cca8e1a56971b4037 + cf2b691ab9a1a8a73bde973e921a7ce3 + + + 87913 + http://www.gogost.cypherpunks.su/gogost-6.0.2.tar.zst + http://y.www.gogost.cypherpunks.su/gogost-6.0.2.tar.zst + + diff --git a/build/distfiles/gogost-v6.0.1-modcache.do b/build/distfiles/gogost-v6.0.2-modcache.do similarity index 95% rename from build/distfiles/gogost-v6.0.1-modcache.do rename to build/distfiles/gogost-v6.0.2-modcache.do index 915d9bc..9bebe52 100644 --- a/build/distfiles/gogost-v6.0.1-modcache.do +++ b/build/distfiles/gogost-v6.0.2-modcache.do @@ -4,7 +4,7 @@ cd "$GOMODCACHE" mkdir -p cache/download/go.cypherpunks.su/gogost/v6/@v cd cache/download/go.cypherpunks.su/gogost/v6/@v for ext in info mod zip ziphash ziphash.sig ; do - fn=v6.0.1.$ext + fn=v6.0.2.$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.23.3.patch.zst.do b/build/distfiles/gostls13-1.23.5.patch.zst.do similarity index 96% rename from build/distfiles/gostls13-1.23.3.patch.zst.do rename to build/distfiles/gostls13-1.23.5.patch.zst.do index 65c5c95..0cd6184 100644 --- a/build/distfiles/gostls13-1.23.3.patch.zst.do +++ b/build/distfiles/gostls13-1.23.5.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.23.3-gost +tag=go1.23.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)" diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do index b6f57ee..1d010fa 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.4.do b/build/skel/devel/goredo-2.6.4.do index 5d215b9..d69cb28 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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.23.3.do b/build/skel/lang/go1.23.5.do similarity index 88% rename from build/skel/lang/go1.23.3.do rename to build/skel/lang/go1.23.5.do index d0d2137..80e0355 100644 --- a/build/skel/lang/go1.23.3.do +++ b/build/skel/lang/go1.23.5.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.23.3.patch.zst "$DISTFILES"/gogost-6.0.1.tar.zst + redo-ifchange "$DISTFILES"/gostls13-1.23.5.patch.zst "$DISTFILES"/gogost-6.0.2.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.23.3.patch.zst | patch >&2 - cp "$DISTFILES"/gogost-6.0.1.tar.zst . + zstd -d <"$DISTFILES"/gostls13-1.23.5.patch.zst | patch >&2 + cp "$DISTFILES"/gogost-6.0.2.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 b7b08b4..2750778 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 651121e..70b554b 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 af9ad74..a918c4b 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 22bd69d..0cfee5d 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 3d2064f..8912c52 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.23.3" +bdeps="rc-paths stow archivers/zstd lang/go1.23.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 0797c06..88631fa 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.23.2.done + 040-go1.23.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/link-from-distfiles b/contrib/prepare-deps/link-from-distfiles index 2cf452e..b1ebaff 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.23.2.tar.gz go1.23.2.src.tar.gz +ln -f ../../../build/distfiles/go1.23.5.tar.gz go1.23.5.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.4.tar.zst ln -f ../../../build/distfiles/meta4ra-0.10.0.tar.zst diff --git a/contrib/prepare-deps/steps/040-go1.23.2.dl b/contrib/prepare-deps/steps/040-go1.23.2.dl deleted file mode 100644 index 29d8e3d..0000000 --- a/contrib/prepare-deps/steps/040-go1.23.2.dl +++ /dev/null @@ -1 +0,0 @@ -dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz e4f9d17ed7888b89b6a72966f8681bbacb5b8bebb7959e530dc058d2fa94012d45067d1884eccd352a0fc8279e6814a932260a46140b65593679d28598bf4d5c diff --git a/contrib/prepare-deps/steps/040-go1.23.2 b/contrib/prepare-deps/steps/040-go1.23.5 similarity index 100% rename from contrib/prepare-deps/steps/040-go1.23.2 rename to contrib/prepare-deps/steps/040-go1.23.5 diff --git a/contrib/prepare-deps/steps/040-go1.23.5.dl b/contrib/prepare-deps/steps/040-go1.23.5.dl new file mode 100644 index 0000000..b5690c7 --- /dev/null +++ b/contrib/prepare-deps/steps/040-go1.23.5.dl @@ -0,0 +1 @@ +dodl https://go.dev/dl/$name.src.tar.gz $name.src.tar.gz b04317afeab2d0ced7c36b8682dd32ac085d95d874cf3f614daa34859d7f7f2b75138132e7a64e237c6b4d711d5b03a4d20533f92a44840915630f4ea7cfafa2 -- 2.48.1