Update py-impacket to 0.9.9.9

Approved by:	eadler (mentor)

4 files changed, 106 insertions, 29 deletions

diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 898ff6209d79..58e07e76c7db 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -1,28 +1,37 @@
-# New ports collection makefile for:	Impacket
-# Date created:				15th September 2005
-# Whom:					Marcin Jessa <yazzy@yazzy.org>
-#
+# Created by: Marcin Jessa <yazzy@yazzy.org>
 # $FreeBSD$
 
 PORTNAME=	Impacket
-PORTVERSION=	0.9.6.0
+PORTVERSION=	0.9.9.9
 CATEGORIES=	net python
-MASTER_SITES=	http://oss.coresecurity.com/repo/
+MASTER_SITES=	http://corelabs.coresecurity.com/index.php?module=Wiki&action=attachment&type=tool&page=Impacket&file=
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of Python classes providing access to network packets
 
+LICENSE=	AL11
+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
 
+FETCH_BEFORE_ARGS=-o ${DISTFILES}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}
+USE_DOS2UNIX=	yes
 USE_PYTHON=	yes
-NO_BUILD=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGVERSION=0.9.9.0-dev
+PORTDOCS=	README
+
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
 post-install:
-	@${RM} -rf ${DOCSDIR}
-	@${ECHO} "Removing ${DOCSDIR} and the files in it."
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/py-impacket/distinfo b/net/py-impacket/distinfo
index 7fd59c0876ca..68c09e10d60d 100644
--- a/net/py-impacket/distinfo
+++ b/net/py-impacket/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Impacket-0.9.6.0.tar.gz) = 31d51acda423889fe498a3c81256269620780c2af6378509def695e4e69c58df
-SIZE (Impacket-0.9.6.0.tar.gz) = 241509
+SHA256 (impacket-0.9.9.9.tar.gz) = 6028147d07f9688d8fd30233ed471434c6a7f1723bd2e8948ecf0ddde8edc22d
+SIZE (impacket-0.9.9.9.tar.gz) = 314699
diff --git a/net/py-impacket/files/patch-setup.py b/net/py-impacket/files/patch-setup.py
index 8fd13be043c8..4fe89449e3b9 100644
--- a/net/py-impacket/files/patch-setup.py
+++ b/net/py-impacket/files/patch-setup.py
@@ -1,12 +1,9 @@
---- Impacket-0.9.6.0/setup.py  2006-09-20 17:37:44.000000000 -0400
-+++ setup.py   2006-09-20 17:48:59.000000000 -0400
-@@ -17,7 +17,7 @@
-       maintainer = "Max Caceres",
-       maintainer_email = "max@coresecurity.com",
-       packages = ['impacket', 'impacket.dcerpc'],
--      scripts = glob.glob(os.path.join('examples', '*.py'))+glob.glob('doc/*'),
-+      scripts = glob.glob(os.path.join('examples', '*.py')),
-       data_files = [(os.path.join('share', 'doc', PACKAGE_NAME),
--                     ['README', 'LICENSE'])],
-+                     ['README', 'LICENSE']+glob.glob('doc/*'))]
+--- ./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",
+       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 ec68a6703868..b8592755f50f 100644
--- a/net/py-impacket/pkg-plist
+++ b/net/py-impacket/pkg-plist
@@ -1,31 +1,68 @@
+bin/atsvc.py
 bin/chain.py
 bin/crapchain.py
 bin/exploit.py
+bin/ifmap.py
+bin/lookupsid.py
 bin/loopchain.py
 bin/ms05-039-crash.py
+bin/nmapAnswerMachine.py
 bin/oochain.py
+bin/opdump.py
+bin/os_ident.py
 bin/ping.py
+bin/ping6.py
+bin/psexec.py
 bin/rpcdump.py
 bin/samrdump.py
+bin/services.py
 bin/smbcat.py
 bin/smbclient.py
+bin/smbtorture.py
 bin/sniff.py
 bin/sniffer.py
 bin/split.py
+bin/spoolss.py
+bin/test_wkssvc.py
 bin/tracer.py
+bin/uncrc32.py
 bin/win_echod.py
+%%PYTHON_SITELIBDIR%%/impacket/Dot11Crypto.py
+%%PYTHON_SITELIBDIR%%/impacket/Dot11Crypto.pyc
+%%PYTHON_SITELIBDIR%%/impacket/Dot11Crypto.pyo
+%%PYTHON_SITELIBDIR%%/impacket/Dot11KeyManager.py
+%%PYTHON_SITELIBDIR%%/impacket/Dot11KeyManager.pyc
+%%PYTHON_SITELIBDIR%%/impacket/Dot11KeyManager.pyo
+%%PYTHON_SITELIBDIR%%/impacket/ICMP6.py
+%%PYTHON_SITELIBDIR%%/impacket/ICMP6.pyc
+%%PYTHON_SITELIBDIR%%/impacket/ICMP6.pyo
+%%PYTHON_SITELIBDIR%%/impacket/IP6.py
+%%PYTHON_SITELIBDIR%%/impacket/IP6.pyc
+%%PYTHON_SITELIBDIR%%/impacket/IP6.pyo
+%%PYTHON_SITELIBDIR%%/impacket/IP6_Address.py
+%%PYTHON_SITELIBDIR%%/impacket/IP6_Address.pyc
+%%PYTHON_SITELIBDIR%%/impacket/IP6_Address.pyo
 %%PYTHON_SITELIBDIR%%/impacket/ImpactDecoder.py
 %%PYTHON_SITELIBDIR%%/impacket/ImpactDecoder.pyc
 %%PYTHON_SITELIBDIR%%/impacket/ImpactDecoder.pyo
 %%PYTHON_SITELIBDIR%%/impacket/ImpactPacket.py
 %%PYTHON_SITELIBDIR%%/impacket/ImpactPacket.pyc
 %%PYTHON_SITELIBDIR%%/impacket/ImpactPacket.pyo
