X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=245ae6c547a0d2896b88db7609dd792b4b94644a;hb=6a7abf90c3ac2ccf5b9e29818d8507bad4326b33;hp=f934a166886f131a467e255b8101b46928c4132c;hpb=9136be1f8cfcd1ab65eef07d7f4867eef85cb1c5;p=nncp.git

diff --git a/makedist.sh b/makedist.sh
index f934a16..245ae6c 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -17,17 +17,26 @@ rm -r \
     github.com/flynn/noise/vector* \
     github.com/gorhill/cronexpr/APLv2 \
     github.com/hjson/hjson-go/build_release.sh \
-    github.com/golang/snappy \
+    github.com/klauspost/compress/gen.sh \
+    github.com/klauspost/compress/gzhttp \
+    github.com/klauspost/compress/internal/snapref \
+    github.com/klauspost/compress/s2* \
+    github.com/klauspost/compress/snappy \
     github.com/klauspost/compress/zstd/snappy.go \
     golang.org/x/sys/plan9 \
     golang.org/x/sys/windows
 find github.com/klauspost/compress golang.org/x/sys -name "*_test.go" -delete
+find . -type d -exec rmdir {} + 2>/dev/null || :
 cd ../..
 rm -r ports
-find . \( -name .gitignore -o -name .travis.yml \) -delete
+find . \( \
+    -name .gitignore -o \
+    -name .travis.yml -o \
+    -name .goreleaser.yml -o \
+    -name .gitattributes \) -delete
 
 mkdir contrib
-cp ~/work/redo/minimal/do contrib/do
+cp ~/work/redo/apenwarr/minimal/do contrib/do
 
 cat > doc/download.texi <<EOF
 @node Tarballs
@@ -40,7 +49,7 @@ perl -i -ne 'print unless /include pedro/' doc/index.texi doc/about.ru.texi
 perl -p -i -e 's/^(.verbatiminclude) .*$/$1 PUBKEY.asc/g' doc/integrity.texi
 mv doc/.well-known/openpgpkey/nncpgo.org/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p.asc PUBKEY.asc
 ln -s ../PUBKEY.asc doc
-redo doc
+redo doc/all
 
 ########################################################################
 # Supplementary files autogeneration
@@ -60,7 +69,7 @@ cat > $texi <<EOF
 @settitle NEWS
 @node News
 @unnumbered News
-`sed -n '5,$p' < doc/news.texi`
+`sed -n '6,$p' < doc/news.texi`
 @bye
 EOF
 mkinfo --output NEWS $texi
@@ -113,19 +122,29 @@ chmod +x contrib/do
 cd ..
 tar cvf nncp-"$release".tar --uid=0 --gid=0 --numeric-owner nncp-"$release"
 xz -9v nncp-"$release".tar
-gpg --detach-sign --sign --local-user releases@nncpgo.org nncp-"$release".tar.xz
-mv -v $tmp/nncp-"$release".tar.xz $tmp/nncp-"$release".tar.xz.sig $cur/doc/download
+tarball=nncp-"$release".tar.xz
+gpg --detach-sign --sign --local-user releases@nncpgo.org "$tarball"
+gpg --enarmor < "$tarball".sig |
+    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+meta4-create -file "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+    http://www.nncpgo.org/download/"$tarball" \
+    http://y.www.nncpgo.org/download/"$tarball" \
+    https://nncp.mirrors.quux.org/download/"$tarball" > "$tarball".meta4
 
-tarball=$cur/doc/download/nncp-"$release".tar.xz
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
+mv -v $tmp/"$tarball" $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/download
+
 release_underscored=`echo $release | tr . _`
 cat <<EOF
 An entry for documentation:
 @item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB
-@tab @url{download/nncp-${release}.tar.xz, link} @url{download/nncp-${release}.tar.xz.sig, sign}
+@tab
+    @url{download/nncp-${release}.tar.xz.meta4, meta4}
+    @url{download/nncp-${release}.tar.xz, link}
+    @url{download/nncp-${release}.tar.xz.sig, sig}
 @tab @code{$hash}
 EOF
 
@@ -177,6 +196,9 @@ http://www.nncpgo.org/Mirrors.html
 Please send questions regarding the use of NNCP, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
+echo mutt -s \"[EN] NNCP $release release announcement\" \
+    nncp-devel@lists.cypherpunks.ru \
+    -a $cur/doc/download/"$tarball".meta4
 
 cat <<EOF
 Subject: [RU] Состоялся релиз NNCP $release
@@ -230,3 +252,6 @@ http://www.nncpgo.org/Mirrors.html
 и патчи отправляйте в nncp-devel почтовую рассылку:
 http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
+echo mutt -s \"[RU] Состоялся релиз NNCP $release\" \
+    nncp-devel@lists.cypherpunks.ru \
+    -a $cur/doc/download/"$tarball".meta4