From d46cf8e38114e224e5b4cb9a23105dbf7d24a484 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 23 Jul 2020 18:01:27 +0300
Subject: [PATCH] Various URL fixes

---
 README                     |  6 +++---
 download.texi              |  4 ++--
 install.texi               |  4 ++--
 makedist.sh                | 16 ++++++++--------
 maketxts.sh                |  2 +-
 news.texi                  |  2 +-
 pygost/asn1schemas/x509.py |  2 +-
 setup.py                   |  2 +-
 www.texi                   |  4 ++--
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/README b/README
index 71ee5bb..5a5035b 100644
--- a/README
+++ b/README
@@ -55,12 +55,12 @@ pygost/asn1schemas/cert-selfsigned-example.py.
 
 PyGOST is free software: see the file COPYING for copying conditions.
 
-PyGOST'es home page is: http://pygost.cypherpunks.ru/
-You can read about GOST algorithms more: http://gost.cypherpunks.ru/
+PyGOST'es home page is: http://www.pygost.cypherpunks.ru/
+You can read about GOST algorithms more: http://www.gost.cypherpunks.ru/
 
 Please send questions, bug reports and patches to
 https://lists.cypherpunks.ru/mailman/listinfo/gost
 mailing list. Announcements also go to this mailing list.
 
 Development Git source code repository currently is located here:
-https://git.cypherpunks.ru/cgit.cgi/pygost.git/
+http://git.cypherpunks.ru/cgit.cgi/pygost.git/
diff --git a/download.texi b/download.texi
index 73b7d7c..125c022 100644
--- a/download.texi
+++ b/download.texi
@@ -107,6 +107,6 @@
 @end multitable
 
 Also there is example P2P F2F E2EE IM written on Python, that uses
