py-nacl: updated to 1.4.0

1.4.0:
* Update ``libsodium`` to 1.0.18.
* **BACKWARDS INCOMPATIBLE:** We no longer distribute 32-bit ``manylinux1``
  wheels. Continuing to produce them was a maintenance burden.
* Added support for Python 3.8, and removed support for Python 3.4.
* Add low level bindings for extracting the seed and the public key
  from crypto_sign_ed25519 secret key
* Add low level bindings for deterministic random generation.
* Add ``wheel`` and ``setuptools`` setup_requirements in ``setup.py``
* Fix checks on very slow builders
* Add low-level bindings to ed25519 arithmetic functions
* Update low-level blake2b state implementation
* Fix wrong short-input behavior of SealedBox.decrypt()
* Raise CryptPrefixError exception instead of InvalidkeyError when trying
  to check a password against a verifier stored in a unknown format
* Add support for minimal builds of libsodium. Trying to call functions
  not available in a minimal build will raise an UnavailableError
  exception. To compile a minimal build of the bundled libsodium, set
  the SODIUM_INSTALL_MINIMAL environment variable to any non-empty
  string (e.g. ``SODIUM_INSTALL_MINIMAL=1``) for setup.

3 files changed, 67 insertions, 64 deletions

diff --git a/security/py-nacl/Makefile b/security/py-nacl/Makefile
index 9897d7c6bcd..d40bf5c994a 100644
--- a/security/py-nacl/Makefile
+++ b/security/py-nacl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/05/17 19:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/27 15:01:08 adam Exp $
 
-DISTNAME=	PyNaCl-1.3.0
+DISTNAME=	PyNaCl-1.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl:S/^py//}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyNaCl/}
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis>=3.27.0:../../devel/py-hypothesis
 
 PYTHON_VERSIONED_DEPENDENCIES=	test:test
-.include "../../lang/python/versioned_dependencies.mk"
 
 MAKE_ENV+=	SODIUM_INSTALL=system
 
@@ -24,4 +23,5 @@ do-test:
 
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-nacl/PLIST b/security/py-nacl/PLIST
index 12e56051ba1..77ab3365209 100644
--- a/security/py-nacl/PLIST
+++ b/security/py-nacl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/02/19 12:14:22 tm Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/05/27 15:01:08 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -6,91 +6,94 @@ ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/nacl/__init__.py
-${PYSITELIB}/nacl/__init__.pyo
 ${PYSITELIB}/nacl/__init__.pyc
-${PYSITELIB}/nacl/encoding.pyo
-${PYSITELIB}/nacl/encoding.pyc
-${PYSITELIB}/nacl/exceptions.pyo
-${PYSITELIB}/nacl/exceptions.pyc
-${PYSITELIB}/nacl/hash.pyo
-${PYSITELIB}/nacl/hash.pyc
-${PYSITELIB}/nacl/hashlib.pyo
-${PYSITELIB}/nacl/hashlib.pyc
-${PYSITELIB}/nacl/public.pyo
-${PYSITELIB}/nacl/public.pyc
-${PYSITELIB}/nacl/secret.pyo
-${PYSITELIB}/nacl/secret.pyc
-${PYSITELIB}/nacl/signing.pyo
-${PYSITELIB}/nacl/signing.pyc
-${PYSITELIB}/nacl/utils.pyo
-${PYSITELIB}/nacl/utils.pyc
+${PYSITELIB}/nacl/__init__.pyo
 ${PLIST.py3x}${PYSITELIB}/nacl/_sodium.abi3.so
 ${PLIST.py2x}${PYSITELIB}/nacl/_sodium.so
 ${PYSITELIB}/nacl/bindings/__init__.py
-${PYSITELIB}/nacl/bindings/__init__.pyo
 ${PYSITELIB}/nacl/bindings/__init__.pyc
