MANIFEST.in | 2 +- PUBKEY.asc | 34 ---------------------------------- VERSION | 2 +- doc/install.rst | 27 +++++++++------------------ doc/news.rst | 7 +++++++ makedist | 35 +++++++++++++++++++++++------------ pyderasn.py | 2 +- diff --git a/MANIFEST.in b/MANIFEST.in index ae16593792f582207bab25e7f1a5e4eb730ce2572051ddec9d89d6af5b0deba5..1ec32684d188b66add4044a09ea2d084aa8bd0ee6536873d7573a61777359cba 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -20,7 +20,7 @@ include INSTALL include NEWS include nose.cfg include pip-requirements-tests.txt -include PUBKEY.asc +include PUBKEY-SSH.pub include README include tests/__init__.py include tests/compli_test_suite/LICENSE diff --git a/PUBKEY.asc b/PUBKEY.asc deleted file mode 100644 index ee7086b90bce3d56e6eccaaec9b78a7e6659375ba2d3aa8bc72bc7199183d9c0..0000000000000000000000000000000000000000 --- a/PUBKEY.asc +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFnCv/YBCAC8TD+EhE5qDTwHj25OKer4baCpvIMgGYprAmwiUkVq0Wq38on/ -xszHcKcLShApVQXfx32bx+laXdokv1BAPJygrbAo3ocwuo/tBDNlqQ1Tm9vdAhz9 -8S6B7UTLsyO4WkhC9h6wHPMEG4VuSxyHwF+lg5wcbDIHZRn029UctYSjdBXYL/YL -kPfywzLW6sB7FdDWv2Eb7SosTGz9T4kgco3a8cqUbtroawRmXw+AdyPDsxKf2fMP -xpBHhPQvWCnd294keJJ7EiqM11u9f0yRfSotVJU6UHETTgtdPwtP19RLfEqFUWUc -ZYTq2da1cAzBuseczZXbLk01njg0io2YPB0BABEBAAG0K1B5REVSQVNOIHJlbGVh -c2VzIDxweWRlcmFzbkBjeXBoZXJwdW5rcy5ydT6JAVcEEwEIAEEWIQQu1shGMFEC -31tOA4MEqTPRuiAyegUCWcK/9gIbAwwLCgkNCAwHCwMEAQIHFQoJCAsDAgUWAgED -AAIeAQIXgAAKCRAEqTPRuiAyelKFCACAM/hmkkjGDcZn9zRma717CrRr84LrbdOF -EfS+cWwcLpqeI3YmGPBW6hP94MnZuVcUJIVIhZ1C1/DHP32u3xDW0uj2VXwBLCQt -k9regkGOYVMW0l+MKY4Z81KgJSfX+kOq8RfLW0sq1bf91a/id8u/IEsyPHN34XLI -kptAFf6b0Wl6VU7nJiie25XI8DaYX98q7tYoD5yOSxzcCJ4IRAbAKg1B5RNTTZuG -y8RmHsszF3sJ5wLuGk1vpSh1jgq61RUquQYJa1iE2B8fxpL6Qr+T8IR2Jan4TFIn -vzGeBXtCD2yUIeJgSeF/3VoEq8lxJ+rwHwcsIqHF7QdqJCc7S0wviHUEEBEIAB0W -IQTPYOiaWSMeduJjZCKuGoEJ5JhX7wUCWcLAIAAKCRCuGoEJ5JhX7+lbAP9+WNA4 -Uk0pNH5BAASabuT+zllnHZ5SqZoKWbs7bzWfogD+NWmjTfSJCr7GSZ4Suy3Vw4nn -hUu3L6dceWUU+hAEOByIdQQQFgoAHRYhBBKtMmicZg1CaWf9dcuCBWMhB62KBQJi -6jwUAAoJEMuCBWMhB62KYHMBAOQ6VHkVXpBrQAWCNYUEo9LZAvM2CokI6HVpJps1 -7mZNAP0RI3s/4v8N7a4b+ghbaEtxBIWWlXxqlBgDj/Rbnke0DrQrUHlERVJBU04g -cmVsZWFzZXMgPHB5ZGVyYXNuQGN5cGhlcnB1bmtzLnN1PokBTAQTAQoANhYhBC7W -yEYwUQLfW04DgwSpM9G6IDJ6BQJmn/xkAhsDBAsJCgcCIgICFQoEFgIBAAIeBwIX -gAAKCRAEqTPRuiAyeq6HB/9e/Bc01/cJi67t/v4JKl7D7kS8Bs5Ii6QrjyMInMhT -sh02ySjT4voKYqgEIIwbuCn+QMTk8b2u/dkNERESFCyOiXm01u5NHkt8AqMhkVgT -m/dbbIf8ReovVu9nX9nsy56MBrNt5eTyObRPqypPQov5d9fHLLUOzWhFkAaXmEVG -2gdeA9J7B1n1ybMBCSt9VderLkbmyDJMd0mWIV7VaBi7yzBNHt84z8YxWecNs5MH -fh3sCQcl01yj2WG7Hb+Qw68oxprUBA3TOT5o+gEtAoJeviS+We2PYGPB2R+LCD30 -uiv4glZ/F+4mLIWz9KtyDlZ3y5fx+jj5TzK82DcPI4THiHUEEBYKAB0WIQQSrTJo -nGYNQmln/XXLggVjIQetigUCZp/8mAAKCRDLggVjIQetitrMAQDipHlSiwtkuxc4 -+NFJvyiqQrlLr5JtScN0zofiXjGMdgEA5HQQBvpU2anUKYlv1/ldqQZyS6d0mxso -HIJ1GUCa2AY= -=X1kI ------END PGP PUBLIC KEY BLOCK----- diff --git a/VERSION b/VERSION index 36c5d4652e1a295b67fb1af16ccd4e5d56864e531ca14e2d565d63f7a10f201f..6af2d239696b1b2c68310b9529013b44c884aa1be938db522781db8fbdc3ee59 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.3 +9.4 diff --git a/doc/install.rst b/doc/install.rst index 67affd290a8648c01a4f142e918dde8eb14d78ffe769b4fec1ba5d3d09b94923..1d38c33ec3e5871a3dedbd2505b39e21f83f3691b0901d6b1c143ae8dfc5ae76 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -4,11 +4,12 @@ Preferable way is to :ref:`download ` tarball with the signature from `official website `__:: - $ 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 + $ fetch http://www.pyderasn.stargrave.org/download/pyderasn-9.4.tar.zst + $ fetch http://www.pyderasn.stargrave.org/download/pyderasn-9.4.tar.zst.sig + $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I stargrave@stargrave.org -n file \ + -s stargrave-9.4.tar.zst.sig `. * ``dateutil`` is an optional dependency used for ``.totzdatetime()`` method. You have to verify downloaded tarballs integrity and authenticity to be -sure that you retrieved trusted and untampered software. `GNU Privacy -Guard `__ is used for that purpose. +sure that you retrieved trusted and untampered software. +`OpenSSH `__ is used for that purpose. -For the very first time it is necessary to get signing public key and -import it. It is provided below, but you should check alternative -resources. - -:: - - pub rsa2048/0x04A933D1BA20327A 2017-09-20 - 2ED6 C846 3051 02DF 5B4E 0383 04A9 33D1 BA20 327A - uid PyDERASN releases - -.. literalinclude:: ../PUBKEY.asc +.. literalinclude:: ../PUBKEY-SSH.pub diff --git a/doc/news.rst b/doc/news.rst index 209b0ac5bd4153bc1d1febfd98105313d0d3eb91de5f64aad5dae19a0aad01e2..23867ff806215a5df5cdbdc8e8f76d98ebbaa048ab05c9ca629b67685b58566b 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -1,6 +1,13 @@ News ==== +.. _release9.4: + +9.4 +--- +* Just a checkpoint/snapshot release, aggregating multiple project's + domain name changes + .. _release9.3: 9.3 diff --git a/makedist b/makedist index 528ed2e7f0a240d4e16b92e7c2d831546fe0ad7df28c016195ce4e024e6a56bd..3b7e5c37dce797228bb10a6c445b44c12ae3444dbed894f9f627cbbcef47af04 100755 --- a/makedist +++ b/makedist @@ -25,8 +25,8 @@ 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 -meta4ra-create -fn $tarball -mtime $tarball -sig $tarball.asc \ +ssh-keygen -Y sign -f ~/.ssh/sign/pyderasn@stargrave.org -n file $tarball +meta4ra-create -fn $tarball -mtime $tarball -sig-ssh $tarball.sig \ "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" \ @@ -38,6 +38,20 @@ "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 +meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ + -id "OpenSSH signature" \ + "1|ru|http://www.pyderasn.stargrave.org/download/$tarball.sig" \ + "2|ru|http://msk.www.pyderasn.stargrave.org/download/$tarball.sig" \ + "2|ru|http://spb.www.pyderasn.stargrave.org/download/$tarball.sig" \ + "3|ru|https://www.pyderasn.stargrave.org/download/$tarball.sig" \ + "4|ru|https://msk.www.pyderasn.stargrave.org/download/$tarball.sig" \ + "4|ru|https://spb.www.pyderasn.stargrave.org/download/$tarball.sig" \ + "5|ru|http://y.www.pyderasn.stargrave.org/download/$tarball.sig" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:8775:454a:c0dc]/download/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/pyderasn.stargrave.org/download/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/pyderasn.stargrave.org/download/$tarball.sig" \ + <$tarball.sig >$tarball.meta4_ +mv $tarball.meta4_ $tarball.meta4 size=$(( $(stat -f %z $tarball) / 1024 )) release_date=$(date "+%Y-%m-%d") @@ -47,12 +61,11 @@ An entry for documentation: * - \`\`pyderasn\`\` :ref:\`$release \` - $release_date - $size KiB - - \`meta4 \`__ - \`tar \`__ - \`sig \`__ + - \`tar \`__ + \`meta4 \`__ EOF -mv $tmp/$tarball $tmp/$tarball.asc $tmp/$tarball.meta4 $cur/doc/download +mv $tmp/$tarball $tmp/$tarball.sig $tmp/$tarball.meta4 $cur/doc/download cat <8 ------------------------ 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.stargrave.org/download/pyderasn-${release}.tar.zst ($size KiB) - http://www.pyderasn.stargrave.org/download/pyderasn-${release}.tar.zst.asc +URLs to source code, its checksums and signatures can be found in an +attached Metalink4 file. -GPG key: 2ED6 C846 3051 02DF 5B4E 0383 04A9 33D1 BA20 327A - PyDERASN releases +OpenSSH key: +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSTN8hS18d8TuZj4cz2G9h6To7pYLZjUVb7M3w26EJG Please send questions regarding the use of PyDERASN, bug reports and patches to mailing list: http://lists.stargrave.org/pyderasn-devel.html diff --git a/pyderasn.py b/pyderasn.py index 387bc509a471b7fb7a006a7f04756b68f413f8aa5dd4400719d201e86005891a..9dd3396955f4e450571a975ec7e7165a7b968e88ef80fb9e5574fa3ada43332d 100755 --- a/pyderasn.py +++ b/pyderasn.py @@ -1196,7 +1196,7 @@ except ImportError: # pragma: no cover tzUTC = "missing" -__version__ = "9.3" +__version__ = "9.4" __all__ = ( "agg_octet_string",