-PyGOST with @url{http://pyderasn.cypherpunks.ru/, PyDERASN}:
+PyGOST with @url{http://www.pyderasn.cypherpunks.ru/, PyDERASN}:
 @url{gostim.txz, GOSTIM} (@url{gostim.txz.sig, sign}) (17 KiB). It is
-described on russian an @url{https://habr.com/ru/post/452200/, that article}.
+described on russian an @url{m.https://habr.com/ru/post/452200/, that article}.
diff --git a/install.texi b/install.texi
index ee9dac8..c7707c2 100644
--- a/install.texi
+++ b/install.texi
@@ -8,8 +8,8 @@ No additional dependencies except Python 2.7/3.x interpreter are required.
 Preferable way is to download tarball with the signature:
 
 @example
-$ [fetch|wget] http://pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz
-$ [fetch|wget] http://pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz.sig
+$ [fetch|wget] http://www.pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz
+$ [fetch|wget] http://www.pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.xz.sig
 $ gpg --verify pygost-@value{VERSION}.tar.xz.sig pygost-@value{VERSION}.tar.xz
 $ xz --decompress --stdout pygost-@value{VERSION}.tar.xz | tar xf -
 $ cd pygost-@value{VERSION}
diff --git a/makedist.sh b/makedist.sh
index 71df430..921c2b5 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -41,12 +41,12 @@ The main improvements for that release are:
 
 ------------------------ >8 ------------------------
 
-PyGOST'es home page is: http://pygost.cypherpunks.ru/
+PyGOST'es home page is: http://www.pygost.cypherpunks.ru/
 
 Source code and its signature for that version can be found here:
 
-    http://pygost.cypherpunks.ru/pygost-${release}.tar.xz ($size KiB)
-    http://pygost.cypherpunks.ru/pygost-${release}.tar.xz.sig
+    http://www.pygost.cypherpunks.ru/pygost-${release}.tar.xz ($size KiB)
+    http://www.pygost.cypherpunks.ru/pygost-${release}.tar.xz.sig
 
 Streebog-256 hash: $hashsb
 SHA256 hash: $hash
@@ -54,7 +54,7 @@ GPG key: F55A 7619 3A0C 323A A031  0E6B E6FD 1269 CD0C 009E
          PyGOST releases <pygost at cypherpunks dot ru>
 
 Please send questions regarding the use of PyGOST, bug reports and patches
-to mailing list: https://lists.cypherpunks.ru/mailman/listinfo/gost
+to mailing list: http://lists.cypherpunks.ru/mailman/listinfo/gost
 EOF
 
 cat <<EOF
@@ -73,12 +73,12 @@ PyGOST это свободное программное обеспечение 
 
 ------------------------ >8 ------------------------
 
-Домашняя страница PyGOST: http://pygost.cypherpunks.ru/
+Домашняя страница PyGOST: http://www.pygost.cypherpunks.ru/
 
 Исходный код и его подпись для этой версии могут быть найдены здесь:
 
-    http://pygost.cypherpunks.ru/pygost-${release}.tar.xz ($size KiB)
-    http://pygost.cypherpunks.ru/pygost-${release}.tar.xz.sig
+    http://www.pygost.cypherpunks.ru/pygost-${release}.tar.xz ($size KiB)
+    http://www.pygost.cypherpunks.ru/pygost-${release}.tar.xz.sig
 
 Streebog-256 хэш: $hashsb
 SHA256 хэш: $hash
@@ -87,7 +87,7 @@ GPG ключ: F55A 7619 3A0C 323A A031  0E6B E6FD 1269 CD0C 009E
 
 Пожалуйста, все вопросы касающиеся использования PyGOST, отчёты об
 ошибках и патчи отправляйте в gost почтовую рассылку:
-https://lists.cypherpunks.ru/mailman/listinfo/gost
+http://lists.cypherpunks.ru/mailman/listinfo/gost
 EOF
 
 mv $tmp/$tarball $tmp/"$tarball".sig $cur/pygost.html/
diff --git a/maketxts.sh b/maketxts.sh
index 4cc132d..1d53d8c 100755
--- a/maketxts.sh
+++ b/maketxts.sh
@@ -15,7 +15,7 @@ makeinfo --plaintext -o NEWS $texi
 
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
-@url{http://pygost.cypherpunks.ru/}.
+@url{http://www.pygost.cypherpunks.ru/}.
 EOF
 
 perl -i -p -e 's/hash=sha256:\w+/hash=sha256:TARBALL-HASH/' install.texi
diff --git a/news.texi b/news.texi
index 33bc71f..cc82a2b 100644
--- a/news.texi
+++ b/news.texi
@@ -104,7 +104,7 @@ GostR3410_2012_TC26_ParamSetC          -> id-tc26-gost-3410-2012-512-paramSetC
     @item Licence changed back to GNU GPLv3+. GNU LGPLv3+ licenced
         versions are not available anymore
     @item More ASN.1-based test vectors
-        (@url{http://pyderasn.cypherpunks.ru/, PyDERASN} dependency required)
+        (@url{http://www.pyderasn.cypherpunks.ru/, PyDERASN} dependency required)
     @end itemize
 
 @anchor{Release 3.14}
diff --git a/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py
index 831f9ab..ce30f62 100644
--- a/pygost/asn1schemas/x509.py
+++ b/pygost/asn1schemas/x509.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """:rfc:`5280` related structures (**NOT COMPLETE**)
 
-They are taken from `PyDERASN <http://pyderasn.cypherpunks.ru/`__ tests.
+They are taken from `PyDERASN <http://www.pyderasn.cypherpunks.ru/`__ tests.
 """
 
 from pyderasn import Any
diff --git a/setup.py b/setup.py
index 9d198fe..a49e097 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     long_description=open("README", "rb").read().decode("utf-8"),
     author="Sergey Matveev",
     author_email="stargrave@stargrave.org",
-    url="http://pygost.cypherpunks.ru/",
+    url="http://www.pygost.cypherpunks.ru/",
     license="GPLv3",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/www.texi b/www.texi
index dcf53dc..6840b0e 100644
--- a/www.texi
+++ b/www.texi
@@ -15,7 +15,7 @@ It is
 @url{https://www.gnu.org/philosophy/pragmatic.html, copylefted}
 @url{https://www.gnu.org/philosophy/free-sw.html, free software}:
 licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3}.
-You can read about GOST algorithms @url{http://gost.cypherpunks.ru/, more}.
+You can read about GOST algorithms @url{http://www.gost.cypherpunks.ru/, more}.
 
 Currently supported algorithms are:
 
@@ -83,7 +83,7 @@ True
 @end example
 
 Please send questions, bug reports and patches to
-@url{https://lists.cypherpunks.ru/mailman/listinfo/gost, gost}
+@url{http://lists.cypherpunks.ru/mailman/listinfo/gost, gost}
 mailing list. Announcements also go to this mailing list.
 
 @insertcopying
-- 
2.44.0