Raise copyright years

diff --git a/doc/conf.py b/doc/conf.py
index b4225777cd7f5473581162b766cbba53a643fb06..a82a7b54f30b1ab657d87980970001d97bbeba60 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -5,11 +5,10 @@ templates_path = ["_templates"]
 source_suffix = ".rst"
 master_doc = "index"
 project = "pyderasn"
-copyright = "2017-2022, Sergey Matveev"
+copyright = "2017-2023, Sergey Matveev"
 author = "Sergey Matveev"
 version = version
 release = version
-language = None
 exclude_patterns = ["_build"]
 pygments_style = "sphinx"
 todo_include_todos = False

diff --git a/doc/install.rst b/doc/install.rst
index 64edda09034aad9f939728191adc932ed91e7ad4..057f47db616a2b1da39b69dc88edc0f9fa125cae 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -5,8 +5,8 @@ Preferable way is to :ref:`download <download>` tarball with the
 signature from `official website <http://www.pyderasn.cypherpunks.ru/>`__::
 
     $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-9.3.tar.zst
-    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-9.3.tar.zst.sig
-    $ gpg --verify pyderasn-9.3.tar.zst.sig pyderasn-9.3.tar.zst
+    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/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
     $ python setup.py install
@@ -16,11 +16,6 @@ signature from `official website <http://www.pyderasn.cypherpunks.ru/>`__::
 * ``urwid`` is an optional dependency used for :ref:`interactive browser <browser>`.
 * ``dateutil`` is an optional dependency used for ``.totzdatetime()`` method.
 
-You could use pip (**no** OpenPGP authentication is performed!) with PyPI::
-
-    $ echo pyderasn==9.3 --hash=sha256:TO-BE-FILLED > requirements.txt
-    $ pip install --requirement requirements.txt
-
 You have to verify downloaded tarballs integrity and authenticity to be
 sure that you retrieved trusted and untampered software. `GNU Privacy
 Guard <https://www.gnupg.org/>`__ is used for that purpose.
@@ -36,6 +31,6 @@ resources.
     uid   PyDERASN releases <pyderasn@cypherpunks.ru>
 
     $ gpg --auto-key-locate dane --locate-keys pyderasn at cypherpunks dot ru
-    $ gpg --auto-key-locate wkd --locate-keys pyderasn at cypherpunks dot ru
+    $ gpg --auto-key-locate  wkd --locate-keys pyderasn at cypherpunks dot ru
 
 .. literalinclude:: ../PUBKEY.asc

diff --git a/makedist.sh b/makedist
similarity index 71%
rename from makedist.sh
rename to makedist
index 413b15e5d3656b11b2fdabff3e5aaa6e845bfcd2..3aafd67106a83e0ec53986f3ba1477fb8b2b2ba6 100755 (executable)
--- a/makedist.sh
+++ b/makedist
@@ -10,7 +10,7 @@ mkdir $tmp/pyderasn-"$release"
     echo pyderasn.py
     echo setup.py
     find $(perl -lane 'print $F[1]' MANIFEST.in)
-} | tar cfI - - | 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
@@ -18,8 +18,6 @@ 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"
 
-pip_hash=$(pip hash dist/pyderasn-"$release".tar.gz | sed -n '$p')
-
 cd $tmp
 find . -type d -exec chmod 755 {} +
 find . -type f -exec chmod 644 {} +
@@ -27,15 +25,12 @@ 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
 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 \
+gpg --armor --detach-sign --sign --local-user pyderasn@cypherpunks.ru $tarball
+meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.pyderasn.cypherpunks.ru/download/"$tarball" \
-    http://y.www.pyderasn.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
+    http://y.www.pyderasn.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
-hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
 cat <<EOF
@@ -44,14 +39,11 @@ An entry for documentation:
      - $release_date
      - $size KiB
      - \`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
+       \`tar <download/pyderasn-${release}.tar.zst>\`__
+       \`sig <download/pyderasn-${release}.tar.zst.asc>\`__
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $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
@@ -72,16 +64,11 @@ 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.zst ($size KiB)
-    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst.sig
+    http://www.pyderasn.cypherpunks.ru/download/pyderasn-${release}.tar.zst.asc
 
-SHA256 hash: $hash
 GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
          PyDERASN releases <pyderasn at cypherpunks dot ru>
 
-pip'es requirements file:
-
-    pyderasn==$release $pip_hash
-
 Please send questions regarding the use of PyDERASN, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/pyderasn_002ddevel.html
 EOF

diff --git a/pyderasn.py b/pyderasn.py
index 99c771c41e5afbe0ab20c316f1527f4f1fbae42f..54242a3bd537fc9360217174cb79b9ccf832a73a 100755 (executable)
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -4,7 +4,7 @@
 # pylint: disable=line-too-long,superfluous-parens,protected-access,too-many-lines
 # pylint: disable=too-many-return-statements,too-many-branches,too-many-statements
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2024 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as

diff --git a/tests/test_cms.py b/tests/test_cms.py
index 9ebb19596d37f5a5a11eafd52d552fc94fca8488..fb455803925ec43e01e8674b2ecde49862e42bd4 100644 (file)
--- a/tests/test_cms.py
+++ b/tests/test_cms.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2024 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as

diff --git a/tests/test_crl.py b/tests/test_crl.py
index 2779fd87cee183b1d0140adc412ec908f7c64b7a..9174e2fb994965d2400162227e7d953c245403be 100644 (file)
--- a/tests/test_crl.py
+++ b/tests/test_crl.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2024 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as

diff --git a/tests/test_crts.py b/tests/test_crts.py
index 8ceeb086f9a1eca60710eb889618520185104753..e43b4c22fbd23390c83da7eaec791ea4fca461ff 100644 (file)
--- a/tests/test_crts.py
+++ b/tests/test_crts.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2024 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as

diff --git a/tests/test_pyderasn.py b/tests/test_pyderasn.py
index ae7b4ef675c751ec698390efcf837668dffeb252..e8f8bdf4570e1c52adbf2b7a7c5a827c47a2099c 100644 (file)
--- a/tests/test_pyderasn.py
+++ b/tests/test_pyderasn.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2024 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as