Move to stargrave.org

diff --git a/README b/README
index 3aeddd6d91156ed51f3a53c1fc075d2d0c0694e6..2a59b806e46b794e30a837ce32272f9d74568337 100644 (file)
--- a/README
+++ b/README
@@ -33,11 +33,11 @@ PyDERASN -- strict and fast ASN.1 DER/CER/BER library for Python
 
 pyderasn is free software: see the file COPYING.LESSER for copying conditions.
 
-PyDERASN home page is: http://www.pyderasn.cypherpunks.su/
+PyDERASN home page is: http://www.pyderasn.stargrave.org/
 
 Please send questions, bug reports and patches to
-http://lists.cypherpunks.su/pyderasn-devel.html
+http://lists.stargrave.org/pyderasn-devel.html
 mailing list. Announcements also go to this mailing list.
 
 Development Git source code repository currently is located here:
-http://www.git.cypherpunks.su/?p=pyderasn.git;a=summary
+http://www.git.stargrave.org/?p=pyderasn.git;a=summary

diff --git a/doc/download.rst b/doc/download.rst
index 5f9f37a0549e61890d3e5cad789ec2b1258d7ace..497635c8d6e95c136f5911cb8b3e45247a4f2750 100644 (file)
--- a/doc/download.rst
+++ b/doc/download.rst
@@ -4,4 +4,4 @@ Download
 ========
 
 You can obtain releases source code prepared tarballs on
-`official website <http://www.pyderasn.cypherpunks.su/>`__.
+`official website <http://www.pyderasn.stargrave.org/>`__.

diff --git a/doc/feedback.rst b/doc/feedback.rst
index bb833f0862222f1efd40ef2583c06aa538bee3f7..0bb6032009b2b102c5f4cd1064fcc41511ac2932 100644 (file)
--- a/doc/feedback.rst
+++ b/doc/feedback.rst
@@ -2,9 +2,9 @@ Feedback
 ========
 
 Please send questions regarding the use of PyDERASN, bug reports and
-patches to `pyderasn-devel <http://lists.cypherpunks.su/pyderasn-devel.html>`__
+patches to `pyderasn-devel <http://lists.stargrave.org/pyderasn-devel.html>`__
 mailing list. Announcements also go to this mailing list.
 
-Official website is http://www.pyderasn.cypherpunks.su/.
+Official website is http://www.pyderasn.stargrave.org/.
 Development Git source code repository is located
-`here <http://www.git.cypherpunks.su/?p=pyderasn.git;a=summary>`__.
+`here <http://www.git.stargrave.org/?p=pyderasn.git;a=summary>`__.

diff --git a/doc/install.rst b/doc/install.rst
index 47122fdab9f6c733452febec61bf54a9c1274424..7147826909254df11fff9b12f6f01a1ca51aa07e 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -2,10 +2,10 @@ Install
 =======
 
 Preferable way is to :ref:`download <download>` tarball with the
-signature from `official website <http://www.pyderasn.cypherpunks.su/>`__::
+signature from `official website <http://www.pyderasn.stargrave.org/>`__::
 
-    $ [fetch|wget] http://www.pyderasn.cypherpunks.su/download/pyderasn-9.3.tar.zst
-    $ [fetch|wget] http://www.pyderasn.cypherpunks.su/download/pyderasn-9.3.tar.zst.asc
+    $ fetch http://www.pyderasn.stargrave.org/download/pyderasn-9.3.tar.zst
+    $ fetch http://www.pyderasn.stargrave.org/download/pyderasn-9.3.tar.zst.asc
     $ gpg --verify pyderasn-9.3.tar.zst.asc pyderasn-9.3.tar.zst
     $ zstd -d < pyderasn-9.3.tar.zst | tar xf -
     $ cd pyderasn-9.3
@@ -30,7 +30,4 @@ resources.
           2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
     uid   PyDERASN releases <pyderasn@cypherpunks.ru>
 
-    $ gpg --auto-key-locate dane --locate-keys pyderasn@cypherpunks.ru
-    $ gpg --auto-key-locate  wkd --locate-keys pyderasn@cypherpunks.ru
-
 .. literalinclude:: ../PUBKEY.asc

diff --git a/makedist b/makedist
index 3bde8400c9ffee1935a6cdc0b8a5d659dd486553..2db4b9511fefe62aaa7fdac7db85efb23b630705 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -10,25 +10,34 @@ mkdir $tmp/pyderasn-"$release"
     echo pyderasn.py
     echo setup.py
     find $(perl -lane 'print $F[1]' MANIFEST.in)
