Force people looking for various download links

diff --git a/doc/building.texi b/doc/building.texi
index 78c8945331ccff8c3eef2006e12e02892fa4369f..bfd6e3f7201c0f72d7665fdf596bf194c58ade2c 100644 (file)
--- a/doc/building.texi
+++ b/doc/building.texi
@@ -14,8 +14,8 @@ Go can be installed from packages or
 @end table
 
 @example
-$ [fetch|wget] http://www.nncpgo.org/download/nncp-@value{VERSION}.tar.xz
-$ [fetch|wget] http://www.nncpgo.org/download/nncp-@value{VERSION}.tar.xz.@{asc,sig@}
+$ fetch http://www.nncpgo.org/download/nncp-@value{VERSION}.tar.xz
+$ fetch http://www.nncpgo.org/download/nncp-@value{VERSION}.tar.xz.@{asc,sig@}
 [verify signature]
 $ xz -d <nncp-@value{VERSION}.tar.xz | tar xf -
 $ cd nncp-@value{VERSION}

diff --git a/doc/download.texi b/doc/download.texi
index 61689b73fab1c5e264926ac25d03d3abde23a8ac..b985c1c07477dd0e81b5edfc7786ed55856969b3 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -47,475 +47,244 @@ And additional ones for Yggdrasil support:
 @item @code{gvisor.dev/gvisor} @tab Apache 2.0
 @end multitable
 
-@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar pgp ssh}
-@headitem Version @tab Date @tab Size @tab Tarball
+Look in @file{.meta4} @url{https://datatracker.ietf.org/doc/html/rfc5854, Metalink4}
+files for direct download links.
+
+@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4}
+@headitem Version @tab Date @tab Size @tab Files
 
 @item @ref{Release 8_13_0, 8.13.0} @tab 2025-09-28 @tab 2600 KiB @tab
 @url{download/nncp-8.13.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.13.0.tar.xz, tar}
-@url{download/nncp-8.13.0.tar.xz.asc, pgp}
-@url{download/nncp-8.13.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_12_1, 8.12.1} @tab 2025-09-20 @tab 2600 KiB @tab
 @url{download/nncp-8.12.1.tar.xz.meta4, meta4}
-@url{download/nncp-8.12.1.tar.xz, tar}
-@url{download/nncp-8.12.1.tar.xz.asc, pgp}
-@url{download/nncp-8.12.1.tar.xz.sig, ssh}
 
 @item @ref{Release 8_12_0, 8.12.0} @tab 2025-09-19 @tab 2601 KiB @tab
 @url{download/nncp-8.12.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.12.0.tar.xz, tar}
-@url{download/nncp-8.12.0.tar.xz.asc, pgp}
-@url{download/nncp-8.12.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_11_0, 8.11.0} @tab 2024-07-23 @tab 2600 KiB @tab
 @url{download/nncp-8.11.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.11.0.tar.xz, tar}
-@url{download/nncp-8.11.0.tar.xz.asc, pgp}
-@url{download/nncp-8.11.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_10_0, 8.10.0} @tab 2023-10-31 @tab 2672 KiB @tab
 @url{download/nncp-8.10.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.10.0.tar.xz, tar}
-@url{download/nncp-8.10.0.tar.xz.asc, pgp}
-@url{download/nncp-8.10.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_9_0, 8.9.0} @tab 2023-08-13 @tab 1780 KiB @tab
 @url{download/nncp-8.9.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.9.0.tar.xz, tar}
-@url{download/nncp-8.9.0.tar.xz.asc, pgp}
-@url{download/nncp-8.9.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_8_3, 8.8.3} @tab 2023-04-29 @tab 1779 KiB @tab
 @url{download/nncp-8.8.3.tar.xz.meta4, meta4}
-@url{download/nncp-8.8.3.tar.xz, tar}
-@url{download/nncp-8.8.3.tar.xz.asc, pgp}
-@url{download/nncp-8.8.3.tar.xz.sig, ssh}
 
 @item @ref{Release 8_8_2, 8.8.2} @tab 2022-11-18 @tab 1752 KiB @tab
 @url{download/nncp-8.8.2.tar.xz.meta4, meta4}
