[pkgsrc/trunk]: pkgsrc/security/py-cryptodome py-cryptodome: fix Python 2.7 b...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/py-cryptodome py-cryptodome: fix Python 2.7 b...
From: gutteridge <gutteridge%pkgsrc.org@localhost>
Date: Wed, 24 Feb 2021 02:12:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce5693273d14
branches:  trunk
changeset: 447624:ce5693273d14
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed Feb 24 01:11:34 2021 +0000

description:
py-cryptodome: fix Python 2.7 builds

The upstream project decided to add an extra "abi3" suffix to shared
objects when this is built with Python 3.x; these are simply omitted
when Python 2.7 is involved.

diffstat:

 security/py-cryptodome/Makefile |  12 +++++-
 security/py-cryptodome/PLIST    |  76 ++++++++++++++++++++--------------------
 2 files changed, 48 insertions(+), 40 deletions(-)

diffs (177 lines):

diff -r b12eeb92664f -r ce5693273d14 security/py-cryptodome/Makefile
--- a/security/py-cryptodome/Makefile   Tue Feb 23 18:28:29 2021 +0000
+++ b/security/py-cryptodome/Makefile   Wed Feb 24 01:11:34 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/02/17 15:59:20 adam Exp $
+# $NetBSD: Makefile,v 1.35 2021/02/24 01:11:34 gutteridge Exp $
 
 DISTNAME=      pycryptodome-3.10.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -17,7 +17,15 @@
 
 CHECK_PORTABILITY_SKIP=        appveyor/get_wheels.sh
 
+.include "../../lang/python/egg.mk"
+
+# Python 3 builds of this package get an extra "abi3" suffix added
+.if ${PYVERSSUFFIX} != "2.7"
+PLIST_SUBST+=  SOEXT="abi3.so"
+.else
+PLIST_SUBST+=  SOEXT="so"
+.endif
+
 BUILDLINK_API_DEPENDS.gmp+=    gmp>=5.0
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b12eeb92664f -r ce5693273d14 security/py-cryptodome/PLIST
--- a/security/py-cryptodome/PLIST      Tue Feb 23 18:28:29 2021 +0000
+++ b/security/py-cryptodome/PLIST      Wed Feb 24 01:11:34 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2021/02/17 15:59:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/02/24 01:11:34 gutteridge Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -52,17 +52,17 @@
 ${PYSITELIB}/Crypto/Cipher/Salsa20.pyc
 ${PYSITELIB}/Crypto/Cipher/Salsa20.pyi
 ${PYSITELIB}/Crypto/Cipher/Salsa20.pyo
-${PYSITELIB}/Crypto/Cipher/_ARC4.abi3.so
+${PYSITELIB}/Crypto/Cipher/_ARC4.${SOEXT}
 ${PYSITELIB}/Crypto/Cipher/_EKSBlowfish.py
 ${PYSITELIB}/Crypto/Cipher/_EKSBlowfish.pyc
 ${PYSITELIB}/Crypto/Cipher/_EKSBlowfish.pyi
 ${PYSITELIB}/Crypto/Cipher/_EKSBlowfish.pyo
-${PYSITELIB}/Crypto/Cipher/_Salsa20.abi3.so
+${PYSITELIB}/Crypto/Cipher/_Salsa20.${SOEXT}
 ${PYSITELIB}/Crypto/Cipher/__init__.py
 ${PYSITELIB}/Crypto/Cipher/__init__.pyc
 ${PYSITELIB}/Crypto/Cipher/__init__.pyi
 ${PYSITELIB}/Crypto/Cipher/__init__.pyo
-${PYSITELIB}/Crypto/Cipher/_chacha20.abi3.so
+${PYSITELIB}/Crypto/Cipher/_chacha20.${SOEXT}
 ${PYSITELIB}/Crypto/Cipher/_mode_cbc.py
 ${PYSITELIB}/Crypto/Cipher/_mode_cbc.pyc
 ${PYSITELIB}/Crypto/Cipher/_mode_cbc.pyi
@@ -107,20 +107,20 @@
 ${PYSITELIB}/Crypto/Cipher/_mode_siv.pyc
 ${PYSITELIB}/Crypto/Cipher/_mode_siv.pyi
 ${PYSITELIB}/Crypto/Cipher/_mode_siv.pyo
-${PYSITELIB}/Crypto/Cipher/_raw_aes.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_aesni.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_arc2.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_blowfish.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_cast.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_cbc.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_cfb.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_ctr.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_des.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_des3.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_ecb.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_eksblowfish.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_ocb.abi3.so
-${PYSITELIB}/Crypto/Cipher/_raw_ofb.abi3.so
+${PYSITELIB}/Crypto/Cipher/_raw_aes.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_aesni.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_arc2.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_blowfish.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_cast.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_cbc.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_cfb.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_ctr.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_des.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_des3.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_ecb.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_eksblowfish.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_ocb.${SOEXT}
+${PYSITELIB}/Crypto/Cipher/_raw_ofb.${SOEXT}
 ${PYSITELIB}/Crypto/Hash/BLAKE2b.py
 ${PYSITELIB}/Crypto/Hash/BLAKE2b.pyc
 ${PYSITELIB}/Crypto/Hash/BLAKE2b.pyi
@@ -209,25 +209,25 @@
 ${PYSITELIB}/Crypto/Hash/SHAKE256.pyc
 ${PYSITELIB}/Crypto/Hash/SHAKE256.pyi
 ${PYSITELIB}/Crypto/Hash/SHAKE256.pyo
