From 12d4d27f077e49390d757e64116056c0bf78e3ef Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 8 Aug 2023 15:10:26 +0300
Subject: [PATCH] Armored signature

---
 doc/download.texi | 36 ++++++++++++++++++------------------
 doc/install.texi  |  4 ++--
 makedist          |  8 +++-----
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/doc/download.texi b/doc/download.texi
index 58816b6..308cd8a 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -1,89 +1,89 @@
-@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sign}
+@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sig}
 @headitem Version @tab Date @tab Size @tab Tarball
 
 @item 4.1.0 @tab 2023-06-04 @tab 65 KiB @tab
 @url{download/gocheese-4.1.0.tar.zst.meta4, meta4}
 @url{download/gocheese-4.1.0.tar.zst, tar}
-@url{download/gocheese-4.1.0.tar.zst.sig, sig}
+@url{download/gocheese-4.1.0.tar.zst.asc, sig}
 
 @item 4.0.0 @tab 2023-06-03 @tab 65 KiB @tab
 @url{download/gocheese-4.0.0.tar.zst.meta4, meta4}
 @url{download/gocheese-4.0.0.tar.zst, tar}
-@url{download/gocheese-4.0.0.tar.zst.sig, sig}
+@url{download/gocheese-4.0.0.tar.zst.asc, sig}
 
 @item 3.7.1 @tab 2023-03-23 @tab 65 KiB @tab
 @url{download/gocheese-3.7.1.tar.zst.meta4, meta4}
 @url{download/gocheese-3.7.1.tar.zst, tar}
-@url{download/gocheese-3.7.1.tar.zst.sig, sig}
+@url{download/gocheese-3.7.1.tar.zst.asc, sig}
 
 @item 3.7.0 @tab 2022-11-28 @tab 68 KiB @tab
 @url{download/gocheese-3.7.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.7.0.tar.zst, tar}
-@url{download/gocheese-3.7.0.tar.zst.sig, sig}
+@url{download/gocheese-3.7.0.tar.zst.asc, sig}
 
 @item 3.6.0 @tab 2022-11-03 @tab 68 KiB @tab
 @url{download/gocheese-3.6.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.6.0.tar.zst, tar}
-@url{download/gocheese-3.6.0.tar.zst.sig, sig}
+@url{download/gocheese-3.6.0.tar.zst.asc, sig}
 
 @item 3.5.0 @tab 2022-02-09 @tab 68 KiB @tab
 @url{download/gocheese-3.5.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.5.0.tar.zst, tar}
-@url{download/gocheese-3.5.0.tar.zst.sig, sig}
+@url{download/gocheese-3.5.0.tar.zst.asc, sig}
 
 @item 3.4.0 @tab 2021-11-26 @tab 68 KiB @tab
 @url{download/gocheese-3.4.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.4.0.tar.zst, tar}
-@url{download/gocheese-3.4.0.tar.zst.sig, sig}
+@url{download/gocheese-3.4.0.tar.zst.asc, sig}
 
 @item 3.3.0 @tab 2021-09-28 @tab 68 KiB @tab
 @url{download/gocheese-3.3.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.3.0.tar.zst, tar}
-@url{download/gocheese-3.3.0.tar.zst.sig, sig}
+@url{download/gocheese-3.3.0.tar.zst.asc, sig}
 
 @item 3.2.0 @tab 2021-09-27 @tab 68 KiB @tab
 @url{download/gocheese-3.2.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.2.0.tar.zst, tar}
-@url{download/gocheese-3.2.0.tar.zst.sig, sig}
+@url{download/gocheese-3.2.0.tar.zst.asc, sig}
 
 @item 3.1.0 @tab 2021-09-27 @tab 68 KiB @tab
 @url{download/gocheese-3.1.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.1.0.tar.zst, tar}
-@url{download/gocheese-3.1.0.tar.zst.sig, sig}
+@url{download/gocheese-3.1.0.tar.zst.asc, sig}
 
 @item 3.0.0 @tab 2021-09-26 @tab 68 KiB @tab
 @url{download/gocheese-3.0.0.tar.zst.meta4, meta4}
 @url{download/gocheese-3.0.0.tar.zst, tar}