-@url{download/nncp-8.8.2.tar.xz, tar}
-@url{download/nncp-8.8.2.tar.xz.asc, pgp}
-@url{download/nncp-8.8.2.tar.xz.sig, ssh}
 
 @item @ref{Release 8_8_1, 8.8.1} @tab 2022-10-30 @tab 1748 KiB @tab
 @url{download/nncp-8.8.1.tar.xz.meta4, meta4}
-@url{download/nncp-8.8.1.tar.xz, tar}
-@url{download/nncp-8.8.1.tar.xz.asc, pgp}
-@url{download/nncp-8.8.1.tar.xz.sig, ssh}
 
 @item @ref{Release 8_8_0, 8.8.0} @tab 2022-09-04 @tab 1739 KiB @tab
 @url{download/nncp-8.8.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.8.0.tar.xz, tar}
-@url{download/nncp-8.8.0.tar.xz.asc, pgp}
-@url{download/nncp-8.8.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_7_2, 8.7.2} @tab 2022-03-13 @tab 1673 KiB @tab
 @url{download/nncp-8.7.2.tar.xz.meta4, meta4}
-@url{download/nncp-8.7.2.tar.xz, tar}
-@url{download/nncp-8.7.2.tar.xz.asc, pgp}
-@url{download/nncp-8.7.2.tar.xz.sig, ssh}
 
 @item @ref{Release 8_7_1, 8.7.1} @tab 2022-03-09 @tab 1669 KiB @tab
 @url{download/nncp-8.7.1.tar.xz.meta4, meta4}
-@url{download/nncp-8.7.1.tar.xz, tar}
-@url{download/nncp-8.7.1.tar.xz.asc, pgp}
-@url{download/nncp-8.7.1.tar.xz.sig, ssh}
 
 @item @ref{Release 8_7_0, 8.7.0} @tab 2022-03-04 @tab 1670 KiB @tab
 @url{download/nncp-8.7.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.7.0.tar.xz, tar}
-@url{download/nncp-8.7.0.tar.xz.asc, pgp}
-@url{download/nncp-8.7.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_6_0, 8.6.0} @tab 2022-03-02 @tab 1670 KiB @tab
 @url{download/nncp-8.6.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.6.0.tar.xz, tar}
-@url{download/nncp-8.6.0.tar.xz.asc, pgp}
-@url{download/nncp-8.6.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_5_0, 8.5.0} @tab 2022-01-26 @tab 1685 KiB @tab
 @url{download/nncp-8.5.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.5.0.tar.xz, tar}
-@url{download/nncp-8.5.0.tar.xz.asc, pgp}
-@url{download/nncp-8.5.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_4_0, 8.4.0} @tab 2022-01-25 @tab 1683 KiB @tab
 @url{download/nncp-8.4.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.4.0.tar.xz, tar}
-@url{download/nncp-8.4.0.tar.xz.asc, pgp}
-@url{download/nncp-8.4.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_3_0, 8.3.0} @tab 2022-01-23 @tab 1682 KiB @tab
 @url{download/nncp-8.3.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.3.0.tar.xz, tar}
-@url{download/nncp-8.3.0.tar.xz.asc, pgp}
-@url{download/nncp-8.3.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_2_0, 8.2.0} @tab 2022-01-20 @tab 1669 KiB @tab
 @url{download/nncp-8.2.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.2.0.tar.xz, tar}
-@url{download/nncp-8.2.0.tar.xz.asc, pgp}
-@url{download/nncp-8.2.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_1_0, 8.1.0} @tab 2022-01-16 @tab 1339 KiB @tab
 @url{download/nncp-8.1.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.1.0.tar.xz, tar}
-@url{download/nncp-8.1.0.tar.xz.asc, pgp}
-@url{download/nncp-8.1.0.tar.xz.sig, ssh}
 
 @item @ref{Release 8_0_2, 8.0.2} @tab 2021-11-10 @tab 1204 KiB @tab
 @url{download/nncp-8.0.2.tar.xz.meta4, meta4}
-@url{download/nncp-8.0.2.tar.xz, tar}
-@url{download/nncp-8.0.2.tar.xz.asc, pgp}
-@url{download/nncp-8.0.2.tar.xz.sig, ssh}
 
 @item @ref{Release 8_0_1, 8.0.1} @tab 2021-11-09 @tab 1206 KiB @tab
 @url{download/nncp-8.0.1.tar.xz.meta4, meta4}
