CVS commit: pkgsrc/net/py-impacket

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 26 22:30:50 UTC 2020

Modified Files:
        pkgsrc/net/py-impacket: Makefile PLIST

Log Message:
py-impacket: fix DEPENDS; fix PLIST; fix binaries with Python version suffix; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-impacket/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-impacket/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-impacket/Makefile
diff -u pkgsrc/net/py-impacket/Makefile:1.2 pkgsrc/net/py-impacket/Makefile:1.3
--- pkgsrc/net/py-impacket/Makefile:1.2 Thu Apr 30 14:53:00 2020
+++ pkgsrc/net/py-impacket/Makefile     Tue May 26 22:30:50 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/04/30 14:53:00 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 22:30:50 adam Exp $
 
 DISTNAME=      impacket-0.9.21
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=i/impacket/}
@@ -10,28 +10,60 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.secureauth.com/labs/open-source-tools/impacket
 COMMENT=       Collection of Python classes for working with network protocols
 LICENSE=       apache-1.1
-USE_TOOLS+=    basename
 
-DEPENDS+=      ${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
-DEPENDS+=      ${PYPKGPREFIX}-cryptodomex-[0-9]*:../../security/py-cryptodomex
-DEPENDS+=      ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
+DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.13.1:../../security/py-OpenSSL
+DEPENDS+=      ${PYPKGPREFIX}-asn1>=0.2.3:../../security/py-asn1
+DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
+DEPENDS+=      ${PYPKGPREFIX}-flask>=1.0:../../www/py-flask
+DEPENDS+=      ${PYPKGPREFIX}-ldap3>=2.6:../../databases/py-ldap3
+DEPENDS+=      ${PYPKGPREFIX}-ldapdomaindump>=0.9.0:../../net/py-ldapdomaindump
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=      ${PYPKGPREFIX}-ldap3-[0-9]*:../../databases/py-ldap3
-DEPENDS+=      ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
-DEPENDS+=      ${PYPKGPREFIX}-ldapdomaindump-[0-9]*:../../net/py-ldapdomaindump
-
-# \todo: tests want ldap3==2.5.1, we have 2.7.x
-TEST_DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
+TEST_DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+.endif
+
+SUBST_CLASSES+=                crypto
+SUBST_STAGE.crypto=    pre-configure
+SUBST_MESSAGE.crypto=  Switching from py-cryptodomex to py-cryptodome.
+SUBST_FILES.crypto+=   examples/dpapi.py
+SUBST_FILES.crypto+=   examples/goldenPac.py
+SUBST_FILES.crypto+=   examples/mimikatz.py
+SUBST_FILES.crypto+=   examples/rdp_check.py
+SUBST_FILES.crypto+=   examples/smbrelayx.py
+SUBST_FILES.crypto+=   impacket/crypto.py
+SUBST_FILES.crypto+=   impacket/dcerpc/v5/drsuapi.py
+SUBST_FILES.crypto+=   impacket/dcerpc/v5/nrpc.py
+SUBST_FILES.crypto+=   impacket/dcerpc/v5/rpcrt.py
+SUBST_FILES.crypto+=   impacket/dcerpc/v5/samr.py
+SUBST_FILES.crypto+=   impacket/dpapi.py
+SUBST_FILES.crypto+=   impacket/examples/ntlmrelayx/attacks/ldapattack.py
+SUBST_FILES.crypto+=   impacket/examples/secretsdump.py
+SUBST_FILES.crypto+=   impacket/krb5/crypto.py
+SUBST_FILES.crypto+=   impacket/krb5/gssapi.py
+SUBST_FILES.crypto+=   impacket/ntlm.py
+SUBST_FILES.crypto+=   impacket/smb3.py
+SUBST_FILES.crypto+=   tests/SMB_RPC/test_mimilib.py
+SUBST_FILES.crypto+=   tests/SMB_RPC/test_nrpc.py
+SUBST_FILES.crypto+=   tests/SMB_RPC/test_ntlm.py
+SUBST_FILES.crypto+=   tests/SMB_RPC/test_samr.py
+SUBST_FILES.crypto+=   tests/misc/test_dpapi.py
+SUBST_SED.crypto=      -e 's,Cryptodome,Crypto,'
 
 post-install:
+.for bin in GetADUsers GetNPUsers GetUserSPNs addcomputer atexec dcomexec dpapi \
+esentutl findDelegation getArch getPac getST getTGT goldenPac ifmap karmaSMB \
+kintercept lookupsid mimikatz mqtt_check mssqlclient mssqlinstance netview \
+nmapAnswerMachine ntfs-read ntlmrelayx opdump ping ping6 psexec raiseChild \
+rdp_check reg registry-read rpcdump sambaPipe samrdump secretsdump services \
+smbclient smbexec smbrelayx smbserver sniff sniffer split ticketConverter \
+ticketer wmiexec wmipersist wmiquery
        cd ${DESTDIR}${PREFIX}/bin && \
-       set -e; \
-       for i in ${DESTDIR}${PREFIX}/bin/*; do \
-               n=`basename "$$i" ".py"`; \
-               ${MV} "$$i" "$$n"-${PYVERSSUFFIX}.py; \
-       done
+       ${MV} ${bin}.py ${bin}-${PYVERSSUFFIX}.py || ${TRUE}
+.endfor
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-impacket/PLIST
diff -u pkgsrc/net/py-impacket/PLIST:1.3 pkgsrc/net/py-impacket/PLIST:1.4
--- pkgsrc/net/py-impacket/PLIST:1.3    Mon May 18 08:44:35 2020
+++ pkgsrc/net/py-impacket/PLIST        Tue May 26 22:30:50 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/18 08:44:35 leot Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/26 22:30:50 adam Exp $
 bin/GetADUsers-${PYVERSSUFFIX}.py
 bin/GetNPUsers-${PYVERSSUFFIX}.py
 bin/GetUserSPNs-${PYVERSSUFFIX}.py
@@ -436,5 +436,3 @@ ${PYSITELIB}/impacket/winregistry.pyo
 ${PYSITELIB}/impacket/wps.py
 ${PYSITELIB}/impacket/wps.pyc
 ${PYSITELIB}/impacket/wps.pyo
-share/doc/impacket/LICENSE
-share/doc/impacket/README.md