Update py-impacket to 0.9.10

Approved by:	miwi (mentor)

4 files changed, 37 insertions, 14 deletions

diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 8fd0e024f288..490b6a05876d 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -1,12 +1,11 @@
 # Created by: Marcin Jessa <yazzy@yazzy.org>
 # $FreeBSD$
 
-PORTNAME=	Impacket
-PORTVERSION=	0.9.9.9
+PORTNAME=	impacket
+PORTVERSION=	0.9.10
 CATEGORIES=	net python
-MASTER_SITES=	http://corelabs.coresecurity.com/index.php?module=Wiki&action=attachment&type=tool&page=Impacket&file=
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	impacket-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of Python classes providing access to network packets
@@ -16,14 +15,12 @@ LICENSE_NAME=	Apache License version 1.1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pcapy.so:${PORTSDIR}/net/py-pcapy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pcapy>=0:${PORTSDIR}/net/py-pcapy \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
 
-FETCH_BEFORE_ARGS=-o ${DISTFILES}
-WRKSRC=		${WRKDIR}/impacket
 USE_DOS2UNIX=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGVERSION=0.9.9.0-dev
 PORTDOCS=	README
 
 .include <bsd.port.options.mk>
diff --git a/net/py-impacket/distinfo b/net/py-impacket/distinfo
index 68c09e10d60d..eb0d52ba1d95 100644
--- a/net/py-impacket/distinfo
+++ b/net/py-impacket/distinfo
@@ -1,2 +1,2 @@
-SHA256 (impacket-0.9.9.9.tar.gz) = 6028147d07f9688d8fd30233ed471434c6a7f1723bd2e8948ecf0ddde8edc22d
-SIZE (impacket-0.9.9.9.tar.gz) = 314699
+SHA256 (impacket-0.9.10.tar.gz) = 6d9e2b91f825c3bdfb9b5f42419900fcc7739257cbb5eac48ee8d8f68166092b
+SIZE (impacket-0.9.10.tar.gz) = 435448
diff --git a/net/py-impacket/files/patch-setup.py b/net/py-impacket/files/patch-setup.py
index 4fe89449e3b9..fb726c560d25 100644
--- a/net/py-impacket/files/patch-setup.py
+++ b/net/py-impacket/files/patch-setup.py
@@ -1,9 +1,10 @@
---- ./setup.py.orig	2013-04-28 18:06:57.000000000 +0000
-+++ ./setup.py	2013-04-28 18:07:08.000000000 +0000
-@@ -18,6 +18,4 @@
-       maintainer_email = "bethus@gmail.com",
+--- ./setup.py.orig	2013-05-08 13:57:03.000000000 +0000
++++ ./setup.py	2013-05-08 13:57:03.000000000 +0000
+@@ -21,7 +21,5 @@
+       platforms = ["Unix","Windows"],
        packages = ['impacket', 'impacket.dcerpc', 'impacket.examples'],
        scripts = glob.glob(os.path.join('examples', '*.py')),
 -      data_files = [(os.path.join('share', 'doc', PACKAGE_NAME),
 -                     ['README', 'LICENSE']+glob.glob('doc/*'))],
+ 
        )
diff --git a/net/py-impacket/pkg-plist b/net/py-impacket/pkg-plist
index b8592755f50f..8433345d1a93 100644
--- a/net/py-impacket/pkg-plist
+++ b/net/py-impacket/pkg-plist
@@ -6,6 +6,8 @@ bin/ifmap.py
 bin/lookupsid.py
 bin/loopchain.py
 bin/ms05-039-crash.py
+bin/mssqlclient.py
+bin/mssqlinstance.py
 bin/nmapAnswerMachine.py
 bin/oochain.py
 bin/opdump.py
@@ -18,6 +20,8 @@ bin/samrdump.py
 bin/services.py
 bin/smbcat.py
 bin/smbclient.py
+bin/smbexec.py
+bin/smbrelayx.py
 bin/smbtorture.py
 bin/sniff.py
 bin/sniffer.py
@@ -57,6 +61,9 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/cdp.py
 %%PYTHON_SITELIBDIR%%/impacket/cdp.pyc
 %%PYTHON_SITELIBDIR%%/impacket/cdp.pyo
+%%PYTHON_SITELIBDIR%%/impacket/crypto.py
+%%PYTHON_SITELIBDIR%%/impacket/crypto.pyc
+%%PYTHON_SITELIBDIR%%/impacket/crypto.pyo
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.pyo
@@ -132,6 +139,9 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/nmb.py
 %%PYTHON_SITELIBDIR%%/impacket/nmb.pyc
 %%PYTHON_SITELIBDIR%%/impacket/nmb.pyo
+%%PYTHON_SITELIBDIR%%/impacket/nt_errors.py
+%%PYTHON_SITELIBDIR%%/impacket/nt_errors.pyc
+%%PYTHON_SITELIBDIR%%/impacket/nt_errors.pyo
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.py
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.pyc
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.pyo
@@ -141,12 +151,27 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/smb.py
 %%PYTHON_SITELIBDIR%%/impacket/smb.pyc
 %%PYTHON_SITELIBDIR%%/impacket/smb.pyo
+%%PYTHON_SITELIBDIR%%/impacket/smb3.py
+%%PYTHON_SITELIBDIR%%/impacket/smb3.pyc
+%%PYTHON_SITELIBDIR%%/impacket/smb3.pyo
+%%PYTHON_SITELIBDIR%%/impacket/smb3structs.py
+%%PYTHON_SITELIBDIR%%/impacket/smb3structs.pyc
+%%PYTHON_SITELIBDIR%%/impacket/smb3structs.pyo
+%%PYTHON_SITELIBDIR%%/impacket/smbconnection.py
+%%PYTHON_SITELIBDIR%%/impacket/smbconnection.pyc
+%%PYTHON_SITELIBDIR%%/impacket/smbconnection.pyo
 %%PYTHON_SITELIBDIR%%/impacket/smbserver.py
 %%PYTHON_SITELIBDIR%%/impacket/smbserver.pyc
 %%PYTHON_SITELIBDIR%%/impacket/smbserver.pyo
+%%PYTHON_SITELIBDIR%%/impacket/spnego.py
+%%PYTHON_SITELIBDIR%%/impacket/spnego.pyc
+%%PYTHON_SITELIBDIR%%/impacket/spnego.pyo
 %%PYTHON_SITELIBDIR%%/impacket/structure.py
 %%PYTHON_SITELIBDIR%%/impacket/structure.pyc
 %%PYTHON_SITELIBDIR%%/impacket/structure.pyo
+%%PYTHON_SITELIBDIR%%/impacket/tds.py
+%%PYTHON_SITELIBDIR%%/impacket/tds.pyc
+%%PYTHON_SITELIBDIR%%/impacket/tds.pyo
 %%PYTHON_SITELIBDIR%%/impacket/uuid.py
 %%PYTHON_SITELIBDIR%%/impacket/uuid.pyc
 %%PYTHON_SITELIBDIR%%/impacket/uuid.pyo