Use Metalink

diff --git a/doc/download.texi b/doc/download.texi
index ec3a5649a8fd624615e4b0d076192dd8b5d7bbee..d5e0f6b5bd4f449e488bda9d191e3d622d2be8b1 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -2,53 +2,73 @@
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
 @item 3.3.0 @tab 2021-09-28 @tab 68 KiB
-@tab @url{download/gocheese-3.3.0.tar.zst, link}
-     @url{download/gocheese-3.3.0.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-3.3.0.tar.zst.meta4, meta4}
+    @url{download/gocheese-3.3.0.tar.zst, link}
+    @url{download/gocheese-3.3.0.tar.zst.sig, sig}
 @tab @code{B71986D9 17618262 D1196B8C 7F976E19 4BE88452 1BB2813D 2D863400 D635A33D}
 
 @item 3.2.0 @tab 2021-09-27 @tab 68 KiB
-@tab @url{download/gocheese-3.2.0.tar.zst, link}
-     @url{download/gocheese-3.2.0.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-3.2.0.tar.zst.meta4, meta4}
+    @url{download/gocheese-3.2.0.tar.zst, link}
+    @url{download/gocheese-3.2.0.tar.zst.sig, sig}
 @tab @code{FA3F9352 A0632A54 014BD0F0 19CDC428 9C2BECEA B64B410C EA992A70 A706AF4F}
 
 @item 3.1.0 @tab 2021-09-27 @tab 68 KiB
-@tab @url{download/gocheese-3.1.0.tar.zst, link}
-     @url{download/gocheese-3.1.0.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-3.1.0.tar.zst.meta4, meta4}
+    @url{download/gocheese-3.1.0.tar.zst, link}
+    @url{download/gocheese-3.1.0.tar.zst.sig, sig}
 @tab @code{4416F90E 5A87F06E F2725FC3 4D3BD078 341DE4DB A883A91D 9F6E9CB0 30B12185}
 
 @item 3.0.0 @tab 2021-09-26 @tab 68 KiB
-@tab @url{download/gocheese-3.0.0.tar.zst, link}
-     @url{download/gocheese-3.0.0.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-3.0.0.tar.zst.meta4, meta4}
+    @url{download/gocheese-3.0.0.tar.zst, link}
+    @url{download/gocheese-3.0.0.tar.zst.sig, sig}
 @tab @code{7403FFB5 8D39C631 64C9D2C4 0507F603 FF92ACB2 3FA21DD5 C545D5EB 251CAE18}
 
 @item 2.6.0 @tab 2021-01-22 @tab 58 KiB
-@tab @url{download/gocheese-2.6.0.tar.zst, link}
-     @url{download/gocheese-2.6.0.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-2.6.0.tar.zst.meta4, meta4}
+    @url{download/gocheese-2.6.0.tar.zst, link}
+    @url{download/gocheese-2.6.0.tar.zst.sig, sig}
 @tab @code{20DE75D6 903EAE4B FF1B83A2 3E91AC50 F1FA3D37 8D14829C BB130B50 020020B4}
 
 @item 2.5.0 @tab 2020-11-07 @tab 110 KiB
-@tab @url{download/gocheese-2.5.0.tar.xz, link}
-     @url{download/gocheese-2.5.0.tar.xz.sig, sign}
+@tab
+    @url{download/gocheese-2.5.0.tar.xz.meta4, meta4}
+    @url{download/gocheese-2.5.0.tar.xz, link}
+    @url{download/gocheese-2.5.0.tar.xz.sig, sig}
 @tab @code{C437AD4D 33E899F6 9DE7FC28 92F5C49C 8409913E EA26BA95 18144870 D74107B4}
 
 @item 2.4.1 @tab 2020-09-05 @tab 105 KiB
-@tab @url{download/gocheese-2.4.1.tar.xz, link}
-     @url{download/gocheese-2.4.1.tar.xz.sig, sign}
+@tab
+    @url{download/gocheese-2.4.1.tar.xz.meta4, meta4}
+    @url{download/gocheese-2.4.1.tar.xz, link}
+    @url{download/gocheese-2.4.1.tar.xz.sig, sig}
 @tab @code{8B8C5A8D 748FDB3D 875EC9DA 83744FFF 314FDDE9 22561BDE 7BBD290F 86642C0F}
 
 @item 2.4.0 @tab 2020-07-24 @tab 101 KiB
-@tab @url{download/gocheese-2.4.0.tar.xz, link}
-     @url{download/gocheese-2.4.0.tar.xz.sig, sign}
+@tab
+    @url{download/gocheese-2.4.0.tar.xz.meta4, meta4}
+    @url{download/gocheese-2.4.0.tar.xz, link}
+    @url{download/gocheese-2.4.0.tar.xz.sig, sig}
 @tab @code{6EE9A436 F415AB09 6D75FA5A D9BFBD6A 9BF9ACE2 52514802 CBFDF576 C057B2AC}
 
 @item 2.3.0 @tab 2019-12-17 @tab 101 KiB
-@tab @url{download/gocheese-2.3.0.tar.xz, link}
-     @url{download/gocheese-2.3.0.tar.xz.sig, sign}
+@tab
+    @url{download/gocheese-2.3.0.tar.xz.meta4, meta4}
+    @url{download/gocheese-2.3.0.tar.xz, link}
+    @url{download/gocheese-2.3.0.tar.xz.sig, sig}
 @tab @code{574C3641 BBDA2957 2FE57F03 98606403 4D7B2C58 44B2CFA4 0EBF9F75 E0186989}
 
 @item 2.2.0 @tab 2019-12-09 @tab 100 KiB
-@tab @url{download/gocheese-2.2.0.tar.xz, link}
-     @url{download/gocheese-2.2.0.tar.xz.sig, sign}
+@tab
+    @url{download/gocheese-2.2.0.tar.xz.meta4, meta4}
+    @url{download/gocheese-2.2.0.tar.xz, link}
+    @url{download/gocheese-2.2.0.tar.xz.sig, sig}
 @tab @code{5AA24DA6 C03C51BD 5C45CD50 AA1F19B5 6360C892 3ED86F06 D0F2B8FA 4C8CCB5B}
 
 @end multitable

diff --git a/makedist.sh b/makedist.sh
index 999b9a4614713b90f65a767053edbf52c8796a2c..d8ce491b84954e8789ad04623f60703a6292b514 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -55,9 +55,13 @@ chmod +x contrib/pyshop2packages.sh contrib/do
 cd ..
 tar cvf gocheese-"$release".tar --uid=0 --gid=0 --numeric-owner gocheese-"$release"
 zstd -19 -v gocheese-"$release".tar
-gpg --detach-sign --sign --local-user CD5CD01F55343D88 gocheese-"$release".tar.zst
-
 tarball=gocheese-"$release".tar.zst
+gpg --detach-sign --sign --local-user CD5CD01F55343D88 $tarball
+gpg --enarmor < "$tarball".sig |
+    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+meta4-create -file "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+    http://www.gocheese.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
+
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
@@ -65,9 +69,11 @@ release_date=$(date "+%Y-%m-%d")
 cat <<EOF
 An entry for documentation:
 @item $release @tab $release_date @tab $size KiB
-@tab @url{download/gocheese-${release}.tar.zst, link}
-     @url{download/gocheese-${release}.tar.zst.sig, sign}
+@tab
+    @url{download/gocheese-${release}.tar.zst.meta4, meta4}
+    @url{download/gocheese-${release}.tar.zst, link}
+    @url{download/gocheese-${release}.tar.zst.sig, sig}
 @tab @code{$hash}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $cur/doc/gocheese.html/download
+mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download