-@url{download/nncp-8.0.1.tar.xz, tar}
-@url{download/nncp-8.0.1.tar.xz.asc, pgp}
-@url{download/nncp-8.0.1.tar.xz.sig, ssh}
 
 @item @ref{Release 8_0_0, 8.0.0} @tab 2021-11-08 @tab 1203 KiB @tab
 @url{download/nncp-8.0.0.tar.xz.meta4, meta4}
-@url{download/nncp-8.0.0.tar.xz, tar}
-@url{download/nncp-8.0.0.tar.xz.asc, pgp}
-@url{download/nncp-8.0.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_7_0, 7.7.0} @tab 2021-09-11 @tab 1180 KiB @tab
 @url{download/nncp-7.7.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.7.0.tar.xz, tar}
-@url{download/nncp-7.7.0.tar.xz.asc, pgp}
-@url{download/nncp-7.7.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_6_0, 7.6.0} @tab 2021-08-08 @tab 1153 KiB @tab
 @url{download/nncp-7.6.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.6.0.tar.xz, tar}
-@url{download/nncp-7.6.0.tar.xz.asc, pgp}
-@url{download/nncp-7.6.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_5_1, 7.5.1} @tab 2021-08-05 @tab 1147 KiB @tab
 @url{download/nncp-7.5.1.tar.xz.meta4, meta4}
-@url{download/nncp-7.5.1.tar.xz, tar}
-@url{download/nncp-7.5.1.tar.xz.asc, pgp}
-@url{download/nncp-7.5.1.tar.xz.sig, ssh}
 
 @item @ref{Release 7_5_0, 7.5.0} @tab 2021-07-28 @tab 1151 KiB @tab
 @url{download/nncp-7.5.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.5.0.tar.xz, tar}
-@url{download/nncp-7.5.0.tar.xz.asc, pgp}
-@url{download/nncp-7.5.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_4_0, 7.4.0} @tab 2021-07-19 @tab 1153 KiB @tab
 @url{download/nncp-7.4.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.4.0.tar.xz, tar}
-@url{download/nncp-7.4.0.tar.xz.asc, pgp}
-@url{download/nncp-7.4.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_3_2, 7.3.2} @tab 2021-07-12 @tab 1141 KiB @tab
 @url{download/nncp-7.3.2.tar.xz.meta4, meta4}
-@url{download/nncp-7.3.2.tar.xz, tar}
-@url{download/nncp-7.3.2.tar.xz.asc, pgp}
-@url{download/nncp-7.3.2.tar.xz.sig, ssh}
 
 @item @ref{Release 7_3_1, 7.3.1} @tab 2021-07-11 @tab 1142 KiB @tab
 @url{download/nncp-7.3.1.tar.xz.meta4, meta4}
-@url{download/nncp-7.3.1.tar.xz, tar}
-@url{download/nncp-7.3.1.tar.xz.asc, pgp}
-@url{download/nncp-7.3.1.tar.xz.sig, ssh}
 
 @item @ref{Release 7_3_0, 7.3.0} @tab 2021-07-10 @tab 1141 KiB @tab
 @url{download/nncp-7.3.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.3.0.tar.xz, tar}
-@url{download/nncp-7.3.0.tar.xz.asc, pgp}
-@url{download/nncp-7.3.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_2_1, 7.2.1} @tab 2021-07-09 @tab 1139 KiB @tab
 @url{download/nncp-7.2.1.tar.xz.meta4, meta4}
-@url{download/nncp-7.2.1.tar.xz, tar}
-@url{download/nncp-7.2.1.tar.xz.asc, pgp}
-@url{download/nncp-7.2.1.tar.xz.sig, ssh}
 
 @item @ref{Release 7_2_0, 7.2.0} @tab 2021-07-08 @tab 1136 KiB @tab
 @url{download/nncp-7.2.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.2.0.tar.xz, tar}
-@url{download/nncp-7.2.0.tar.xz.asc, pgp}
-@url{download/nncp-7.2.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_1_1, 7.1.1} @tab 2021-07-06 @tab 1132 KiB @tab
 @url{download/nncp-7.1.1.tar.xz.meta4, meta4}
