From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 8 Aug 2023 15:03:36 +0000 (+0300)
Subject: Armored signature
X-Git-Tag: v1.31.0~6
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=0c47f49071b2322f2c805beee85cfb6497aff99d

Armored signature
---

diff --git a/doc/download.texi b/doc/download.texi
index f133b94..aa7d0b3 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -4,196 +4,196 @@
 @item @ref{Release 1_30_0, 1.30.0} @tab 2023-01-18 @tab 431 KiB @tab
 @url{download/goredo-1.30.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.30.0.tar.zst, tar}
-@url{download/goredo-1.30.0.tar.zst.sig, sig}
+@url{download/goredo-1.30.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_29_0, 1.29.0} @tab 2023-01-17 @tab 431 KiB @tab
 @url{download/goredo-1.29.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.29.0.tar.zst, tar}
-@url{download/goredo-1.29.0.tar.zst.sig, sig}
+@url{download/goredo-1.29.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_28_0, 1.28.0} @tab 2022-11-14 @tab 429 KiB @tab
 @url{download/goredo-1.28.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.28.0.tar.zst, tar}
-@url{download/goredo-1.28.0.tar.zst.sig, sig}
+@url{download/goredo-1.28.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_27_1, 1.27.1} @tab 2022-09-09 @tab 424 KiB @tab
 @url{download/goredo-1.27.1.tar.zst.meta4, meta4}
 @url{download/goredo-1.27.1.tar.zst, tar}
-@url{download/goredo-1.27.1.tar.zst.sig, sig}
+@url{download/goredo-1.27.1.tar.zst.asc, sig}
 
 @item @ref{Release 1_27_0, 1.27.0} @tab 2022-08-28 @tab 424 KiB @tab
 @url{download/goredo-1.27.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.27.0.tar.zst, tar}
-@url{download/goredo-1.27.0.tar.zst.sig, sig}
+@url{download/goredo-1.27.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_26_0, 1.26.0} @tab 2022-08-26 @tab 424 KiB @tab
 @url{download/goredo-1.26.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.26.0.tar.zst, tar}
-@url{download/goredo-1.26.0.tar.zst.sig, sig}
+@url{download/goredo-1.26.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_25_0, 1.25.0} @tab 2022-05-08 @tab 402 KiB @tab
 @url{download/goredo-1.25.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.25.0.tar.zst, tar}
-@url{download/goredo-1.25.0.tar.zst.sig, sig}
+@url{download/goredo-1.25.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_24_0, 1.24.0} @tab 2022-03-01 @tab 401 KiB @tab
 @url{download/goredo-1.24.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.24.0.tar.zst, tar}
-@url{download/goredo-1.24.0.tar.zst.sig, sig}
+@url{download/goredo-1.24.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_23_0, 1.23.0} @tab 2022-02-23 @tab 401 KiB @tab
 @url{download/goredo-1.23.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.23.0.tar.zst, tar}
-@url{download/goredo-1.23.0.tar.zst.sig, sig}
+@url{download/goredo-1.23.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_22_0, 1.22.0} @tab 2022-01-26 @tab 388 KiB @tab
 @url{download/goredo-1.22.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.22.0.tar.zst, tar}
-@url{download/goredo-1.22.0.tar.zst.sig, sig}
+@url{download/goredo-1.22.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_21_0, 1.21.0} @tab 2021-11-20 @tab 387 KiB @tab
 @url{download/goredo-1.21.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.21.0.tar.zst, tar}
-@url{download/goredo-1.21.0.tar.zst.sig, sig}
+@url{download/goredo-1.21.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_20_0, 1.20.0} @tab 2021-11-19 @tab 385 KiB @tab
 @url{download/goredo-1.20.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.20.0.tar.zst, tar}
-@url{download/goredo-1.20.0.tar.zst.sig, sig}
+@url{download/goredo-1.20.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_19_0, 1.19.0} @tab 2021-11-09 @tab 385 KiB @tab
 @url{download/goredo-1.19.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.19.0.tar.zst, tar}
-@url{download/goredo-1.19.0.tar.zst.sig, sig}
+@url{download/goredo-1.19.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_18_0, 1.18.0} @tab 2021-10-27 @tab 388 KiB @tab
 @url{download/goredo-1.18.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.18.0.tar.zst, tar}
-@url{download/goredo-1.18.0.tar.zst.sig, sig}
+@url{download/goredo-1.18.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_17_0, 1.17.0} @tab 2021-10-19 @tab 387 KiB @tab
 @url{download/goredo-1.17.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.17.0.tar.zst, tar}