-${PYSITELIB}/nacl/bindings/crypto_aead.pyo
-${PYSITELIB}/nacl/bindings/crypto_aead.pyc
-${PYSITELIB}/nacl/bindings/crypto_box.pyo
-${PYSITELIB}/nacl/bindings/crypto_box.pyc
-${PYSITELIB}/nacl/bindings/crypto_generichash.pyo
-${PYSITELIB}/nacl/bindings/crypto_generichash.pyc
-${PYSITELIB}/nacl/bindings/crypto_hash.pyo
-${PYSITELIB}/nacl/bindings/crypto_hash.pyc
-${PYSITELIB}/nacl/bindings/crypto_kx.pyo
-${PYSITELIB}/nacl/bindings/crypto_kx.pyc
-${PYSITELIB}/nacl/bindings/crypto_pwhash.pyo
-${PYSITELIB}/nacl/bindings/crypto_pwhash.pyc
-${PYSITELIB}/nacl/bindings/crypto_scalarmult.pyo
-${PYSITELIB}/nacl/bindings/crypto_scalarmult.pyc
-${PYSITELIB}/nacl/bindings/crypto_secretbox.pyo
-${PYSITELIB}/nacl/bindings/crypto_secretbox.pyc
-${PYSITELIB}/nacl/bindings/crypto_secretstream.pyo
-${PYSITELIB}/nacl/bindings/crypto_secretstream.pyc
-${PYSITELIB}/nacl/bindings/crypto_shorthash.pyo
-${PYSITELIB}/nacl/bindings/crypto_shorthash.pyc
-${PYSITELIB}/nacl/bindings/crypto_sign.pyo
-${PYSITELIB}/nacl/bindings/crypto_sign.pyc
-${PYSITELIB}/nacl/bindings/randombytes.pyo
-${PYSITELIB}/nacl/bindings/randombytes.pyc
-${PYSITELIB}/nacl/bindings/sodium_core.pyo
-${PYSITELIB}/nacl/bindings/sodium_core.pyc
-${PYSITELIB}/nacl/bindings/utils.pyo
-${PYSITELIB}/nacl/bindings/utils.pyc
+${PYSITELIB}/nacl/bindings/__init__.pyo
 ${PYSITELIB}/nacl/bindings/crypto_aead.py
+${PYSITELIB}/nacl/bindings/crypto_aead.pyc
+${PYSITELIB}/nacl/bindings/crypto_aead.pyo
 ${PYSITELIB}/nacl/bindings/crypto_box.py
+${PYSITELIB}/nacl/bindings/crypto_box.pyc
+${PYSITELIB}/nacl/bindings/crypto_box.pyo
+${PYSITELIB}/nacl/bindings/crypto_core.py
+${PYSITELIB}/nacl/bindings/crypto_core.pyc
+${PYSITELIB}/nacl/bindings/crypto_core.pyo
 ${PYSITELIB}/nacl/bindings/crypto_generichash.py
+${PYSITELIB}/nacl/bindings/crypto_generichash.pyc
+${PYSITELIB}/nacl/bindings/crypto_generichash.pyo
 ${PYSITELIB}/nacl/bindings/crypto_hash.py
+${PYSITELIB}/nacl/bindings/crypto_hash.pyc
+${PYSITELIB}/nacl/bindings/crypto_hash.pyo
 ${PYSITELIB}/nacl/bindings/crypto_kx.py
+${PYSITELIB}/nacl/bindings/crypto_kx.pyc
+${PYSITELIB}/nacl/bindings/crypto_kx.pyo
 ${PYSITELIB}/nacl/bindings/crypto_pwhash.py
+${PYSITELIB}/nacl/bindings/crypto_pwhash.pyc
+${PYSITELIB}/nacl/bindings/crypto_pwhash.pyo
 ${PYSITELIB}/nacl/bindings/crypto_scalarmult.py
+${PYSITELIB}/nacl/bindings/crypto_scalarmult.pyc
+${PYSITELIB}/nacl/bindings/crypto_scalarmult.pyo
 ${PYSITELIB}/nacl/bindings/crypto_secretbox.py
+${PYSITELIB}/nacl/bindings/crypto_secretbox.pyc
+${PYSITELIB}/nacl/bindings/crypto_secretbox.pyo
 ${PYSITELIB}/nacl/bindings/crypto_secretstream.py
+${PYSITELIB}/nacl/bindings/crypto_secretstream.pyc
+${PYSITELIB}/nacl/bindings/crypto_secretstream.pyo
 ${PYSITELIB}/nacl/bindings/crypto_shorthash.py
+${PYSITELIB}/nacl/bindings/crypto_shorthash.pyc
+${PYSITELIB}/nacl/bindings/crypto_shorthash.pyo
 ${PYSITELIB}/nacl/bindings/crypto_sign.py
+${PYSITELIB}/nacl/bindings/crypto_sign.pyc
+${PYSITELIB}/nacl/bindings/crypto_sign.pyo
 ${PYSITELIB}/nacl/bindings/randombytes.py
+${PYSITELIB}/nacl/bindings/randombytes.pyc
+${PYSITELIB}/nacl/bindings/randombytes.pyo
 ${PYSITELIB}/nacl/bindings/sodium_core.py
+${PYSITELIB}/nacl/bindings/sodium_core.pyc
+${PYSITELIB}/nacl/bindings/sodium_core.pyo
 ${PYSITELIB}/nacl/bindings/utils.py
+${PYSITELIB}/nacl/bindings/utils.pyc
+${PYSITELIB}/nacl/bindings/utils.pyo
 ${PYSITELIB}/nacl/encoding.py
