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

diff --git a/makedist.sh b/makedist.sh
index 32d1875..413b15e 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -15,25 +15,25 @@ mkdir $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.16.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.16.0 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"
 
 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"
 zstd -19 -v pyderasn-"$release".tar
-gpg --detach-sign --sign --local-user 04A933D1BA20327A pyderasn-"$release".tar.zst
-
 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
+
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
@@ -43,15 +43,15 @@ An entry for documentation:
    * - \`\`pyderasn\`\` :ref:\`$release <release$release>\`
      - $release_date
      - $size KiB
-     - \`link <download/pyderasn-${release}.tar.zst>\`__
-       \`sign <download/pyderasn-${release}.tar.zst.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
@@ -81,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