-@url{download/nncp-7.1.1.tar.xz, tar}
-@url{download/nncp-7.1.1.tar.xz.asc, pgp}
-@url{download/nncp-7.1.1.tar.xz.sig, ssh}
 
 @item @ref{Release 7_1_0, 7.1.0} @tab 2021-07-04 @tab 1142 KiB @tab
 @url{download/nncp-7.1.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.1.0.tar.xz, tar}
-@url{download/nncp-7.1.0.tar.xz.asc, pgp}
-@url{download/nncp-7.1.0.tar.xz.sig, ssh}
 
 @item @ref{Release 7_0_0, 7.0.0} @tab 2021-06-30 @tab 1123 KiB @tab
 @url{download/nncp-7.0.0.tar.xz.meta4, meta4}
-@url{download/nncp-7.0.0.tar.xz, tar}
-@url{download/nncp-7.0.0.tar.xz.asc, pgp}
-@url{download/nncp-7.0.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_6_0, 6.6.0} @tab 2021-06-26 @tab 1041 KiB @tab
 @url{download/nncp-6.6.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.6.0.tar.xz, tar}
-@url{download/nncp-6.6.0.tar.xz.asc, pgp}
-@url{download/nncp-6.6.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_5_0, 6.5.0} @tab 2021-05-30 @tab 1041 KiB @tab
 @url{download/nncp-6.5.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.5.0.tar.xz, tar}
-@url{download/nncp-6.5.0.tar.xz.asc, pgp}
-@url{download/nncp-6.5.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_4_0, 6.4.0} @tab 2021-04-22 @tab 1042 KiB @tab
 @url{download/nncp-6.4.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.4.0.tar.xz, tar}
-@url{download/nncp-6.4.0.tar.xz.asc, pgp}
-@url{download/nncp-6.4.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_3_0, 6.3.0} @tab 2021-04-14 @tab 1042 KiB @tab
 @url{download/nncp-6.3.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.3.0.tar.xz, tar}
-@url{download/nncp-6.3.0.tar.xz.asc, pgp}
-@url{download/nncp-6.3.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_2_1, 6.2.1} @tab 2021-03-26 @tab 1038 KiB @tab
 @url{download/nncp-6.2.1.tar.xz.meta4, meta4}
-@url{download/nncp-6.2.1.tar.xz, tar}
-@url{download/nncp-6.2.1.tar.xz.asc, pgp}
-@url{download/nncp-6.2.1.tar.xz.sig, ssh}
 
 @item @ref{Release 6_2_0, 6.2.0} @tab 2021-03-07 @tab 1038 KiB @tab
 @url{download/nncp-6.2.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.2.0.tar.xz, tar}
-@url{download/nncp-6.2.0.tar.xz.asc, pgp}
-@url{download/nncp-6.2.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_1_0, 6.1.0} @tab 2021-02-24 @tab 1040 KiB @tab
 @url{download/nncp-6.1.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.1.0.tar.xz, tar}
-@url{download/nncp-6.1.0.tar.xz.asc, pgp}
-@url{download/nncp-6.1.0.tar.xz.sig, ssh}
 
 @item @ref{Release 6_0_0, 6.0.0} @tab 2021-01-23 @tab 1028 KiB @tab
 @url{download/nncp-6.0.0.tar.xz.meta4, meta4}
-@url{download/nncp-6.0.0.tar.xz, tar}
-@url{download/nncp-6.0.0.tar.xz.asc, pgp}
-@url{download/nncp-6.0.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_6_0, 5.6.0} @tab 2021-01-17 @tab 1024 KiB @tab
 @url{download/nncp-5.6.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.6.0.tar.xz, tar}
-@url{download/nncp-5.6.0.tar.xz.asc, pgp}
-@url{download/nncp-5.6.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_5_1, 5.5.1} @tab 2021-01-11 @tab 1165 KiB @tab
 @url{download/nncp-5.5.1.tar.xz.meta4, meta4}
-@url{download/nncp-5.5.1.tar.xz, tar}
-@url{download/nncp-5.5.1.tar.xz.asc, pgp}
-@url{download/nncp-5.5.1.tar.xz.sig, ssh}
 
 @item @ref{Release 5_5_0, 5.5.0} @tab 2021-01-07 @tab 1161 KiB @tab
 @url{download/nncp-5.5.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.5.0.tar.xz, tar}
