X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist;h=48bb6e8167627b252d81a77645f59e615b37b1e4;hb=81d5e6635251272cdb1ea4b0bf5b9793a0e12a4d;hp=2db35758749de639447110c569a75ba93e4c7577;hpb=eabe03758cdfa91d6bb637e8d71eaa35a20111ea;p=gogost.git

diff --git a/makedist b/makedist
index 2db3575..48bb6e8 100755
--- a/makedist
+++ b/makedist
@@ -1,18 +1,16 @@
 #!/bin/sh -ex
 
+PATH=$HOME/work/meta4ra/contrib:$PATH
 cur=$(pwd)
 tmp=$(mktemp -d)
 release=$1
 [ -n "$release" ]
 
-redo-ifchange streebog256
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
 git checkout v$release
-redo VERSION
+./version > VERSION
 go mod vendor
-mkdir contrib
-cp ~/work/redo/apenwarr/minimal/do contrib/do
 
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
@@ -55,30 +53,22 @@ mkinfo --output FAQ $texi
 
 rm -rf .git
 redo-cleanup full
-rm -f \
-    $texi \
-    *.texi \
-    .gitignore \
-    clean.do \
-    makedist.sh \
-    style.css \
-    TODO \
-    VERSION.do \
-    www.do
-
-perl -i -npe "s/build/build -mod=vendor/" default.do
-perl -i -npe "s/test/test -mod=vendor/" bench.do
+rm -f $texi *.texi makedist version www.do
+
+perl -i -npe "s/test/test -mod=vendor/" bench
 
 find . -type d -exec chmod 755 {} +
 find . -type f -exec chmod 644 {} +
-chmod +x contrib/do
+chmod +x bench
 
 cd ..
 tar cvf gogost-"$release".tar --uid=0 --gid=0 --numeric-owner gogost-"$release"
 zstd -19 -v gogost-"$release".tar
 tarball=gogost-"$release".tar.zst
+ssh-keygen -Y sign -f ~/.ssh/sign/gogost@cypherpunks.ru -n file $tarball
 gpg --armor --detach-sign --sign --local-user 82343436696FC85A $tarball
-meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+meta4-create -fn "$tarball" -mtime "$tarball" \
+    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     http://www.gogost.cypherpunks.ru/"$tarball" \
     http://y.www.gogost.cypherpunks.ru/"$tarball" < "$tarball" > "$tarball".meta4
 
@@ -90,7 +80,8 @@ An entry for documentation:
 @item @ref{Release $release, $release} @tab $release_date @tab $size KiB @tab
 @url{$tarball.meta4, meta4}
 @url{$tarball, tar}
-@url{$tarball.asc, sig}
+@url{$tarball.asc, pgp}
+@url{$tarball.sig, ssh}
 EOF
 
 cat <<EOF
@@ -115,8 +106,9 @@ Source code and its signature for that version can be found here:
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst ($size KiB)
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst.asc
 
-GPG key: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
-         GoGOST releases <gogost at cypherpunks dot ru>
+OpenPGP key: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
+             GoGOST releases <gogost@cypherpunks.ru>
+OpenSSH key: SHA256:u8X9rPDOhxpyzGs/IugbxXbDeOu/0AttKY+LGAvHBH0
 
 Please send questions regarding the use of GoGOST, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/gost.html
@@ -145,13 +137,14 @@ GoGOST это свободное программное обеспечение 
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst ($size KiB)
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst.asc
 
-GPG ключ: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
-          GoGOST releases <gogost at cypherpunks dot ru>
+OpenPGP ключ: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
+              GoGOST releases <gogost@cypherpunks.ru>
+OpenSSH ключ: SHA256:u8X9rPDOhxpyzGs/IugbxXbDeOu/0AttKY+LGAvHBH0
 
 Пожалуйста, все вопросы касающиеся использования GoGOST, отчёты об
 ошибках и патчи отправляйте в gost почтовую рассылку:
 http://lists.cypherpunks.ru/gost.html
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/gogost.html/
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/gogost.html/
 rm -fr $tmp