X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=blobdiff_plain;f=makedist.sh;h=413b15e5d3656b11b2fdabff3e5aaa6e845bfcd2;hp=5deb58aeeb67538e8d00f785deea0b3e11b82153;hb=282129d8ecb990e9d51372736d1973e9f4555d89;hpb=25d03772f0cf2bfae8da802fe39d08dcd775107e

diff --git a/makedist.sh b/makedist.sh
index 5deb58a..413b15e 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -6,35 +6,34 @@ release=$1
 [ -n "$release" ]
 
 mkdir $tmp/pyderasn-"$release"
-cut -d" " -f2 < MANIFEST.in | while read path; do
-    find $path >> $tmp/includes
-done
-echo pyderasn.py >> $tmp/includes
-echo setup.py >> $tmp/includes
-tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release"
+{
+    echo pyderasn.py
+    echo setup.py
+    find $(perl -lane 'print $F[1]' MANIFEST.in)
+} | tar cfI - - | tar xfC - $tmp/pyderasn-"$release"
 
 PYTHONPATH="$tmp/pyderasn-$release" redo $tmp/pyderasn-"$release"/doc/build.log
 rm -r $tmp/pyderasn-"$release"/doc/.redo $tmp/pyderasn-"$release"/doc/build.log
 
-tar xvfC doc/download/six-1.15.0.tar.gz $tmp --include "*/*six.py"
-mv -v $tmp/six-*/six.py $tmp/pyderasn-"$release"
-mv -v $tmp/six-*/test_six.py $tmp/pyderasn-"$release"/tests
-
 tar xvfC doc/download/termcolor-1.1.0.tar.gz $tmp --include "*/termcolor.py"
 mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
 
 pip_hash=$(pip hash dist/pyderasn-"$release".tar.gz | sed -n '$p')
-six_requirement="six==1.15.0 --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"
 
 cd $tmp
-find . -type d -exec chmod 755 {} \;
-find . -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} +
+find . -type f -exec chmod 644 {} +
 chmod 755 pyderasn-"$release"/pyderasn.py
 tar cvf pyderasn-"$release".tar --uid=0 --gid=0 --numeric-owner pyderasn-"$release"
-xz -9v pyderasn-"$release".tar
-gpg --detach-sign --sign --local-user 04A933D1BA20327A pyderasn-"$release".tar.xz
+zstd -19 -v pyderasn-"$release".tar
+tarball=pyderasn-"$release".tar.zst
+gpg --detach-sign --sign --local-user pyderasn@cypherpunks.ru $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.pyderasn.cypherpunks.ru/download/"$tarball" \
+    http://y.www.pyderasn.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
 
-tarball=pyderasn-"$release".tar.xz
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
@@ -44,15 +43,15 @@ An entry for documentation:
    * - \`\`pyderasn\`\` :ref:\`$release <release$release>\`
      - $release_date
      - $size KiB
-     - \`link <download/pyderasn-${release}.tar.xz>\`__
-       \`sign <download/pyderasn-${release}.tar.xz.sig>\`__
+     - \`meta4 <download/pyderasn-${release}.tar.zst.meta4>\`__
+       \`link <download/pyderasn-${release}.tar.zst>\`__
+       \`sig <download/pyderasn-${release}.tar.zst.sig>\`__
      - \`\`$hash\`\`
 
 pyderasn==$release $pip_hash
-$six_requirement
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $cur/doc/download
+mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/download
 
 cat <<EOF
 Subject: PyDERASN $release release announcement
@@ -72,8 +71,8 @@ PyDERASN'es home page is: http://www.pyderasn.cypherpunks.ru/
 
 Source code and its signature for that version can be found here:
 
-    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz ($size KiB)
-    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz.sig
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst ($size KiB)
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst.sig
 
 SHA256 hash: $hash
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
@@ -82,7 +81,6 @@ GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
 pip'es requirements file:
 
     pyderasn==$release $pip_hash
-    $six_requirement
 
 Please send questions regarding the use of PyDERASN, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/pyderasn_002ddevel.html