-@url{download/nncp-5.5.0.tar.xz.asc, pgp}
-@url{download/nncp-5.5.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_4_1, 5.4.1} @tab 2020-09-28 @tab 1143 KiB @tab
 @url{download/nncp-5.4.1.tar.xz.meta4, meta4}
-@url{download/nncp-5.4.1.tar.xz, tar}
-@url{download/nncp-5.4.1.tar.xz.asc, pgp}
-@url{download/nncp-5.4.1.tar.xz.sig, ssh}
 
 @item @ref{Release 5_3_3, 5.3.3} @tab 2020-01-23 @tab 1116 KiB @tab
 @url{download/nncp-5.3.3.tar.xz.meta4, meta4}
-@url{download/nncp-5.3.3.tar.xz, tar}
-@url{download/nncp-5.3.3.tar.xz.asc, pgp}
-@url{download/nncp-5.3.3.tar.xz.sig, ssh}
 
 @item @ref{Release 5_3_2, 5.3.2} @tab 2019-12-28 @tab 1118 KiB @tab
 @url{download/nncp-5.3.2.tar.xz.meta4, meta4}
-@url{download/nncp-5.3.2.tar.xz, tar}
-@url{download/nncp-5.3.2.tar.xz.asc, pgp}
-@url{download/nncp-5.3.2.tar.xz.sig, ssh}
 
 @item @ref{Release 5_3_1, 5.3.1} @tab 2019-12-25 @tab 1117 KiB @tab
 @url{download/nncp-5.3.1.tar.xz.meta4, meta4}
-@url{download/nncp-5.3.1.tar.xz, tar}
-@url{download/nncp-5.3.1.tar.xz.asc, pgp}
-@url{download/nncp-5.3.1.tar.xz.sig, ssh}
 
 @item @ref{Release 5_3_0, 5.3.0} @tab 2019-12-22 @tab 1112 KiB @tab
 @url{download/nncp-5.3.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.3.0.tar.xz, tar}
-@url{download/nncp-5.3.0.tar.xz.asc, pgp}
-@url{download/nncp-5.3.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_2_1, 5.2.1} @tab 2019-12-15 @tab 1109 KiB @tab
 @url{download/nncp-5.2.1.tar.xz.meta4, meta4}
-@url{download/nncp-5.2.1.tar.xz, tar}
-@url{download/nncp-5.2.1.tar.xz.asc, pgp}
-@url{download/nncp-5.2.1.tar.xz.sig, ssh}
 
 @item @ref{Release 5_2_0, 5.2.0} @tab 2019-12-14 @tab 1109 KiB @tab
 @url{download/nncp-5.2.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.2.0.tar.xz, tar}
-@url{download/nncp-5.2.0.tar.xz.asc, pgp}
-@url{download/nncp-5.2.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_1_2, 5.1.2} @tab 2019-12-13 @tab 1106 KiB @tab
 @url{download/nncp-5.1.2.tar.xz.meta4, meta4}
-@url{download/nncp-5.1.2.tar.xz, tar}
-@url{download/nncp-5.1.2.tar.xz.asc, pgp}
-@url{download/nncp-5.1.2.tar.xz.sig, ssh}
 
 @item @ref{Release 5_1_1, 5.1.1} @tab 2019-12-01 @tab 1103 KiB @tab
 @url{download/nncp-5.1.1.tar.xz.meta4, meta4}
-@url{download/nncp-5.1.1.tar.xz, tar}
-@url{download/nncp-5.1.1.tar.xz.asc, pgp}
-@url{download/nncp-5.1.1.tar.xz.sig, ssh}
 
 @item @ref{Release 5_1_0, 5.1.0} @tab 2019-11-24 @tab 1103 KiB @tab
 @url{download/nncp-5.1.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.1.0.tar.xz, tar}
-@url{download/nncp-5.1.0.tar.xz.asc, pgp}
-@url{download/nncp-5.1.0.tar.xz.sig, ssh}
 
 @item @ref{Release 5_0_0, 5.0.0} @tab 2019-11-15 @tab 1099 KiB @tab
 @url{download/nncp-5.0.0.tar.xz.meta4, meta4}
