- Update to 2.2.0

Pr:		155151
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Approved by:	maintainer

8 files changed, 12 insertions, 75 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 025e8d177215..9636410b703c 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -7,7 +7,7 @@
 # TODO: - configurable --enable-xxx for various additional dependancies
 
 PORTNAME=	scapy
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
@@ -77,13 +77,12 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/vpython:${PORTSDIR}/graphics/py-visual
 RUN_DEPENDS+=	${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox
 .endif
 
-SCAPY_MODULES=	nmap.py p0f.py queso.py
-
 post-patch:
 	@${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \
-		${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \
-		${WRKSRC}/scapy/config.py \
-		${WRKSRC}/scapy/utils6.py
+	@${REINPLACE_CMD} "s,/usr/share/,${LOCALBASE}/share/," \
+		${WRKSRC}/scapy/data.py ${WRKSRC}/scapy/utils6.py \
+		${WRKSRC}/scapy/modules/nmap.py
+	@${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \
+		${WRKSRC}/scapy/modules/p0f.py ${WRKSRC}/scapy/modules/queso.py
 
 .include <bsd.port.post.mk>
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index 2173e396b73d..69af046df794 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,3 +1,2 @@
-MD5 (scapy-2.1.1.tar.gz) = 7b4452786788cb75ade841c30276a2d3
-SHA256 (scapy-2.1.1.tar.gz) = 7fb576e16c3f05c9be726475382cdbd4c91cdb4277029e92a5cdccf479c2f3eb
-SIZE (scapy-2.1.1.tar.gz) = 1924541
+SHA256 (scapy-2.2.0.tar.gz) = c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af
+SIZE (scapy-2.2.0.tar.gz) = 972996
diff --git a/net/scapy/files/patch-scapy__data.py b/net/scapy/files/patch-scapy__data.py
deleted file mode 100644
index 2637a240a1a1..000000000000
--- a/net/scapy/files/patch-scapy__data.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scapy/data.py.orig	2010-01-05 11:34:28.000000000 +0100
-+++ ./scapy/data.py	2010-01-05 11:35:09.000000000 +0100
-@@ -178,7 +178,7 @@
-     IP_PROTOS=load_protocols("/etc/protocols")
-     ETHER_TYPES=load_ethertypes("/etc/ethertypes")
-     TCP_SERVICES,UDP_SERVICES=load_services("/etc/services")
--    MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf")
-+    MANUFDB = load_manuf("%%LOCALBASE%%/share/wireshark/wireshark/manuf")
- 
- 
- 
diff --git a/net/scapy/files/patch-scapy__modules__nmap.py b/net/scapy/files/patch-scapy__modules__nmap.py
deleted file mode 100644
index 92b4ccabb8f8..000000000000
--- a/net/scapy/files/patch-scapy__modules__nmap.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scapy/modules/nmap.py.orig	2010-01-05 11:35:33.000000000 +0100
-+++ ./scapy/modules/nmap.py	2010-01-05 11:36:28.000000000 +0100
-@@ -13,7 +13,7 @@
- if WINDOWS:
-     conf.nmap_base=os.environ["ProgramFiles"] + "\\nmap\\nmap-os-fingerprints"
- else:
--    conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
-+    conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
- 
- 
- ######################
diff --git a/net/scapy/files/patch-scapy__modules__p0f.py b/net/scapy/files/patch-scapy__modules__p0f.py
deleted file mode 100644
index ae1fe3002192..000000000000
--- a/net/scapy/files/patch-scapy__modules__p0f.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./scapy/modules/p0f.py.orig	2010-01-05 11:36:56.000000000 +0100
-+++ ./scapy/modules/p0f.py	2010-01-05 11:37:50.000000000 +0100
-@@ -8,10 +8,10 @@
- from scapy.layers.inet import IP, TCP, TCPOptions
- from scapy.packet import NoPayload
- 
--conf.p0f_base ="/etc/p0f/p0f.fp"
--conf.p0fa_base ="/etc/p0f/p0fa.fp"
--conf.p0fr_base ="/etc/p0f/p0fr.fp"
--conf.p0fo_base ="/etc/p0f/p0fo.fp"
-+conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp"
-+conf.p0fa_base ="%%LOCALBASE%%/etc/p0f/p0fa.fp"
-+conf.p0fr_base ="%%LOCALBASE%%/etc/p0f/p0fr.fp"
-+conf.p0fo_base ="%%LOCALBASE%%/etc/p0f/p0fo.fp"
- 
- 
- ###############
diff --git a/net/scapy/files/patch-scapy__modules__queso.py b/net/scapy/files/patch-scapy__modules__queso.py
deleted file mode 100644
index 37a7a3edb0af..000000000000
--- a/net/scapy/files/patch-scapy__modules__queso.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scapy/modules/queso.py.orig	2010-01-05 11:38:01.000000000 +0100
-+++ ./scapy/modules/queso.py	2010-01-05 11:38:14.000000000 +0100
-@@ -8,7 +8,7 @@
- from scapy.layers.inet import IP,TCP
- #from 
- 
--conf.queso_base ="/etc/queso.conf"
-+conf.queso_base ="%%LOCALBASE%%/etc/queso.conf"
- 
- 
- #################
diff --git a/net/scapy/files/patch-scapy__utils6.py b/net/scapy/files/patch-scapy__utils6.py
deleted file mode 100644
index b2253ea685d1..000000000000
--- a/net/scapy/files/patch-scapy__utils6.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./scapy/utils6.py.orig	2010-01-05 11:38:37.000000000 +0100
-+++ ./scapy/utils6.py	2010-01-05 11:39:13.000000000 +0100
-@@ -267,7 +267,7 @@
-     Extract the MAC address from a modified EUI-64 constructed IPv6
-     address provided and use the IANA oui.txt file to get the vendor.
-     The database used for the conversion is the one loaded by Scapy,
--    based on Wireshark (/usr/share/wireshark/wireshark/manuf)  None
-+    based on Wireshark (%%LOCALBASE%%/share/wireshark/wireshark/manuf)  None
-     is returned on error, "UNKNOWN" if the vendor is unknown.
-     """
-     mac = in6_addrtomac(addr)
diff --git a/net/scapy/files/patch-setup.py b/net/scapy/files/patch-setup.py
index dd5570dc599d..36218b59773c 100644
--- a/net/scapy/files/patch-setup.py
+++ b/net/scapy/files/patch-setup.py
@@ -1,9 +1,9 @@
---- setup.py	2010-04-10 02:42:04.000000000 +0400
-+++ setup.py	2010-07-22 21:17:18.000000000 +0400
-@@ -42,7 +42,7 @@
+--- setup.py.orig	2011-02-28 05:11:55.000000000 +0300
++++ setup.py	2011-03-01 13:11:36.000000000 +0300
+@@ -47,7 +47,7 @@
  setup(
      name = 'scapy',
-     version = '2.1.1',
+     version = '2.2.0',
 -    packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
 +    packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
      scripts = SCRIPTS,