From 07c1e268264b22f4738ec54b467e267e19de8d7b5d15bea7fca7e6dcf9df7d2e Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 21 Feb 2026 11:57:51 +0300 Subject: [PATCH] Use bugfixed meta4ra --- build/distfiles/.gitignore | 2 +- build/distfiles/default.rc | 3 +- build/distfiles/meta4ra-1.3.0.tar.zst.meta4 | 37 ------------------- build/distfiles/meta4ra-1.4.0.tar.zst.meta4 | 37 +++++++++++++++++++ .../{meta4ra-1.3.0.do => meta4ra-1.4.0.do} | 0 contrib/prepare-deps/link-from-distfiles | 2 +- .../prepare-deps/steps/080-meta4ra-1.3.0.dl | 1 - .../{080-meta4ra-1.3.0 => 080-meta4ra-1.4.0} | 0 .../prepare-deps/steps/080-meta4ra-1.4.0.dl | 1 + 9 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 build/distfiles/meta4ra-1.3.0.tar.zst.meta4 create mode 100644 build/distfiles/meta4ra-1.4.0.tar.zst.meta4 rename build/skel/sysutils/{meta4ra-1.3.0.do => meta4ra-1.4.0.do} (100%) delete mode 100644 contrib/prepare-deps/steps/080-meta4ra-1.3.0.dl rename contrib/prepare-deps/steps/{080-meta4ra-1.3.0 => 080-meta4ra-1.4.0} (100%) create mode 100644 contrib/prepare-deps/steps/080-meta4ra-1.4.0.dl diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 7a08daa..9d2a8b7 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -171,7 +171,7 @@ /meson-0.56.0.tar.gz /meson-0.63.3.tar.gz /meson-1.7.2.tar.gz -/meta4ra-1.3.0.tar.zst +/meta4ra-1.4.0.tar.zst /MIME-Base32-1.303.tar.gz /mkvtoolnix-58.0.0.tar.xz /mod_tile-v0.7.0-58-gc3453bc.tar.zst diff --git a/build/distfiles/default.rc b/build/distfiles/default.rc index f1af523..05ea5ab 100644 --- a/build/distfiles/default.rc +++ b/build/distfiles/default.rc @@ -1,6 +1,7 @@ if [ -r predownloaded/$1 ] ; then echo Using predownloaded/$1... >&2 - meta4ra-check -hashes "$META4RA_HASHES" $1.meta4 predownloaded/$1 >&2 + meta4ra-check -hashes "$META4RA_HASHES" -pipe $1.meta4 \ + $(basename $1) &1 >/dev/null ln predownloaded/$1 $3 exit 0 fi diff --git a/build/distfiles/meta4ra-1.3.0.tar.zst.meta4 b/build/distfiles/meta4ra-1.3.0.tar.zst.meta4 deleted file mode 100644 index 441e9e8..0000000 --- a/build/distfiles/meta4ra-1.3.0.tar.zst.meta4 +++ /dev/null @@ -1,37 +0,0 @@ - - - - 92034ed77c082188153daacae63627fbdd4fb70eb8bfb9fdd23c8398fd44fdb2 - 3ca1e2df6664e57a65b32836e22345d0190910d1659e07a1a98eb41a766193c662487827ccd6794b6ade83d8564197bd222f0b1b64e5c1e42b23f11beba5deb6 - 96b3436e8572b0a073a3fb764f0b37565e718986d847a3f79c948d19ea59cd09 - 43b2e295e389da42ab5d7a8bf73da480297534c5e5bd5fef80787d013177d1bc93b1bb706a08b78456f05d4d050bc405208756cf78e1b3bf1aee11a7d9f864b4 - 671aca77ae505996692a48fab90d115202a0c1538300b44ca7384910c851194b - f5a2223e5026544bf2ff427f6d86fbfff15d0668f2028fc167855c06de64a08b51b61f0f2a5d59d4b399876e9f5d110e53b3457256633f6d06d26e6deadaf1b2 - d37d4ea627816bfe880413c8af06287bc2c9d0358edb328235f5e816e85d54f22bf7352deeb9ae691eabf1def3c9f1bdcf0b429977610939485c379d86cb8d6a - 19f7b748cfedba13975b28ab34a6d472016d90f5d32c9ef518b4965889af455b - 1d984ce741c9d498d440b8444f9c6eb2632f4fa10d88c169e2068b89023d6bd25a81286345079a4ad7f83ad09557680ddc9148dbd539ca2a7cda67b5275f5d3b - 5b8440a34d6ec18988b63079bd937fcfaf44e803d48a8d757ba5111a1d31188b - 0362ac5571dd02df97570b4cb2c8a29b - - 476036 - http://www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst - https://www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst - http://y.www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst - http://[322:3bd:cc26:9545::66d6:6245:e58b]/download/meta4ra-1.3.0.tar.zst - - - OpenSSH signature - 294 - http://www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst.sig - https://www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst.sig - http://y.www.meta4ra.stargrave.org/download/meta4ra-1.3.0.tar.zst.sig - http://[322:3bd:cc26:9545::66d6:6245:e58b]/download/meta4ra-1.3.0.tar.zst.sig - - diff --git a/build/distfiles/meta4ra-1.4.0.tar.zst.meta4 b/build/distfiles/meta4ra-1.4.0.tar.zst.meta4 new file mode 100644 index 0000000..ddc89e5 --- /dev/null +++ b/build/distfiles/meta4ra-1.4.0.tar.zst.meta4 @@ -0,0 +1,37 @@ + + + + dfa30c144ac6840a3ceda54d75c3e8a490af6b15ff0fdda97dcef9e402f5e626 + d692e8d134853e86a3ffa72bd581bc9eb8cd7a61e530799ad3abb7c9784bc9221cea9f32154b7ee1a8de50d45d215a9f771a35ede4e15eeb7e656dfef8c9142f + f843483b449fff266f0817343870801951ab0d48ef3f30ca0b352c30ffa58ead + 2ff3e6e307ece4fd7c7563b7f665d7d31ff1d69e291ac4862d1ad4728bdca60f68b3fa43d4808d6a94f364786d5c634907ec4812177bfa37a4041ee3cff4a75c + f1ca1f3e73a950ad45b78ed9adf60bec61db70beb4492b64bc01d086f52aba05 + 2c3032528241777bffbbd6d66aa7d68d276c2f7bc8dfe7c0092d9d65f70aafc7c75f767cdc5395f04145bb494fcdf897dd1726d38bbec11f83b80ad488e79486 + 505a2d80b9aa96dd89f44f3e7ff3683dd13af8a3dc4fa57c7580981fa1a191df06d4892cbd12db81d7cb0ffd88c2904d605e3c8996e76ae545fe14f50a475bdd + 0fa23168276948e1cf5c0f61af51e11bcc274816d2ad477292b0b34a14b695a2 + 5ac400ce095388642e6266913c570ced1c288077da2d833d0b26a71a258c81e8cfc54770743b44cc9faa51bd3b353535146fea449fa99eaa7213674f1e2306bd + cc8e4564a638f3910d8d7648e3c9c8c2817af3c32235ee15211a353f08785a2c + a074c3861236b0e03724d9aa02855dfe + + 476016 + http://www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst + https://www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst + http://y.www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst + http://[322:3bd:cc26:9545::66d6:6245:e58b]/download/meta4ra-1.4.0.tar.zst + + + OpenSSH signature + 294 + http://www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst.sig + https://www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst.sig + http://y.www.meta4ra.stargrave.org/download/meta4ra-1.4.0.tar.zst.sig + http://[322:3bd:cc26:9545::66d6:6245:e58b]/download/meta4ra-1.4.0.tar.zst.sig + + diff --git a/build/skel/sysutils/meta4ra-1.3.0.do b/build/skel/sysutils/meta4ra-1.4.0.do similarity index 100% rename from build/skel/sysutils/meta4ra-1.3.0.do rename to build/skel/sysutils/meta4ra-1.4.0.do diff --git a/contrib/prepare-deps/link-from-distfiles b/contrib/prepare-deps/link-from-distfiles index 0f16010..67f5d4a 100755 --- a/contrib/prepare-deps/link-from-distfiles +++ b/contrib/prepare-deps/link-from-distfiles @@ -9,5 +9,5 @@ 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.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-1.3.0.tar.zst +ln -f ../../../build/distfiles/meta4ra-1.4.0.tar.zst ln -f ../../../build/distfiles/zstd-1.5.7.tar.gz diff --git a/contrib/prepare-deps/steps/080-meta4ra-1.3.0.dl b/contrib/prepare-deps/steps/080-meta4ra-1.3.0.dl deleted file mode 100644 index ed38adf..0000000 --- a/contrib/prepare-deps/steps/080-meta4ra-1.3.0.dl +++ /dev/null @@ -1 +0,0 @@ -dodl http://www.meta4ra.stargrave.org/download/$name.tar.zst $name.tar.zst d37d4ea627816bfe880413c8af06287bc2c9d0358edb328235f5e816e85d54f22bf7352deeb9ae691eabf1def3c9f1bdcf0b429977610939485c379d86cb8d6a diff --git a/contrib/prepare-deps/steps/080-meta4ra-1.3.0 b/contrib/prepare-deps/steps/080-meta4ra-1.4.0 similarity index 100% rename from contrib/prepare-deps/steps/080-meta4ra-1.3.0 rename to contrib/prepare-deps/steps/080-meta4ra-1.4.0 diff --git a/contrib/prepare-deps/steps/080-meta4ra-1.4.0.dl b/contrib/prepare-deps/steps/080-meta4ra-1.4.0.dl new file mode 100644 index 0000000..aa9ffa3 --- /dev/null +++ b/contrib/prepare-deps/steps/080-meta4ra-1.4.0.dl @@ -0,0 +1 @@ +dodl http://www.meta4ra.stargrave.org/download/$name.tar.zst $name.tar.zst 87617314e7c2e02f422fa800c4d5a31d24535150c7cfaa8b5b13bbbb470f1694eec4e81ca1d9e2f93db4eb6a2367edc6d99480629214d279cb56ca71a3ce29fd -- 2.52.0