X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist;h=3aafd67106a83e0ec53986f3ba1477fb8b2b2ba6;hb=f36c78c271f51a5e12442186aaea3383b4653bbe;hp=12c10f0f7ee81e0eba331fe1db5e7372cdfc0d4d;hpb=096d73081d80681b049b09f59908dc1daa4ff38e;p=pyderasn.git

diff --git a/makedist b/makedist
index 12c10f0..3aafd67 100755
--- a/makedist
+++ b/makedist
@@ -25,15 +25,12 @@ 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
-meta4-create -file "$tarball" -mtime "$tarball" -sig "$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".meta4
+    http://y.www.pyderasn.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
-hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
 cat <<EOF
@@ -42,12 +39,11 @@ An entry for documentation:
      - $release_date
      - $size KiB
      - \`meta4 <download/pyderasn-${release}.tar.zst.meta4>\`__
-       \`link <download/pyderasn-${release}.tar.zst>\`__
-       \`sig <download/pyderasn-${release}.tar.zst.sig>\`__
-     - \`\`$hash\`\`
+       \`tar <download/pyderasn-${release}.tar.zst>\`__
+       \`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
@@ -68,9 +64,8 @@ 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
 
-SHA256 hash: $hash
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
          PyDERASN releases <pyderasn at cypherpunks dot ru>