From eabe03758cdfa91d6bb637e8d71eaa35a20111ea Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 3 Aug 2023 17:08:30 +0300 Subject: [PATCH] Armored signature --- download.texi | 60 +++++++++++++++++++++++++-------------------------- install.texi | 4 ++-- makedist | 12 +++++------ 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/download.texi b/download.texi index 086fd5d..eff69a4 100644 --- a/download.texi +++ b/download.texi @@ -4,151 +4,151 @@ @item @ref{Release 5.11.0, 5.11.0} @tab 2023-06-14 @tab 70 KiB @tab @url{gogost-5.11.0.tar.zst.meta4, meta4} @url{gogost-5.11.0.tar.zst, tar} -@url{gogost-5.11.0.tar.zst.sig, sig} +@url{gogost-5.11.0.tar.zst.asc, sig} @item @ref{Release 5.10.0, 5.10.0} @tab 2023-04-05 @tab 70 KiB @tab @url{gogost-5.10.0.tar.zst.meta4, meta4} @url{gogost-5.10.0.tar.zst, tar} -@url{gogost-5.10.0.tar.zst.sig, sig} +@url{gogost-5.10.0.tar.zst.asc, sig} @item @ref{Release 5.9.1, 5.9.1} @tab 2022-11-02 @tab 67 KiB @tab @url{gogost-5.9.1.tar.zst.meta4, meta4} @url{gogost-5.9.1.tar.zst, tar} -@url{gogost-5.9.1.tar.zst.sig, sig} +@url{gogost-5.9.1.tar.zst.asc, sig} @item @ref{Release 5.9.0, 5.9.0} @tab 2021-11-16 @tab 67 KiB @tab @url{gogost-5.9.0.tar.zst.meta4, meta4} @url{gogost-5.9.0.tar.zst, tar} -@url{gogost-5.9.0.tar.zst.sig, sig} +@url{gogost-5.9.0.tar.zst.asc, sig} @item @ref{Release 5.8.0, 5.8.0} @tab 2021-10-08 @tab 67 KiB @tab @url{gogost-5.8.0.tar.zst.meta4, meta4} @url{gogost-5.8.0.tar.zst, tar} -@url{gogost-5.8.0.tar.zst.sig, sig} +@url{gogost-5.8.0.tar.zst.asc, sig} @item 5.7.1 @tab 2021-10-04 @tab 66 KiB @tab @url{gogost-5.7.1.tar.zst.meta4, meta4} @url{gogost-5.7.1.tar.zst, tar} -@url{gogost-5.7.1.tar.zst.sig, sig} +@url{gogost-5.7.1.tar.zst.asc, sig} @item @ref{Release 5.7.0, 5.7.0} @tab 2021-08-17 @tab 61 KiB @tab @url{gogost-5.7.0.tar.xz.meta4, meta4} @url{gogost-5.7.0.tar.xz, tar} -@url{gogost-5.7.0.tar.xz.sig, sig} +@url{gogost-5.7.0.tar.xz.asc, sig} @item @ref{Release 5.6.0, 5.6.0} @tab 2021-04-02 @tab 61 KiB @tab @url{gogost-5.6.0.tar.xz.meta4, meta4} @url{gogost-5.6.0.tar.xz, tar} -@url{gogost-5.6.0.tar.xz.sig, sig} +@url{gogost-5.6.0.tar.xz.asc, sig} @item @ref{Release 5.5.0, 5.5.0} @tab 2021-01-25 @tab 61 KiB @tab @url{gogost-5.5.0.tar.xz.meta4, meta4} @url{gogost-5.5.0.tar.xz, tar} -@url{gogost-5.5.0.tar.xz.sig, sig} +@url{gogost-5.5.0.tar.xz.asc, sig} @item @ref{Release 5.4.0, 5.4.0} @tab 2021-01-24 @tab 60 KiB @tab @url{gogost-5.4.0.tar.xz.meta4, meta4} @url{gogost-5.4.0.tar.xz, tar} -@url{gogost-5.4.0.tar.xz.sig, sig} +@url{gogost-5.4.0.tar.xz.asc, sig} @item @ref{Release 5.3.0, 5.3.0} @tab 2021-01-21 @tab 61 KiB @tab @url{gogost-5.3.0.tar.xz.meta4, meta4} @url{gogost-5.3.0.tar.xz, tar} -@url{gogost-5.3.0.tar.xz.sig, sig} +@url{gogost-5.3.0.tar.xz.asc, sig} @item @ref{Release 5.2.0, 5.2.0} @tab 2021-01-21 @tab 60 KiB @tab @url{gogost-5.2.0.tar.xz.meta4, meta4} @url{gogost-5.2.0.tar.xz, tar} -@url{gogost-5.2.0.tar.xz.sig, sig} +@url{gogost-5.2.0.tar.xz.asc, sig} @item @ref{Release 5.1.1, 5.1.1} @tab 2021-01-16 @tab 60 KiB @tab @url{gogost-5.1.1.tar.xz.meta4, meta4} @url{gogost-5.1.1.tar.xz, tar} -@url{gogost-5.1.1.tar.xz.sig, sig} +@url{gogost-5.1.1.tar.xz.asc, sig} @item @ref{Release 5.1.0, 5.1.0} @tab 2020-10-07 @tab 63 KiB @tab @url{gogost-5.1.0.tar.xz.meta4, meta4} @url{gogost-5.1.0.tar.xz, tar} -@url{gogost-5.1.0.tar.xz.sig, sig} +@url{gogost-5.1.0.tar.xz.asc, sig} @item 5.0.2 @tab 2020-09-05 @tab 62 KiB @tab @url{gogost-5.0.2.tar.xz.meta4, meta4} @url{gogost-5.0.2.tar.xz, tar} -@url{gogost-5.0.2.tar.xz.sig, sig} +@url{gogost-5.0.2.tar.xz.asc, sig} @item 5.0.1 @tab 2020-09-05 @tab 62 KiB @tab @url{gogost-5.0.1.tar.xz.meta4, meta4} @url{gogost-5.0.1.tar.xz, tar} -@url{gogost-5.0.1.tar.xz.sig, sig} +@url{gogost-5.0.1.tar.xz.asc, sig} @item @ref{Release 5.0.0, 5.0.0} @tab 2020-09-04 @tab 62 KiB @tab @url{gogost-5.0.0.tar.xz.meta4, meta4} @url{gogost-5.0.0.tar.xz, tar} -@url{gogost-5.0.0.tar.xz.sig, sig} +@url{gogost-5.0.0.tar.xz.asc, sig} @item 4.3.1 @tab 2020-09-01 @tab 63 KiB @tab @url{gogost-4.3.1.tar.xz.meta4, meta4} @url{gogost-4.3.1.tar.xz, tar} -@url{gogost-4.3.1.tar.xz.sig, sig} +@url{gogost-4.3.1.tar.xz.asc, sig} @item @ref{Release 4.3.0, 4.3.0} @tab 2020-08-02 @tab 58 KiB @tab @url{gogost-4.3.0.tar.xz.meta4, meta4} @url{gogost-4.3.0.tar.xz, tar} -@url{gogost-4.3.0.tar.xz.sig, sig} +@url{gogost-4.3.0.tar.xz.asc, sig} @item @ref{Release 4.2.4, 4.2.4} @tab 2020-06-24 @tab 58 KiB @tab @url{gogost-4.2.4.tar.xz.meta4, meta4} @url{gogost-4.2.4.tar.xz, tar} -@url{gogost-4.2.4.tar.xz.sig, sig} +@url{gogost-4.2.4.tar.xz.asc, sig} @item @ref{Release 4.2.3, 4.2.3} @tab 2020-01-22 @tab 58 KiB @tab @url{gogost-4.2.3.tar.xz.meta4, meta4} @url{gogost-4.2.3.tar.xz, tar} -@url{gogost-4.2.3.tar.xz.sig, sig} +@url{gogost-4.2.3.tar.xz.asc, sig} @item @ref{Release 4.2.2, 4.2.2} @tab 2020-01-07 @tab 58 KiB @tab @url{gogost-4.2.2.tar.xz.meta4, meta4} @url{gogost-4.2.2.tar.xz, tar} -@url{gogost-4.2.2.tar.xz.sig, sig} +@url{gogost-4.2.2.tar.xz.asc, sig} @item @ref{Release 4.2.1, 4.2.1} @tab 2019-12-18 @tab 57 KiB @tab @url{gogost-4.2.1.tar.xz.meta4, meta4} @url{gogost-4.2.1.tar.xz, tar} -@url{gogost-4.2.1.tar.xz.sig, sig} +@url{gogost-4.2.1.tar.xz.asc, sig} @item @ref{Release 4.2.0, 4.2.0} @tab 2019-10-18 @tab 57 KiB @tab @url{gogost-4.2.0.tar.xz.meta4, meta4} @url{gogost-4.2.0.tar.xz, tar} -@url{gogost-4.2.0.tar.xz.sig, sig} +@url{gogost-4.2.0.tar.xz.asc, sig} @item @ref{Release 4.1.0, 4.1.0} @tab 2019-10-03 @tab 55 KiB @tab @url{gogost-4.1.0.tar.xz.meta4, meta4} @url{gogost-4.1.0.tar.xz, tar} -@url{gogost-4.1.0.tar.xz.sig, sig} +@url{gogost-4.1.0.tar.xz.asc, sig} @item @ref{Release 4.0, 4.0} @tab 2019-08-12 @tab 56 KiB @tab @url{gogost-4.0.tar.xz.meta4, meta4} @url{gogost-4.0.tar.xz, tar} -@url{gogost-4.0.tar.xz.sig, sig} +@url{gogost-4.0.tar.xz.asc, sig} @item @ref{Release 3.0, 3.0} @tab 2019-07-19 @tab 47 KiB @tab @url{gogost-3.0.tar.xz.meta4, meta4} @url{gogost-3.0.tar.xz, tar} -@url{gogost-3.0.tar.xz.sig, sig} +@url{gogost-3.0.tar.xz.asc, sig} @item @ref{Release 2.0, 2.0} @tab 2016-11-26 @tab 39 KiB @tab @url{gogost-2.0.tar.xz.meta4, meta4} @url{gogost-2.0.tar.xz, tar} -@url{gogost-2.0.tar.xz.sig, sig} +@url{gogost-2.0.tar.xz.asc, sig} @item 1.2 @tab 2016-11-13 @tab 34 KiB @tab @url{gogost-1.2.tar.xz.meta4, meta4} @url{gogost-1.2.tar.xz, tar} -@url{gogost-1.2.tar.xz.sig, sig} +@url{gogost-1.2.tar.xz.asc, sig} @item @ref{Release 1.1, 1.1} @tab 2016-10-04 @tab 33 KiB @tab @url{gogost-1.1.tar.xz.meta4, meta4} @url{gogost-1.1.tar.xz, tar} -@url{gogost-1.1.tar.xz.sig, sig} +@url{gogost-1.1.tar.xz.asc, sig} @end multitable diff --git a/install.texi b/install.texi index b8b6016..210b073 100644 --- a/install.texi +++ b/install.texi @@ -6,8 +6,8 @@ website and, for example, run tests with benchmarks: @example $ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.zst -$ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.zst.sig -$ gpg --verify gogost-@value{VERSION}.tar.zst.sig gogost-@value{VERSION}.tar.zst +$ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.zst.asc +$ gpg --verify gogost-@value{VERSION}.tar.zst.asc gogost-@value{VERSION}.tar.zst $ zstd --decompress --stdout gogost-@value{VERSION}.tar.zst | tar xf - $ cd gogost-@value{VERSION} $ redo all diff --git a/makedist b/makedist index 1886055..2db3575 100755 --- a/makedist +++ b/makedist @@ -77,9 +77,7 @@ 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 +90,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 < @@ -145,7 +143,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 @@ -155,5 +153,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 -- 2.44.0