From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 3 Aug 2023 14:51:11 +0000 (+0300)
Subject: Armored signature
X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=commitdiff_plain;h=f36c78c271f51a5e12442186aaea3383b4653bbe

Armored signature
---

diff --git a/doc/install.rst b/doc/install.rst
index 1164126..057f47d 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -5,8 +5,8 @@ Preferable way is to :ref:`download <download>` tarball with the
 signature from `official website <http://www.pyderasn.cypherpunks.ru/>`__::
 
     $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-9.3.tar.zst
-    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-9.3.tar.zst.sig
-    $ gpg --verify pyderasn-9.3.tar.zst.sig pyderasn-9.3.tar.zst
+    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-9.3.tar.zst.asc
+    $ gpg --verify pyderasn-9.3.tar.zst.asc pyderasn-9.3.tar.zst
     $ zstd -d < pyderasn-9.3.tar.zst | tar xf -
     $ cd pyderasn-9.3
     $ python setup.py install
diff --git a/makedist b/makedist
index 84a0a28..3aafd67 100755
--- a/makedist
+++ b/makedist
@@ -25,9 +25,7 @@ chmod 755 pyderasn-"$release"/pyderasn.py
 tar cvf pyderasn-"$release".tar --uid=0 --gid=0 --numeric-owner pyderasn-"$release"
 zstd -19 -v pyderasn-"$release".tar
 tarball=pyderasn-"$release".tar.zst
-gpg --detach-sign --sign --local-user pyderasn@cypherpunks.ru $tarball
-gpg --enarmor < "$tarball".sig |
-    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+gpg --armor --detach-sign --sign --local-user pyderasn@cypherpunks.ru $tarball
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.pyderasn.cypherpunks.ru/download/"$tarball" \
     http://y.www.pyderasn.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
@@ -42,10 +40,10 @@ An entry for documentation:
      - $size KiB
      - \`meta4 <download/pyderasn-${release}.tar.zst.meta4>\`__
        \`tar <download/pyderasn-${release}.tar.zst>\`__
-       \`sig <download/pyderasn-${release}.tar.zst.sig>\`__
+       \`sig <download/pyderasn-${release}.tar.zst.asc>\`__
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/doc/download
 
 cat <<EOF
 Subject: PyDERASN $release release announcement
@@ -66,7 +64,7 @@ PyDERASN'es home page is: http://www.pyderasn.cypherpunks.ru/
 Source code and its signature for that version can be found here:
 
     http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst ($size KiB)
-    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst.sig
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst.asc
 
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
          PyDERASN releases <pyderasn at cypherpunks dot ru>