-${PYSITELIB}/Crypto/Hash/_BLAKE2b.abi3.so
-${PYSITELIB}/Crypto/Hash/_BLAKE2s.abi3.so
-${PYSITELIB}/Crypto/Hash/_MD2.abi3.so
-${PYSITELIB}/Crypto/Hash/_MD4.abi3.so
-${PYSITELIB}/Crypto/Hash/_MD5.abi3.so
-${PYSITELIB}/Crypto/Hash/_RIPEMD160.abi3.so
-${PYSITELIB}/Crypto/Hash/_SHA1.abi3.so
-${PYSITELIB}/Crypto/Hash/_SHA224.abi3.so
-${PYSITELIB}/Crypto/Hash/_SHA256.abi3.so
-${PYSITELIB}/Crypto/Hash/_SHA384.abi3.so
-${PYSITELIB}/Crypto/Hash/_SHA512.abi3.so
+${PYSITELIB}/Crypto/Hash/_BLAKE2b.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_BLAKE2s.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_MD2.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_MD4.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_MD5.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_RIPEMD160.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_SHA1.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_SHA224.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_SHA256.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_SHA384.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_SHA512.${SOEXT}
 ${PYSITELIB}/Crypto/Hash/__init__.py
 ${PYSITELIB}/Crypto/Hash/__init__.pyc
 ${PYSITELIB}/Crypto/Hash/__init__.pyi
 ${PYSITELIB}/Crypto/Hash/__init__.pyo
-${PYSITELIB}/Crypto/Hash/_ghash_clmul.abi3.so
-${PYSITELIB}/Crypto/Hash/_ghash_portable.abi3.so
-${PYSITELIB}/Crypto/Hash/_keccak.abi3.so
-${PYSITELIB}/Crypto/Hash/_poly1305.abi3.so
+${PYSITELIB}/Crypto/Hash/_ghash_clmul.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_ghash_portable.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_keccak.${SOEXT}
+${PYSITELIB}/Crypto/Hash/_poly1305.${SOEXT}
 ${PYSITELIB}/Crypto/Hash/keccak.py
 ${PYSITELIB}/Crypto/Hash/keccak.pyc
 ${PYSITELIB}/Crypto/Hash/keccak.pyi
@@ -274,7 +274,7 @@
 ${PYSITELIB}/Crypto/Math/__init__.py
 ${PYSITELIB}/Crypto/Math/__init__.pyc
 ${PYSITELIB}/Crypto/Math/__init__.pyo
-${PYSITELIB}/Crypto/Math/_modexp.abi3.so
+${PYSITELIB}/Crypto/Math/_modexp.${SOEXT}
 ${PYSITELIB}/Crypto/Protocol/KDF.py
 ${PYSITELIB}/Crypto/Protocol/KDF.pyc
 ${PYSITELIB}/Crypto/Protocol/KDF.pyi
@@ -287,7 +287,7 @@
 ${PYSITELIB}/Crypto/Protocol/__init__.pyc
 ${PYSITELIB}/Crypto/Protocol/__init__.pyi
 ${PYSITELIB}/Crypto/Protocol/__init__.pyo
-${PYSITELIB}/Crypto/Protocol/_scrypt.abi3.so
+${PYSITELIB}/Crypto/Protocol/_scrypt.${SOEXT}
 ${PYSITELIB}/Crypto/PublicKey/DSA.py
 ${PYSITELIB}/Crypto/PublicKey/DSA.pyc
 ${PYSITELIB}/Crypto/PublicKey/DSA.pyi
@@ -308,7 +308,7 @@
 ${PYSITELIB}/Crypto/PublicKey/__init__.pyc
 ${PYSITELIB}/Crypto/PublicKey/__init__.pyi
 ${PYSITELIB}/Crypto/PublicKey/__init__.pyo
-${PYSITELIB}/Crypto/PublicKey/_ec_ws.abi3.so
+${PYSITELIB}/Crypto/PublicKey/_ec_ws.${SOEXT}
 ${PYSITELIB}/Crypto/PublicKey/_openssh.py
 ${PYSITELIB}/Crypto/PublicKey/_openssh.pyc
 ${PYSITELIB}/Crypto/PublicKey/_openssh.pyi
@@ -606,7 +606,7 @@
 ${PYSITELIB}/Crypto/Util/_cpu_features.pyc
 ${PYSITELIB}/Crypto/Util/_cpu_features.pyi
 ${PYSITELIB}/Crypto/Util/_cpu_features.pyo
-${PYSITELIB}/Crypto/Util/_cpuid_c.abi3.so
+${PYSITELIB}/Crypto/Util/_cpuid_c.${SOEXT}
 ${PYSITELIB}/Crypto/Util/_file_system.py
 ${PYSITELIB}/Crypto/Util/_file_system.pyc
 ${PYSITELIB}/Crypto/Util/_file_system.pyi
@@ -615,7 +615,7 @@
 ${PYSITELIB}/Crypto/Util/_raw_api.pyc
 ${PYSITELIB}/Crypto/Util/_raw_api.pyi
 ${PYSITELIB}/Crypto/Util/_raw_api.pyo
-${PYSITELIB}/Crypto/Util/_strxor.abi3.so
+${PYSITELIB}/Crypto/Util/_strxor.${SOEXT}
 ${PYSITELIB}/Crypto/Util/asn1.py
 ${PYSITELIB}/Crypto/Util/asn1.pyc
 ${PYSITELIB}/Crypto/Util/asn1.pyi
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/py-irclib py-irclib: remove handling for now unsup...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xorgproto xorgproto: update to 2021.2.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/py-irclib py-irclib: remove handling for now unsup...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xorgproto xorgproto: update to 2021.2.
Indexes:
Home | Main Index | Thread Index | Old Index