-@url{download/goredo-1.17.0.tar.zst.sig, sig}
+@url{download/goredo-1.17.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_16_0, 1.16.0} @tab 2021-10-14 @tab 387 KiB @tab
 @url{download/goredo-1.16.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.16.0.tar.zst, tar}
-@url{download/goredo-1.16.0.tar.zst.sig, sig}
+@url{download/goredo-1.16.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_15_0, 1.15.0} @tab 2021-09-30 @tab 392 KiB @tab
 @url{download/goredo-1.15.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.15.0.tar.zst, tar}
-@url{download/goredo-1.15.0.tar.zst.sig, sig}
+@url{download/goredo-1.15.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_14_0, 1.14.0} @tab 2021-09-15 @tab 392 KiB @tab
 @url{download/goredo-1.14.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.14.0.tar.zst, tar}
-@url{download/goredo-1.14.0.tar.zst.sig, sig}
+@url{download/goredo-1.14.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_13_0, 1.13.0} @tab 2021-08-06 @tab 392 KiB @tab
 @url{download/goredo-1.13.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.13.0.tar.zst, tar}
-@url{download/goredo-1.13.0.tar.zst.sig, sig}
+@url{download/goredo-1.13.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_12_0, 1.12.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.12.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.12.0.tar.zst, tar}
-@url{download/goredo-1.12.0.tar.zst.sig, sig}
+@url{download/goredo-1.12.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_11_0, 1.11.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.11.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.11.0.tar.zst, tar}
-@url{download/goredo-1.11.0.tar.zst.sig, sig}
+@url{download/goredo-1.11.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_10_0, 1.10.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.10.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.10.0.tar.zst, tar}
-@url{download/goredo-1.10.0.tar.zst.sig, sig}
+@url{download/goredo-1.10.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_9_0, 1.9.0} @tab 2021-07-31 @tab 392 KiB @tab
 @url{download/goredo-1.9.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.9.0.tar.zst, tar}
-@url{download/goredo-1.9.0.tar.zst.sig, sig}
+@url{download/goredo-1.9.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_8_0, 1.8.0} @tab 2021-07-02 @tab 389 KiB @tab
 @url{download/goredo-1.8.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.8.0.tar.zst, tar}
-@url{download/goredo-1.8.0.tar.zst.sig, sig}
+@url{download/goredo-1.8.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_7_0, 1.7.0} @tab 2021-06-23 @tab 389 KiB @tab
 @url{download/goredo-1.7.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.7.0.tar.zst, tar}
-@url{download/goredo-1.7.0.tar.zst.sig, sig}
+@url{download/goredo-1.7.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_6_0, 1.6.0} @tab 2021-06-22 @tab 387 KiB @tab
 @url{download/goredo-1.6.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.6.0.tar.zst, tar}
-@url{download/goredo-1.6.0.tar.zst.sig, sig}
+@url{download/goredo-1.6.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_5_0, 1.5.0} @tab 2021-06-21 @tab 387 KiB @tab
 @url{download/goredo-1.5.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.5.0.tar.zst, tar}
-@url{download/goredo-1.5.0.tar.zst.sig, sig}
+@url{download/goredo-1.5.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_4_1, 1.4.1} @tab 2021-04-29 @tab 383 KiB @tab
 @url{download/goredo-1.4.1.tar.zst.meta4, meta4}
 @url{download/goredo-1.4.1.tar.zst, tar}
-@url{download/goredo-1.4.1.tar.zst.sig, sig}
+@url{download/goredo-1.4.1.tar.zst.asc, sig}
 
 @item @ref{Release 1_4_0, 1.4.0} @tab 2021-04-29 @tab 383 KiB @tab
 @url{download/goredo-1.4.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.4.0.tar.zst, tar}
-@url{download/goredo-1.4.0.tar.zst.sig, sig}
+@url{download/goredo-1.4.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_3_0, 1.3.0} @tab 2021-02-15 @tab 339 KiB @tab
 @url{download/goredo-1.3.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.3.0.tar.zst, tar}
-@url{download/goredo-1.3.0.tar.zst.sig, sig}
+@url{download/goredo-1.3.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_2_0, 1.2.0} @tab 2021-01-29 @tab 338 KiB @tab
 @url{download/goredo-1.2.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.2.0.tar.zst, tar}