-@url{download/nncp-5.0.0.tar.xz, tar}
-@url{download/nncp-5.0.0.tar.xz.asc, pgp}
-@url{download/nncp-5.0.0.tar.xz.sig, ssh}
 
 @item @ref{Release 4_1, 4.1} @tab 2019-05-01 @tab 1227 KiB @tab
 @url{download/nncp-4.1.tar.xz.meta4, meta4}
-@url{download/nncp-4.1.tar.xz, tar}
-@url{download/nncp-4.1.tar.xz.asc, pgp}
-@url{download/nncp-4.1.tar.xz.sig, ssh}
 
 @item @ref{Release 4_0, 4.0} @tab 2019-04-28 @tab 1227 KiB @tab
 @url{download/nncp-4.0.tar.xz.meta4, meta4}
-@url{download/nncp-4.0.tar.xz, tar}
-@url{download/nncp-4.0.tar.xz.asc, pgp}
-@url{download/nncp-4.0.tar.xz.sig, ssh}
 
 @item @ref{Release 3_4, 3.4} @tab 2018-06-10 @tab 1154 KiB @tab
 @url{download/nncp-3.4.tar.xz.meta4, meta4}
-@url{download/nncp-3.4.tar.xz, tar}
-@url{download/nncp-3.4.tar.xz.asc, pgp}
-@url{download/nncp-3.4.tar.xz.sig, ssh}
 
 @item @ref{Release 3_3, 3.3} @tab 2018-06-02 @tab 1152 KiB @tab
 @url{download/nncp-3.3.tar.xz.meta4, meta4}
-@url{download/nncp-3.3.tar.xz, tar}
-@url{download/nncp-3.3.tar.xz.asc, pgp}
-@url{download/nncp-3.3.tar.xz.sig, ssh}
 
 @item @ref{Release 3_2, 3.2} @tab 2018-05-27 @tab 1147 KiB @tab
 @url{download/nncp-3.2.tar.xz.meta4, meta4}
-@url{download/nncp-3.2.tar.xz, tar}
-@url{download/nncp-3.2.tar.xz.asc, pgp}
-@url{download/nncp-3.2.tar.xz.sig, ssh}
 
 @item @ref{Release 3_1, 3.1} @tab 2018-02-18 @tab 1145 KiB @tab
 @url{download/nncp-3.1.tar.xz.meta4, meta4}
-@url{download/nncp-3.1.tar.xz, tar}
-@url{download/nncp-3.1.tar.xz.asc, pgp}
-@url{download/nncp-3.1.tar.xz.sig, ssh}
 
 @item @ref{Release 3_0, 3.0} @tab 2017-12-30 @tab 993 KiB @tab
 @url{download/nncp-3.0.tar.xz.meta4, meta4}
-@url{download/nncp-3.0.tar.xz, tar}
-@url{download/nncp-3.0.tar.xz.asc, pgp}
-@url{download/nncp-3.0.tar.xz.sig, ssh}
 
 @item @ref{Release 2_0, 2.0} @tab 2017-12-02 @tab 986 KiB @tab
 @url{download/nncp-2.0.tar.xz.meta4, meta4}
-@url{download/nncp-2.0.tar.xz, tar}
-@url{download/nncp-2.0.tar.xz.asc, pgp}
-@url{download/nncp-2.0.tar.xz.sig, ssh}
 
 @item @ref{Release 1_0, 1.0} @tab 2017-12-02 @tab 987 KiB @tab
 @url{download/nncp-1.0.tar.xz.meta4, meta4}
-@url{download/nncp-1.0.tar.xz, tar}
-@url{download/nncp-1.0.tar.xz.asc, pgp}
-@url{download/nncp-1.0.tar.xz.sig, ssh}
 
 @item @ref{Release 0_12, 0.12} @tab 2017-10-08 @tab 978 KiB @tab
 @url{download/nncp-0.12.tar.xz.meta4, meta4}
-@url{download/nncp-0.12.tar.xz, tar}
-@url{download/nncp-0.12.tar.xz.asc, pgp}
-@url{download/nncp-0.12.tar.xz.sig, ssh}
 
 @item @ref{Release 0_11, 0.11} @tab 2017-08-21 @tab 1031 KiB @tab
 @url{download/nncp-0.11.tar.xz.meta4, meta4}