-} | tar cfT - - | tar xfC - $tmp/pyderasn-"$release"
+} | tar cfT - - | 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
+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/termcolor-1.1.0.tar.gz $tmp --include "*/termcolor.py"
-mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
+mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-$release
 
 cd $tmp
 find . -type d -exec chmod 755 {} +
 find . -type f -exec chmod 644 {} +
-chmod 755 pyderasn-"$release"/pyderasn.py
-detpax pyderasn-"$release" >pyderasn-"$release".tar
-zstd -22 --ultra -v pyderasn-"$release".tar
-tarball=pyderasn-"$release".tar.zst
+chmod 755 pyderasn-$release/pyderasn.py
+detpax pyderasn-$release >pyderasn-$release.tar
+zstd -22 --ultra -v pyderasn-$release.tar
+tarball=pyderasn-$release.tar.zst
 gpg --armor --detach-sign --sign --local-user pyderasn@cypherpunks.ru $tarball
-meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
-    http://www.pyderasn.cypherpunks.su/download/"$tarball" \
-    http://y.www.pyderasn.cypherpunks.su/download/"$tarball" < "$tarball" > "$tarball".meta4
+meta4-create -fn $tarball -mtime $tarball -sig $tarball.asc \
+    "1|ru|http://www.pyderasn.stargrave.org/download/$tarball" \
+    "2|ru|http://msk.www.pyderasn.stargrave.org/download/$tarball" \
+    "2|ru|http://spb.www.pyderasn.stargrave.org/download/$tarball" \
+    "3|ru|https://www.pyderasn.stargrave.org/download/$tarball" \
+    "4|ru|https://msk.www.pyderasn.stargrave.org/download/$tarball" \
+    "4|ru|https://spb.www.pyderasn.stargrave.org/download/$tarball" \
+    "5|ru|http://y.www.pyderasn.stargrave.org/download/$tarball" \
+    "5|ru|http://[322:3bd:cc26:9545:b00b:8775:454a:c0dc]/download/$tarball" \
+    "6|ru|sftp://anonwww@msk.www.stargrave.org/pyderasn.stargrave.org/download/$tarball" \
+    "6|ru|sftp://anonwww@spb.www.stargrave.org/pyderasn.stargrave.org/download/$tarball" \
+    <$tarball >$tarball.meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
 release_date=$(date "+%Y-%m-%d")
@@ -43,7 +52,7 @@ An entry for documentation:
        \`sig <download/pyderasn-${release}.tar.zst.asc>\`__
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/doc/download
+mv $tmp/$tarball $tmp/$tarball.asc $tmp/$tarball.meta4 $cur/doc/download
 
 cat <<EOF
 Subject: PyDERASN $release release announcement
@@ -59,16 +68,16 @@ The main improvements for that release are:
 
 ------------------------ >8 ------------------------
 
-PyDERASN'es home page is: http://www.pyderasn.cypherpunks.su/
+PyDERASN'es home page is: http://www.pyderasn.stargrave.org/
 
 Source code and its signature for that version can be found here:
 
-    http://www.pyderasn.cypherpunks.su/download/pyderasn-${release}.tar.zst ($size KiB)
-    http://www.pyderasn.cypherpunks.su/download/pyderasn-${release}.tar.zst.asc
+    http://www.pyderasn.stargrave.org/download/pyderasn-${release}.tar.zst ($size KiB)
+    http://www.pyderasn.stargrave.org/download/pyderasn-${release}.tar.zst.asc
 
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
          PyDERASN releases <pyderasn@cypherpunks.ru>
 
 Please send questions regarding the use of PyDERASN, bug reports and patches
-to mailing list: http://lists.cypherpunks.su/pyderasn-devel.html
+to mailing list: http://lists.stargrave.org/pyderasn-devel.html
 EOF

diff --git a/setup.py b/setup.py
index 7ee2ff9bc8c2881ab8fbfd1e6bc06526f5a20e76..f74f872f318f865d27217ffaa81b5e62fc2356ab 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ setup(
     long_description=open("README", "rb").read().decode("utf-8"),
     author="Sergey Matveev",
     author_email="stargrave@stargrave.org",
-    url="http://www.pyderasn.cypherpunks.su/",
+    url="http://www.pyderasn.stargrave.org/",
     license="LGPLv3",
     classifiers=[
         "Development Status :: 5 - Production/Stable",