X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist;h=1cf553ea5704a00d9f8309e13e85ff55baa2d286;hb=eb3c28c5170bd08b047cba754ae18eb268c227b6;hp=18860551a6ff74a0b9a8a985e04a1552d60bf343;hpb=36499b404629e5bbc4969b2ccdb71eed8bbc64d8;p=gogost.git

diff --git a/makedist b/makedist
index 1886055..1cf553e 100755
--- a/makedist
+++ b/makedist
@@ -9,10 +9,8 @@ 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,31 +53,19 @@ 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
-gpg --detach-sign --sign --local-user 82343436696FC85A $tarball
-gpg --enarmor < "$tarball".sig |
-    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+gpg --armor --detach-sign --sign --local-user 82343436696FC85A $tarball
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.gogost.cypherpunks.ru/"$tarball" \
     http://y.www.gogost.cypherpunks.ru/"$tarball" < "$tarball" > "$tarball".meta4
@@ -92,7 +78,7 @@ 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.sig, sig}
+@url{$tarball.asc, sig}
 EOF
 
 cat <<EOF
@@ -115,7 +101,7 @@ GoGOST'es home page is: http://www.gogost.cypherpunks.ru/
 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.sig
+    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>
@@ -145,7 +131,7 @@ GoGOST это свободное программное обеспечение 
 Исходный код и его подпись для этой версии могут быть найдены здесь:
 
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst ($size KiB)
-    http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst.sig
+    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>
@@ -155,5 +141,5 @@ GPG ключ: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
 http://lists.cypherpunks.ru/gost.html
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/gogost.html/
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/gogost.html/
 rm -fr $tmp