Define modulenames for cffi modules.

Fix PLIST issues on different compilers.

6 files changed, 52 insertions, 22 deletions

diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 3e1c965fe7d..40236f69e7c 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/03/21 13:20:35 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/21 14:02:45 wiz Exp $
 
 DISTNAME=	cryptography-0.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	https://pypi.python.org/packages/source/c/cryptography/
 
@@ -14,22 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-cffi>=0.8:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser>=2.10:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYPKGPREFIX} == "py33"
-PLIST_SUBST+=   SONAME1=_cffi__xcd368b2dx4a8b9ec1.so
-PLIST_SUBST+=   SONAME2=_cffi__xdf1872a9xf0ae7e21.so
-PLIST_SUBST+=   SONAME3=_cffi__xf2e3c1f8xfba2f231.so
-.elif ${PYPKGPREFIX} == "py27"
-PLIST_SUBST+=   SONAME1=_cffi__x5fea2bacx4a8b9ec1.so
-PLIST_SUBST+=   SONAME2=_cffi__x657b2f6exf0ae7e21.so
-PLIST_SUBST+=   SONAME3=_cffi__xcfd0a060xfba2f231.so
-.elif ${PYPKGPREFIX} == "py26"
-PLIST_SUBST+=	SONAME1=_cffi__x63e6cd6axfba2f231.so
-PLIST_SUBST+=	SONAME2=_cffi__xcc2cb6a8xf0ae7e21.so
-PLIST_SUBST+=	SONAME3=_cffi__xe2e07463x4a8b9ec1.so
-.endif
-
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cryptography/PLIST b/security/py-cryptography/PLIST
index 301856bc4a3..30f3f3ede4e 100644
--- a/security/py-cryptography/PLIST
+++ b/security/py-cryptography/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/21 13:20:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/03/21 14:02:45 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -11,9 +11,9 @@ ${PYSITELIB}/cryptography/__about__.pyo
 ${PYSITELIB}/cryptography/__init__.py
 ${PYSITELIB}/cryptography/__init__.pyc
 ${PYSITELIB}/cryptography/__init__.pyo
-${PYSITELIB}/cryptography/${SONAME1}
-${PYSITELIB}/cryptography/${SONAME2}
-${PYSITELIB}/cryptography/${SONAME3}
+${PYSITELIB}/cryptography/checkpkcs7padding.so
+${PYSITELIB}/cryptography/constanttime.so
+${PYSITELIB}/cryptography/cryptography.so
 ${PYSITELIB}/cryptography/exceptions.py
 ${PYSITELIB}/cryptography/exceptions.pyc
 ${PYSITELIB}/cryptography/exceptions.pyo
diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo
index 905388f5bb5..7892b656fff 100644
--- a/security/py-cryptography/distinfo
+++ b/security/py-cryptography/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1 2014/03/21 13:20:35 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/03/21 14:02:45 wiz Exp $
 
 SHA1 (cryptography-0.2.2.tar.gz) = 578e6a4cae6e24ecfa7069e1924ca99bd3c7d3ba
 RMD160 (cryptography-0.2.2.tar.gz) = 8203428fbef935cafe897ae0878ac7e482781211
 Size (cryptography-0.2.2.tar.gz) = 13772494 bytes
+SHA1 (patch-cryptography_hazmat_bindings_utils.py) = ca5d740e397c5d49eb6934a4e94009866cef20ef
+SHA1 (patch-cryptography_hazmat_primitives_constant__time.py) = 75a2a83930917059ad6e4dac14fcae0c7585d426
+SHA1 (patch-cryptography_hazmat_primitives_padding.py) = 7c8b367c95a76f769e641587118d75597e3ce552
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py b/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py
new file mode 100644
index 00000000000..b5a986700c8
--- /dev/null
+++ b/security/py-cryptography/patches/patch-cryptography_hazmat_bindings_utils.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-cryptography_hazmat_bindings_utils.py,v 1.1 2014/03/21 14:02:45 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- cryptography/hazmat/bindings/utils.py.orig	2014-03-04 00:51:26.000000000 +0000
++++ cryptography/hazmat/bindings/utils.py
+@@ -69,6 +69,7 @@ def build_ffi(module_prefix, modules, pr
+             customizations
+         ),
+         libraries=libraries,
++        modulename=module_name,
+         ext_package="cryptography",
+     )
+ 
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py
new file mode 100644
index 00000000000..3c6c2903e4b
--- /dev/null
+++ b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_constant__time.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-cryptography_hazmat_primitives_constant__time.py,v 1.1 2014/03/21 14:02:45 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- cryptography/hazmat/primitives/constant_time.py.orig	2014-03-04 00:51:26.000000000 +0000
++++ cryptography/hazmat/primitives/constant_time.py
+@@ -45,6 +45,7 @@ uint8_t Cryptography_constant_time_bytes
+ }
+ """,
+     ext_package="cryptography",
++    modulename="constanttime",
+ )
+ 
+ 
diff --git a/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py
new file mode 100644
index 00000000000..8239a125583
--- /dev/null
+++ b/security/py-cryptography/patches/patch-cryptography_hazmat_primitives_padding.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-cryptography_hazmat_primitives_padding.py,v 1.1 2014/03/21 14:02:45 wiz Exp $
+
+Fix soname so cffi doesn't invent one for each python version + platform.
+
+--- cryptography/hazmat/primitives/padding.py.orig	2014-03-04 00:51:26.000000000 +0000
++++ cryptography/hazmat/primitives/padding.py
+@@ -62,6 +62,7 @@ uint8_t Cryptography_check_pkcs7_padding
+ }
+ """,
+     ext_package="cryptography",
++    modulename="checkpkcs7padding",
+ )
+ 
+