Download link for 2.6.2 release

[goredo.git] / makedist

diff --git a/makedist b/makedist
index 54e198dd47d65c7be1e0d9731ef749038c10aeaa..ba5f8ceb1a59d59a0e04050a50db58147ef9edef 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -44,7 +44,6 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude .*PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output INSTALL $texi
 
 cat > $texi <<EOF
@@ -86,10 +85,10 @@ 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
-meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+ssh-keygen -Y sign -f ~/.ssh/sign/goredo@cypherpunks.ru -n file $tarball
+gpg --armor --detach-sign --sign --local-user 3A528DDE952C7E93 "$tarball"
+meta4-create -fn "$tarball" -mtime "$tarball" \
+    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     http://www.goredo.cypherpunks.ru/download/"$tarball" \
     http://y.www.goredo.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
@@ -102,10 +101,11 @@ An entry for documentation:
 @item @ref{Release $release_underscored, $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, pgp}
+@url{download/$tarball.sig, ssh}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
@@ -127,10 +127,11 @@ 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,sig}
 
-GPG key ID: 0x3A528DDE952C7E93 goredo releases <goredo@cypherpunks.ru>
-Fingerprint: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93
+OpenPGP key: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93
+             goredo releases <goredo@cypherpunks.ru>
+OpenSSH key: SHA256:ddOaswnUBtNbuoEBYQtfcF59sR3Bvzo9pIfSlw9sKx8
 
 Please send questions regarding the use of goredo, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/goredo_002ddevel.html