-@url{download/nncp-0.11.tar.xz, tar}
-@url{download/nncp-0.11.tar.xz.asc, pgp}
-@url{download/nncp-0.11.tar.xz.sig, ssh}
 
 @item @ref{Release 0_10, 0.10} @tab 2017-07-04 @tab 949 KiB @tab
 @url{download/nncp-0.10.tar.xz.meta4, meta4}
-@url{download/nncp-0.10.tar.xz, tar}
-@url{download/nncp-0.10.tar.xz.asc, pgp}
-@url{download/nncp-0.10.tar.xz.sig, ssh}
 
 @item @ref{Release 0_9, 0.9} @tab 2017-05-17 @tab 942 KiB @tab
 @url{download/nncp-0.9.tar.xz.meta4, meta4}
-@url{download/nncp-0.9.tar.xz, tar}
-@url{download/nncp-0.9.tar.xz.asc, pgp}
-@url{download/nncp-0.9.tar.xz.sig, ssh}
 
 @item @ref{Release 0_8, 0.8} @tab 2017-04-30 @tab 932 KiB @tab
 @url{download/nncp-0.8.tar.xz.meta4, meta4}
-@url{download/nncp-0.8.tar.xz, tar}
-@url{download/nncp-0.8.tar.xz.asc, pgp}
-@url{download/nncp-0.8.tar.xz.sig, ssh}
 
 @item @ref{Release 0_7, 0.7} @tab 2017-04-02 @tab 783 KiB @tab
 @url{download/nncp-0.7.tar.xz.meta4, meta4}
-@url{download/nncp-0.7.tar.xz, tar}
-@url{download/nncp-0.7.tar.xz.asc, pgp}
-@url{download/nncp-0.7.tar.xz.sig, ssh}
 
 @item @ref{Release 0_6, 0.6} @tab 2017-02-05 @tab 746 KiB @tab
 @url{download/nncp-0.6.tar.xz.meta4, meta4}
-@url{download/nncp-0.6.tar.xz, tar}
-@url{download/nncp-0.6.tar.xz.asc, pgp}
-@url{download/nncp-0.6.tar.xz.sig, ssh}
 
 @item @ref{Release 0_5, 0.5} @tab 2017-01-19 @tab 743 KiB @tab
 @url{download/nncp-0.5.tar.xz.meta4, meta4}
-@url{download/nncp-0.5.tar.xz, tar}
-@url{download/nncp-0.5.tar.xz.asc, pgp}
-@url{download/nncp-0.5.tar.xz.sig, ssh}
 
 @item @ref{Release 0_4, 0.4} @tab 2017-01-17 @tab 741 KiB @tab
 @url{download/nncp-0.4.tar.xz.meta4, meta4}
-@url{download/nncp-0.4.tar.xz, tar}
-@url{download/nncp-0.4.tar.xz.asc, pgp}
-@url{download/nncp-0.4.tar.xz.sig, ssh}
 
 @item @ref{Release 0_3, 0.3} @tab 2017-01-17 @tab 741 KiB @tab
 @url{download/nncp-0.3.tar.xz.meta4, meta4}
-@url{download/nncp-0.3.tar.xz, tar}
-@url{download/nncp-0.3.tar.xz.asc, pgp}
-@url{download/nncp-0.3.tar.xz.sig, ssh}
 
 @item @ref{Release 0_2, 0.2} @tab 2017-01-17 @tab 740 KiB @tab
 @url{download/nncp-0.2.tar.xz.meta4, meta4}
-@url{download/nncp-0.2.tar.xz, tar}
-@url{download/nncp-0.2.tar.xz.asc, pgp}
-@url{download/nncp-0.2.tar.xz.sig, ssh}
 
 @item 0.1 @tab 2017-01-10 @tab 720 KiB @tab
 @url{download/nncp-0.1.tar.xz.meta4, meta4}
-@url{download/nncp-0.1.tar.xz, tar}
-@url{download/nncp-0.1.tar.xz.asc, pgp}
-@url{download/nncp-0.1.tar.xz.sig, ssh}
 
 @end multitable

diff --git a/doc/www.do b/doc/www.do
index cbeb9ae360f2072ef0e0b96fe5b3781c9b95e85f..d427ecc2373ef006c3cd1ca58c5d5c2bef7fe3b6 100644 (file)
--- a/doc/www.do
+++ b/doc/www.do
@@ -1,5 +1,5 @@
 html=nncp.html