+%%PYTHON_SITELIBDIR%%/impacket/NDP.py
+%%PYTHON_SITELIBDIR%%/impacket/NDP.pyc
+%%PYTHON_SITELIBDIR%%/impacket/NDP.pyo
 %%PYTHON_SITELIBDIR%%/impacket/__init__.py
 %%PYTHON_SITELIBDIR%%/impacket/__init__.pyc
 %%PYTHON_SITELIBDIR%%/impacket/__init__.pyo
+%%PYTHON_SITELIBDIR%%/impacket/cdp.py
+%%PYTHON_SITELIBDIR%%/impacket/cdp.pyc
+%%PYTHON_SITELIBDIR%%/impacket/cdp.pyo
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/atsvc.py
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/atsvc.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/atsvc.pyo
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/conv.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/conv.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/conv.pyo
@@ -41,6 +78,12 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/epm.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/epm.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/epm.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/lsarpc.py
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/lsarpc.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/lsarpc.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/mgmt.py
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/mgmt.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/mgmt.pyo
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/ndrutils.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/ndrutils.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/ndrutils.pyo
@@ -53,6 +96,9 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvc.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvc.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvc.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvcserver.py
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvcserver.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/srvsvcserver.pyo
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/svcctl.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/svcctl.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/svcctl.pyo
@@ -62,26 +108,51 @@ bin/win_echod.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/winreg.py
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/winreg.pyc
 %%PYTHON_SITELIBDIR%%/impacket/dcerpc/winreg.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/wkssvc.py
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/wkssvc.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dcerpc/wkssvc.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dhcp.py
+%%PYTHON_SITELIBDIR%%/impacket/dhcp.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dhcp.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dns.py
+%%PYTHON_SITELIBDIR%%/impacket/dns.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dns.pyo
+%%PYTHON_SITELIBDIR%%/impacket/dot11.py
+%%PYTHON_SITELIBDIR%%/impacket/dot11.pyc
+%%PYTHON_SITELIBDIR%%/impacket/dot11.pyo
+%%PYTHON_SITELIBDIR%%/impacket/examples/__init__.py
+%%PYTHON_SITELIBDIR%%/impacket/examples/__init__.pyc
+%%PYTHON_SITELIBDIR%%/impacket/examples/__init__.pyo
+%%PYTHON_SITELIBDIR%%/impacket/examples/remcomsvc.py
+%%PYTHON_SITELIBDIR%%/impacket/examples/remcomsvc.pyc
+%%PYTHON_SITELIBDIR%%/impacket/examples/remcomsvc.pyo
+%%PYTHON_SITELIBDIR%%/impacket/examples/serviceinstall.py
+%%PYTHON_SITELIBDIR%%/impacket/examples/serviceinstall.pyc
+%%PYTHON_SITELIBDIR%%/impacket/examples/serviceinstall.pyo
 %%PYTHON_SITELIBDIR%%/impacket/nmb.py
 %%PYTHON_SITELIBDIR%%/impacket/nmb.pyc
 %%PYTHON_SITELIBDIR%%/impacket/nmb.pyo
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.py
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.pyc
 %%PYTHON_SITELIBDIR%%/impacket/ntlm.pyo
+%%PYTHON_SITELIBDIR%%/impacket/pcapfile.py
+%%PYTHON_SITELIBDIR%%/impacket/pcapfile.pyc
+%%PYTHON_SITELIBDIR%%/impacket/pcapfile.pyo
 %%PYTHON_SITELIBDIR%%/impacket/smb.py
 %%PYTHON_SITELIBDIR%%/impacket/smb.pyc
 %%PYTHON_SITELIBDIR%%/impacket/smb.pyo
+%%PYTHON_SITELIBDIR%%/impacket/smbserver.py
+%%PYTHON_SITELIBDIR%%/impacket/smbserver.pyc
+%%PYTHON_SITELIBDIR%%/impacket/smbserver.pyo
 %%PYTHON_SITELIBDIR%%/impacket/structure.py
 %%PYTHON_SITELIBDIR%%/impacket/structure.pyc
 %%PYTHON_SITELIBDIR%%/impacket/structure.pyo
 %%PYTHON_SITELIBDIR%%/impacket/uuid.py
 %%PYTHON_SITELIBDIR%%/impacket/uuid.pyc
 %%PYTHON_SITELIBDIR%%/impacket/uuid.pyo
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/New SMB and DCERPC features in Impacket.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SMBCommands.dot
-%%PORTDOCS%%%%DOCSDIR%%/SMBCommands.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PYTHON_SITELIBDIR%%/impacket/version.py
+%%PYTHON_SITELIBDIR%%/impacket/version.pyc
+%%PYTHON_SITELIBDIR%%/impacket/version.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/impacket/examples
 @dirrm %%PYTHON_SITELIBDIR%%/impacket/dcerpc
 @dirrm %%PYTHON_SITELIBDIR%%/impacket