diff --git a/security/Makefile b/security/Makefile index 034c16c6789..325cd763a77 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.473 2017/11/07 16:23:31 rpointel Exp $ +# $OpenBSD: Makefile,v 1.474 2017/11/07 16:30:32 ajacoutot Exp $ SUBDIR = SUBDIR += ADMsnmp @@ -277,6 +277,7 @@ SUBDIR += py-keyring SUBDIR += py-keyring,python3 SUBDIR += py-libnacl + SUBDIR += py-libnacl,python3 SUBDIR += py-openssl SUBDIR += py-openssl,python3 SUBDIR += py-oauthlib diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile index b3527927379..72d5bc669a0 100644 --- a/security/py-libnacl/Makefile +++ b/security/py-libnacl/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2017/07/21 09:06:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2017/11/07 16:30:32 ajacoutot Exp $ COMMENT= python bindings for libsodium/tweetnacl based on ctypes -MODPY_EGG_VERSION= 1.5.2 +MODPY_EGG_VERSION= 1.6.1 DISTNAME= libnacl-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -15,14 +15,17 @@ MAINTAINER= Antoine Jacoutot # apache 2.0 PERMIT_PACKAGE_CDROM= Yes +MODULES= lang/python + MODPY_PI= Yes MODPY_SETUPTOOLS= Yes -MODULES= lang/python - RUN_DEPENDS= security/libsodium TEST_DEPENDS= security/libsodium +FLAVORS= python3 +FLAVOR?= + do-test: cd ${WRKSRC}/tests && \ ${MODPY_BIN} ./runtests.py diff --git a/security/py-libnacl/distinfo b/security/py-libnacl/distinfo index ce09e77f85d..8d220606ece 100644 --- a/security/py-libnacl/distinfo +++ b/security/py-libnacl/distinfo @@ -1,2 +1,2 @@ -SHA256 (libnacl-1.5.2.tar.gz) = xYOQsNGR25SPyatoHwf9/OKlc80BI1a62kfVZ5XQDuI= -SIZE (libnacl-1.5.2.tar.gz) = 49573 +SHA256 (libnacl-1.6.1.tar.gz) = m6w9iGdnjEV9DAGPAoBSmWq1Z6a0lk6CoXBy7SyyZ1s= +SIZE (libnacl-1.6.1.tar.gz) = 65443 diff --git a/security/py-libnacl/pkg/PLIST b/security/py-libnacl/pkg/PLIST index 47388b8f9ca..e935af474d2 100644 --- a/security/py-libnacl/pkg/PLIST +++ b/security/py-libnacl/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2017/07/21 09:06:31 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2017/11/07 16:30:32 ajacoutot Exp $ lib/python${MODPY_VERSION}/site-packages/libnacl/ lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -6,26 +6,27 @@ lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_ lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/libnacl/__init__.py -lib/python${MODPY_VERSION}/site-packages/libnacl/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}aead.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}blake.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}encode.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}public.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sealed.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}secret.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sign.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/libnacl/aead.py -lib/python${MODPY_VERSION}/site-packages/libnacl/aead.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/base.py -lib/python${MODPY_VERSION}/site-packages/libnacl/base.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/blake.py -lib/python${MODPY_VERSION}/site-packages/libnacl/blake.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/dual.py -lib/python${MODPY_VERSION}/site-packages/libnacl/dual.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/encode.py -lib/python${MODPY_VERSION}/site-packages/libnacl/encode.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/public.py -lib/python${MODPY_VERSION}/site-packages/libnacl/public.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/sealed.py -lib/python${MODPY_VERSION}/site-packages/libnacl/sealed.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/secret.py -lib/python${MODPY_VERSION}/site-packages/libnacl/secret.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/sign.py -lib/python${MODPY_VERSION}/site-packages/libnacl/sign.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/utils.py -lib/python${MODPY_VERSION}/site-packages/libnacl/utils.pyc lib/python${MODPY_VERSION}/site-packages/libnacl/version.py -lib/python${MODPY_VERSION}/site-packages/libnacl/version.pyc