-rm -r $html
+rm -fr $html
 redo $html
 cp -a .well-known $html/
 cp -a download $html/

diff --git a/makedist b/makedist
index 8a9fe25b59156db898a75734969f68790c658958..35039b17a84c9c36b8af56462731e49d62de520a 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -114,27 +114,41 @@ cd ..
 detpax nncp-"$release" | xz -9v >nncp-"$release".tar.xz
 tarball=nncp-"$release".tar.xz
 ssh-keygen -Y sign -f ~/.ssh/sign/releases@nncpgo.org -n file $tarball
-gpg --armor --detach-sign --sign --local-user releases@nncpgo.org "$tarball"
-meta4ra-create -fn "$tarball" -mtime "$tarball" \
-    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
+gpg --armor --detach-sign --sign --local-user releases@nncpgo.org $tarball
+meta4ra-create -fn $tarball -mtime $tarball \
+    -sig-pgp $tarball.asc -sig-ssh $tarball.sig \
     "1|ru|http://www.nncpgo.org/download/$tarball" \
     "1|ca|https://nncp.mirrors.quux.org/download/$tarball" \
     "2|ru|https://www.nncpgo.org/download/$tarball" \
-    "|ru|http://y.www.nncpgo.org/download/$tarball" <"$tarball" >"$tarball".meta4
+    "|ru|http://y.www.nncpgo.org/download/$tarball" \
+    "ipfs://TODO/$tarball" <$tarball >$tarball.meta4_
+meta4ra-create -add $tarball.meta4 -fn $tarball.asc -hashes "" \
+    -id "LibrePGP detached signature" \
+    "1|ru|http://www.nncpgo.org/download/$tarball.asc" \
+    "1|ca|https://nncp.mirrors.quux.org/download/$tarball.asc" \
+    "2|ru|https://www.nncpgo.org/download/$tarball.asc" \
+    "|ru|http://y.www.nncpgo.org/download/$tarball.asc" \
+    "ipfs://TODO/$tarball.asc" <$tarball.asc >$tarball.meta4_
+mv $tarball.meta4_ $tarball.meta4
+meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashes "" \
+    -id "OpenSSH signature" \
+    "1|ru|http://www.nncpgo.org/download/$tarball.sig" \
+    "1|ca|https://nncp.mirrors.quux.org/download/$tarball.sig" \
+    "2|ru|https://www.nncpgo.org/download/$tarball.sig" \
+    "|ru|http://y.www.nncpgo.org/download/$tarball.sig" \
+    "ipfs://TODO/$tarball.sig" <$tarball.sig >$tarball.meta4_
+mv $tarball.meta4_ $tarball.meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
 release_date=$(date "+%Y-%m-%d")
 
-mv -v $tmp/"$tarball" $tmp/"$tarball".asc $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/download
+mv -v $tmp/$tarball $tmp/$tarball.asc $tmp/$tarball.sig $tmp/$tarball.meta4 $cur/doc/download
 
 release_underscored=`echo $release | tr . _`
 cat <<EOF
 An entry for documentation:
 @item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB @tab
 @url{download/nncp-${release}.tar.xz.meta4, meta4}
-@url{download/nncp-${release}.tar.xz, tar}
-@url{download/nncp-${release}.tar.xz.asc, pgp}
-@url{download/nncp-${release}.tar.xz.sig, ssh}
 EOF
 
 cd $cur
@@ -188,7 +202,7 @@ to mailing list: http://lists.cypherpunks.su/nncp-devel.html
 EOF
 echo mutt -s \"[EN] NNCP $release release announcement\" \
     nncp-devel@lists.cypherpunks.su \
-    -a $cur/doc/download/"$tarball".meta4
+    -a $cur/doc/download/$tarball.meta4
 
 cat <<EOF
 Subject: [RU] Состоялся релиз NNCP $release
@@ -245,4 +259,4 @@ http://lists.cypherpunks.su/nncp-devel.html
 EOF
 echo mutt -s \"[RU] Состоялся релиз NNCP $release\" \
     nncp-devel@lists.cypherpunks.su \
-    -a $cur/doc/download/"$tarball".meta4
+    -a $cur/doc/download/$tarball.meta4