-@url{download/gocheese-3.0.0.tar.zst.sig, sig}
+@url{download/gocheese-3.0.0.tar.zst.asc, sig}
 
 @item 2.6.0 @tab 2021-01-22 @tab 58 KiB @tab
 @url{download/gocheese-2.6.0.tar.zst.meta4, meta4}
 @url{download/gocheese-2.6.0.tar.zst, tar}
-@url{download/gocheese-2.6.0.tar.zst.sig, sig}
+@url{download/gocheese-2.6.0.tar.zst.asc, sig}
 
 @item 2.5.0 @tab 2020-11-07 @tab 110 KiB @tab
 @url{download/gocheese-2.5.0.tar.xz.meta4, meta4}
 @url{download/gocheese-2.5.0.tar.xz, tar}
-@url{download/gocheese-2.5.0.tar.xz.sig, sig}
+@url{download/gocheese-2.5.0.tar.xz.asc, sig}
 
 @item 2.4.1 @tab 2020-09-05 @tab 105 KiB @tab
 @url{download/gocheese-2.4.1.tar.xz.meta4, meta4}
 @url{download/gocheese-2.4.1.tar.xz, tar}
-@url{download/gocheese-2.4.1.tar.xz.sig, sig}
+@url{download/gocheese-2.4.1.tar.xz.asc, sig}
 
 @item 2.4.0 @tab 2020-07-24 @tab 101 KiB @tab
 @url{download/gocheese-2.4.0.tar.xz.meta4, meta4}
 @url{download/gocheese-2.4.0.tar.xz, tar}
-@url{download/gocheese-2.4.0.tar.xz.sig, sig}
+@url{download/gocheese-2.4.0.tar.xz.asc, sig}
 
 @item 2.3.0 @tab 2019-12-17 @tab 101 KiB @tab
 @url{download/gocheese-2.3.0.tar.xz.meta4, meta4}
 @url{download/gocheese-2.3.0.tar.xz, tar}
-@url{download/gocheese-2.3.0.tar.xz.sig, sig}
+@url{download/gocheese-2.3.0.tar.xz.asc, sig}
 
 @item 2.2.0 @tab 2019-12-09 @tab 100 KiB @tab
 @url{download/gocheese-2.2.0.tar.xz.meta4, meta4}
 @url{download/gocheese-2.2.0.tar.xz, tar}
-@url{download/gocheese-2.2.0.tar.xz.sig, sig}
+@url{download/gocheese-2.2.0.tar.xz.asc, sig}
 
 @end multitable
diff --git a/doc/install.texi b/doc/install.texi
index 244078e..fe92e29 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -11,8 +11,8 @@ website and, for example, run tests with benchmarks:
 
 @example
 $ [fetch|wget] http://www.gocheese.cypherpunks.ru/download/gocheese-@value{VERSION}.tar.zst
-$ [fetch|wget] http://www.gocheese.cypherpunks.ru/download/gocheese-@value{VERSION}.tar.zst.sig
-$ gpg --verify gocheese-@value{VERSION}.tar.zst.sig gocheese-@value{VERSION}.tar.zst
+$ [fetch|wget] http://www.gocheese.cypherpunks.ru/download/gocheese-@value{VERSION}.tar.zst.asc
+$ gpg --verify gocheese-@value{VERSION}.tar.zst.asc gocheese-@value{VERSION}.tar.zst
 $ zstd -d < gocheese-@value{VERSION}.tar.zst | tar xf -
 $ cd gocheese-@value{VERSION}
 $ go build -mod=vendor
diff --git a/makedist b/makedist
index d9139dd..641098e 100755
--- a/makedist
+++ b/makedist
@@ -52,9 +52,7 @@ cd ..
 tar cvf gocheese-"$release".tar --uid=0 --gid=0 --numeric-owner gocheese-"$release"
 zstd -19 -v gocheese-"$release".tar
 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
+gpg --armor --detach-sign --sign --local-user CD5CD01F55343D88 $tarball
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.gocheese.cypherpunks.ru/download/"$tarball" \
     http://y.www.gocheese.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
@@ -68,7 +66,7 @@ An entry for documentation:
 @item $release @tab $release_date @tab $size KiB @tab
 @url{download/gocheese-${release}.tar.zst.meta4, meta4}
 @url{download/gocheese-${release}.tar.zst, tar}
-@url{download/gocheese-${release}.tar.zst.sig, sig}
+@url{download/gocheese-${release}.tar.zst.asc, sig}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download
-- 
2.44.0