-@url{download/goredo-1.2.0.tar.zst.sig, sig}
+@url{download/goredo-1.2.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_1_0, 1.1.0} @tab 2021-01-24 @tab 338 KiB @tab
 @url{download/goredo-1.1.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.1.0.tar.zst, tar}
-@url{download/goredo-1.1.0.tar.zst.sig, sig}
+@url{download/goredo-1.1.0.tar.zst.asc, sig}
 
 @item @ref{Release 1_0_0, 1.0.0} @tab 2021-01-16 @tab 338 KiB @tab
 @url{download/goredo-1.0.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.0.0.tar.zst, tar}
-@url{download/goredo-1.0.0.tar.zst.sig, sig}
+@url{download/goredo-1.0.0.tar.zst.asc, sig}
 
 @item @ref{Release 0_12_3, 0.12.3} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.3.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.3.tar.zst, tar}
-@url{download/goredo-0.12.3.tar.zst.sig, sig}
+@url{download/goredo-0.12.3.tar.zst.asc, sig}
 
 @item @ref{Release 0_12_2, 0.12.2} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.2.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.2.tar.zst, tar}
-@url{download/goredo-0.12.2.tar.zst.sig, sig}
+@url{download/goredo-0.12.2.tar.zst.asc, sig}
 
 @item @ref{Release 0_12_1, 0.12.1} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.1.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.1.tar.zst, tar}
-@url{download/goredo-0.12.1.tar.zst.sig, sig}
+@url{download/goredo-0.12.1.tar.zst.asc, sig}
 
 @item @ref{Release 0_12_0, 0.12.0} @tab 2021-01-12 @tab 379 KiB @tab
 @url{download/goredo-0.12.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.0.tar.zst, tar}
-@url{download/goredo-0.12.0.tar.zst.sig, sig}
+@url{download/goredo-0.12.0.tar.zst.asc, sig}
 
 @item @ref{Release 0_11_0, 0.11.0} @tab 2021-01-10 @tab 379 KiB @tab
 @url{download/goredo-0.11.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.11.0.tar.zst, tar}
-@url{download/goredo-0.11.0.tar.zst.sig, sig}
+@url{download/goredo-0.11.0.tar.zst.asc, sig}
 
 @item @ref{Release 0_10_0, 0.10.0} @tab 2021-01-09 @tab 436 KiB @tab
 @url{download/goredo-0.10.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.10.0.tar.zst, tar}
-@url{download/goredo-0.10.0.tar.zst.sig, sig}
+@url{download/goredo-0.10.0.tar.zst.asc, sig}
 
 @end multitable
diff --git a/doc/install.texi b/doc/install.texi
index 5ccf577..d5743d7 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -41,8 +41,8 @@ Preferable way is to download tarball with the signature from website:
 
 @example
 $ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst
-$ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst.sig
-$ gpg --verify goredo-@value{VERSION}.tar.zst.sig goredo-@value{VERSION}.tar.zst
+$ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst.asc
+$ gpg --verify goredo-@value{VERSION}.tar.zst.asc goredo-@value{VERSION}.tar.zst
 $ zstd -d < goredo-@value{VERSION}.tar.zst | tar xf -
 $ cd goredo-@value{VERSION}/src
 $ go build -mod=vendor
diff --git a/makedist b/makedist
index 54e198d..337c8f1 100755
--- a/makedist
+++ b/makedist
@@ -86,9 +86,7 @@ cd ..
 tar cvf goredo-"$release".tar --uid=0 --gid=0 --numeric-owner goredo-"$release"
 zstd -19 -v goredo-"$release".tar
 tarball=goredo-"$release".tar.zst
-gpg --detach-sign --sign --local-user 3A528DDE952C7E93 "$tarball"
-gpg --enarmor < "$tarball".sig |
-    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+gpg --armor --detach-sign --sign --local-user 3A528DDE952C7E93 "$tarball"
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.goredo.cypherpunks.ru/download/"$tarball" \
     http://y.www.goredo.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
@@ -105,7 +103,7 @@ An entry for documentation:
 @url{download/$tarball.sig, sig}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tarball.meta4 $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
@@ -127,7 +125,7 @@ goredo's home page is: http://www.goredo.cypherpunks.ru/
 Source code and its signature for that version can be found here:
 
     http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst ($size KiB)
-    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.sig
+    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.asc
 
 GPG key ID: 0x3A528DDE952C7E93 goredo releases <goredo@cypherpunks.ru>
 Fingerprint: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93