svn commit: r501667 - in head/security: py-rekall-core py-rekall-core/files py-rekall_lib

[Antoine Brodin]

Author: antoine
Date: Tue May 14 19:41:52 2019
New Revision: 501667
URL: https://svnweb.freebsd.org/changeset/ports/501667

Log:
  Switch from pycryptodome to pycryptodomex to allow concurrent installation
  with ports requiring pycrypto

Modified:
  head/security/py-rekall-core/Makefile
  head/security/py-rekall-core/files/patch-setup.py
  head/security/py-rekall_lib/Makefile

Modified: head/security/py-rekall-core/Makefile
==============================================================================
--- head/security/py-rekall-core/Makefile	Tue May 14 18:59:26 2019	(r501666)
+++ head/security/py-rekall-core/Makefile	Tue May 14 19:41:52 2019	(r501667)
@@ -4,6 +4,7 @@
 PORTNAME=	rekall-core
 DISTVERSION=	1.7.2rc1-52
 DISTVERSIONSUFFIX=	-g0cba831
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -23,7 +24,7 @@ RUN_DEPENDS=	cabextract:archivers/cabextract \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaff4>=0.25:security/py-pyaff4@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4.7:security/py-pycryptodome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.4.7:security/py-pycryptodomex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.1:devel/py-dateutil@${PY_FLAVOR} \
@@ -47,5 +48,12 @@ WRKSRC_SUBDIR=	rekall-core
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS+=	--install-data=${PYTHON_SITELIBDIR}
+
+post-patch:
+	${REINPLACE_CMD} "s|from Crypto|from Cryptodome|" \
+		${WRKSRC}/rekall/compatibility.py \
+		${WRKSRC}/rekall/plugins/windows/mimikatz.py \
+		${WRKSRC}/rekall/plugins/windows/registry/hashdump.py \
+		${WRKSRC}/rekall/plugins/windows/registry/lsasecrets.py
 
 .include <bsd.port.post.mk>

Modified: head/security/py-rekall-core/files/patch-setup.py
==============================================================================
--- head/security/py-rekall-core/files/patch-setup.py	Tue May 14 18:59:26 2019	(r501666)
+++ head/security/py-rekall-core/files/patch-setup.py	Tue May 14 19:41:52 2019	(r501667)
@@ -26,7 +26,7 @@
 -    'pytsk3==20170802',
 -    'pytz==2017.3',
 -    'rekall-capstone==3.0.5.post2',
-+    'pycryptodome>=3.4.7',
++    'pycryptodomex>=3.4.7',
 +    'pyelftools>=0.24',
 +    'pyparsing>=2.1.5',
 +    'python-dateutil>=2.6.1',

Modified: head/security/py-rekall_lib/Makefile
==============================================================================
--- head/security/py-rekall_lib/Makefile	Tue May 14 18:59:26 2019	(r501666)
+++ head/security/py-rekall_lib/Makefile	Tue May 14 19:41:52 2019	(r501667)
@@ -4,6 +4,7 @@
 PORTNAME=	rekall_lib
 DISTVERSION=	1.7.2rc1-52
 DISTVERSIONSUFFIX=	-g0cba831
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=0.10.0:deve
 		${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.7:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=0:security/py-pycryptodomex@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_PROJECT=	rekall
@@ -27,5 +28,8 @@ USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 WRKSRC_SUBDIR=	rekall-lib
+
+post-patch:
+	${REINPLACE_CMD} "s|from Crypto|from Cryptodome|" ${WRKSRC}/rekall_lib/crypto.py
 
 .include <bsd.port.mk>