We are not dependant on the very latest six

[pyderasn.git] / makedist.sh

diff --git a/makedist.sh b/makedist.sh
index d947a1d8855e51be22a86a60dd070a5635e1363e..7852ef8917af03b9d58bf6f5e762b76215156515 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -13,18 +13,23 @@ echo pyderasn.py >> $tmp/includes
 echo setup.py >> $tmp/includes
 tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release"
 
-PYTHONPATH="$tmp/pyderasn-$release" make -C $tmp/pyderasn-"$release"/doc
+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.13.0.tar.xz $tmp --include "*/*six.py"
-mv -v $tmp/six-*/*six.py $tmp/pyderasn-"$release"
+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.xz $tmp --include "*/termcolor.py"
+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.13.0 --hash=sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"
+six_requirement="six==1.16.0 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"
 
 cd $tmp
+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
@@ -54,7 +59,7 @@ Subject: PyDERASN $release release announcement
 
 I am pleased to announce PyDERASN $release release availability!
 
-PyDERASN is free software pure Python ASN.1 DER/BER library.
+PyDERASN is free software pure Python ASN.1 DER/CER/BER library.
 
 ------------------------ >8 ------------------------
 
@@ -63,12 +68,12 @@ The main improvements for that release are:
 
 ------------------------ >8 ------------------------
 
-PyDERASN'es home page is: http://pyderasn.cypherpunks.ru/
+PyDERASN'es home page is: http://www.pyderasn.cypherpunks.ru/
 
 Source code and its signature for that version can be found here:
 
-    http://pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz ($size KiB)
-    http://pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz.sig
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz ($size KiB)
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.xz.sig
 
 SHA256 hash: $hash
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
@@ -80,5 +85,5 @@ pip'es requirements file:
     $six_requirement
 
 Please send questions regarding the use of PyDERASN, bug reports and patches
-to mailing list: https://lists.cypherpunks.ru/mailman/listinfo/pyderasn-devel
+to mailing list: http://lists.cypherpunks.ru/pyderasn_002ddevel.html
 EOF