+${PYSITELIB}/nacl/encoding.pyc
+${PYSITELIB}/nacl/encoding.pyo
 ${PYSITELIB}/nacl/exceptions.py
+${PYSITELIB}/nacl/exceptions.pyc
+${PYSITELIB}/nacl/exceptions.pyo
 ${PYSITELIB}/nacl/hash.py
+${PYSITELIB}/nacl/hash.pyc
+${PYSITELIB}/nacl/hash.pyo
 ${PYSITELIB}/nacl/hashlib.py
+${PYSITELIB}/nacl/hashlib.pyc
+${PYSITELIB}/nacl/hashlib.pyo
 ${PYSITELIB}/nacl/public.py
+${PYSITELIB}/nacl/public.pyc
+${PYSITELIB}/nacl/public.pyo
 ${PYSITELIB}/nacl/pwhash/__init__.py
-${PYSITELIB}/nacl/pwhash/__init__.pyo
 ${PYSITELIB}/nacl/pwhash/__init__.pyc
-${PYSITELIB}/nacl/pwhash/_argon2.pyo
-${PYSITELIB}/nacl/pwhash/_argon2.pyc
-${PYSITELIB}/nacl/pwhash/argon2i.pyo
-${PYSITELIB}/nacl/pwhash/argon2i.pyc
-${PYSITELIB}/nacl/pwhash/argon2id.pyo
-${PYSITELIB}/nacl/pwhash/argon2id.pyc
-${PYSITELIB}/nacl/pwhash/scrypt.pyo
-${PYSITELIB}/nacl/pwhash/scrypt.pyc
+${PYSITELIB}/nacl/pwhash/__init__.pyo
 ${PYSITELIB}/nacl/pwhash/_argon2.py
+${PYSITELIB}/nacl/pwhash/_argon2.pyc
+${PYSITELIB}/nacl/pwhash/_argon2.pyo
 ${PYSITELIB}/nacl/pwhash/argon2i.py
+${PYSITELIB}/nacl/pwhash/argon2i.pyc
+${PYSITELIB}/nacl/pwhash/argon2i.pyo
 ${PYSITELIB}/nacl/pwhash/argon2id.py
+${PYSITELIB}/nacl/pwhash/argon2id.pyc
+${PYSITELIB}/nacl/pwhash/argon2id.pyo
 ${PYSITELIB}/nacl/pwhash/scrypt.py
+${PYSITELIB}/nacl/pwhash/scrypt.pyc
+${PYSITELIB}/nacl/pwhash/scrypt.pyo
 ${PYSITELIB}/nacl/secret.py
+${PYSITELIB}/nacl/secret.pyc
+${PYSITELIB}/nacl/secret.pyo
 ${PYSITELIB}/nacl/signing.py
+${PYSITELIB}/nacl/signing.pyc
+${PYSITELIB}/nacl/signing.pyo
 ${PYSITELIB}/nacl/utils.py
+${PYSITELIB}/nacl/utils.pyc
+${PYSITELIB}/nacl/utils.pyo
diff --git a/security/py-nacl/distinfo b/security/py-nacl/distinfo
index b8ea01ad981..9482576045f 100644
--- a/security/py-nacl/distinfo
+++ b/security/py-nacl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2019/02/19 12:14:22 tm Exp $
+$NetBSD: distinfo,v 1.3 2020/05/27 15:01:08 adam Exp $
 
-SHA1 (PyNaCl-1.3.0.tar.gz) = c078953e5643ad4ff7881a4627f5147eb5c76cf4
-RMD160 (PyNaCl-1.3.0.tar.gz) = 3db2521fe97a2107fbf3e009d4b9c7b75a25ab34
-SHA512 (PyNaCl-1.3.0.tar.gz) = 1762d7d9add6ca59ce83e394071861f78f27d0f06ad1481255ebb66023186127e1a67b49a2c2f51bcbd97bdd151a3a2adea099c47c2a9f456dda5e3b1508af50
-Size (PyNaCl-1.3.0.tar.gz) = 3351016 bytes
+SHA1 (PyNaCl-1.4.0.tar.gz) = 70f0da7ec7aa757c8e99532e9a6acfdfac3d5342
+RMD160 (PyNaCl-1.4.0.tar.gz) = d93981462dc0c6aa0282c792b9070583d752f3da
+SHA512 (PyNaCl-1.4.0.tar.gz) = 355b974010f94d551f631a2dd5ae792da3d4d0abf8ed70b6decc78aad24a9f965636988aebd14947b137ea14cdcbb73531775f08b1b4d5a9d72b5df3dba0b022
+Size (PyNaCl-1.4.0.tar.gz) = 3416950 bytes