Armored signature

diff --git a/doc/download.texi b/doc/download.texi
index c91ecafcaa3ec47f7e085a99102095ddc9024bac..32817d3078046e324dd9f1ecafe5288142bd3a8e 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -4,6 +4,6 @@
 @item 0.1.0 @tab 2023-03-20 @tab 672 KiB @tab
 @url{download/tofuproxy-0.1.0.tar.zst.meta4, meta4}
 @url{download/tofuproxy-0.1.0.tar.zst, tar}
-@url{download/tofuproxy-0.1.0.tar.zst.sig, sig}
+@url{download/tofuproxy-0.1.0.tar.zst.asc, asc}
 
 @end multitable

diff --git a/doc/install.texi b/doc/install.texi
index 4e71352a5674a5a81fee22df9659461cdb413cad..eee066fd055c24476cde2087fc14b35f4fac7139 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -8,8 +8,8 @@ WARCs support.
 
 @example
 $ [fetch|wget] http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst
-$ [fetch|wget] http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst.sig
-$ gpg --verify tofuproxy-@value{VERSION}.tar.zst.sig tofuproxy-@value{VERSION}.tar.zst
+$ [fetch|wget] http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst.asc
+$ gpg --verify tofuproxy-@value{VERSION}.tar.zst.asc tofuproxy-@value{VERSION}.tar.zst
 $ zstd -d < tofuproxy-@value{VERSION}.tar.zst | tar xf -
 $ cd tofuproxy-@value{VERSION}
 $ ./build

diff --git a/makedist b/makedist
index 1f71455012127e5fdc2583f0504aa9c568b2de83..dc247da0c70445d195910770433e5556f6b402a9 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -57,9 +57,7 @@ cd ..
 tar cvf tofuproxy-"$release".tar --uid=0 --gid=0 --numeric-owner tofuproxy-"$release"
 zstd -19 -v tofuproxy-"$release".tar
 tarball=tofuproxy-"$release".tar.zst
-gpg --detach-sign --sign --local-user 12AD32689C660D426967FD75CB8205632107AD8A "$tarball"
-gpg --enarmor < "$tarball".sig |
-    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+gpg --armor --detach-sign --sign --local-user 12AD32689C660D426967FD75CB8205632107AD8A "$tarball"
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.tofuproxy.stargrave.org/download/"$tarball" \
     http://y.www.tofuproxy.stargrave.org/download/"$tarball" < "$tarball" > "$tarball".meta4
@@ -73,7 +71,7 @@ An entry for documentation:
 @item $release @tab $release_date @tab $size KiB @tab
     @url{download/$tarball.meta4, meta4}
     @url{download/$tarball, tar}
-    @url{download/$tarball.sig, sig}
+    @url{download/$tarball.asc, sig}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/tofuproxy.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tarball.meta4 $cur/doc/tofuproxy.html/download