13 files changed, 79 insertions, 75 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index f7c9d6960a52..8317d875b5c6 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -7,8 +7,7 @@
 # TODO: - configurable --enable-xxx for various additional dependancies
 
 PORTNAME=	scapy
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.1.0
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index 986d945cfe5a..2d0a3183da4d 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,3 +1,3 @@
-MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb
-SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1
-SIZE (scapy-2.0.1.tar.gz) = 864953
+MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1
+SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
+SIZE (scapy-2.1.0.tar.gz) = 956785
diff --git a/net/scapy/files/patch-layers-inet.py b/net/scapy/files/patch-layers-inet.py
deleted file mode 100644
index 5d2145b5e5cc..000000000000
--- a/net/scapy/files/patch-layers-inet.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- scapy/layers/inet.py.orig	2009-05-25 14:36:27.000000000 +0200
-+++ scapy/layers/inet.py	2009-05-25 14:36:30.000000000 +0200
-@@ -780,7 +780,7 @@
-                 self.label.visible ^= 1
- 
-         visual.scene = visual.display()
--        visual.scene.exit_on_close(0)
-+        #visual.scene.exit_on_close(0)
-         start = visual.box()
-         rings={}
-         tr3d = {}
diff --git a/net/scapy/files/patch-scapy-sendrecv.py b/net/scapy/files/patch-scapy-sendrecv.py
deleted file mode 100644
index e44447c0ccc5..000000000000
--- a/net/scapy/files/patch-scapy-sendrecv.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- scapy/sendrecv.py.orig	2009-07-15 18:19:31.000000000 +0200
-+++ scapy/sendrecv.py	2009-07-15 18:19:46.000000000 +0200
-@@ -9,7 +9,7 @@
- from arch import *
- from config import conf
- from packet import Gen
--from utils import warning
-+from utils import warning,PcapReader
- import plist
- from error import log_runtime,log_interactive
- 
diff --git a/net/scapy/files/patch-scapy__data.py b/net/scapy/files/patch-scapy__data.py
new file mode 100644
index 000000000000..2637a240a1a1
--- /dev/null
+++ b/net/scapy/files/patch-scapy__data.py
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000000..92b4ccabb8f8
--- /dev/null
+++ b/net/scapy/files/patch-scapy__modules__nmap.py
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000000..ae1fe3002192
--- /dev/null
+++ b/net/scapy/files/patch-scapy__modules__p0f.py
@@ -0,0 +1,17 @@
+--- ./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
new file mode 100644
index 000000000000..37a7a3edb0af
--- /dev/null
+++ b/net/scapy/files/patch-scapy__modules__queso.py
@@ -0,0 +1,11 @@
+--- ./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
index a384701a321f..b2253ea685d1 100644
--- a/net/scapy/files/patch-scapy_utils6.py
+++ b/net/scapy/files/patch-scapy__utils6.py
@@ -1,11 +1,11 @@
---- scapy/utils6.py.orig	2008-11-12 05:06:52.000000000 +0800
-+++ scapy/utils6.py	2008-11-12 05:07:08.000000000 +0800
-@@ -194,7 +194,7 @@
+--- ./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/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-scapy_config.py b/net/scapy/files/patch-scapy_config.py
deleted file mode 100644
index 8b094230c80c..000000000000
--- a/net/scapy/files/patch-scapy_config.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- scapy/config.py.orig	2009-02-09 17:41:39.000000000 +0500
-+++ scapy/config.py	2009-06-24 16:11:35.000000000 +0600
-@@ -309,7 +309,7 @@
-     services_tcp = TCP_SERVICES
-     services_udp = UDP_SERVICES
-     extensions_paths = "."
--    manufdb = load_manuf("/usr/share/wireshark/manuf")
-+    manufdb = load_manuf("%%LOCALBASE%%/share/wireshark/manuf")
-     stats_classic_protocols = []
-     stats_dot11_protocols = []
-     temp_files = []
diff --git a/net/scapy/files/patch-scapy_modules b/net/scapy/files/patch-scapy_modules
deleted file mode 100644
index 1aa61cf9fd03..000000000000
--- a/net/scapy/files/patch-scapy_modules
+++ /dev/null
@@ -1,33 +0,0 @@
---- scapy/modules/nmap.py.orig	2008-11-12 04:11:51.000000000 +0800
-+++ scapy/modules/nmap.py	2008-11-12 04:14:50.000000000 +0800
-@@ -6,7 +6,7 @@
- from scapy.data import KnowledgeBase
- from scapy.config import conf
- 
--conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
-+conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
- 
- 
- ######################
---- scapy/modules/p0f.py.orig	2008-11-12 04:12:07.000000000 +0800
-+++ scapy/modules/p0f.py	2008-11-12 04:20:49.000000000 +0800
-@@ -6,7 +6,7 @@
- from scapy.data import KnowledgeBase
- from scapy.config import conf
- 
--conf.p0f_base ="/etc/p0f/p0f.fp"
-+conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp"
- 
- 
- ###############
---- scapy/modules/queso.py.orig	2008-11-12 04:12:14.000000000 +0800
-+++ scapy/modules/queso.py	2008-11-12 04:21:04.000000000 +0800
-@@ -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-setup.py b/net/scapy/files/patch-setup.py
new file mode 100644
index 000000000000..be2f492cb21f
--- /dev/null
+++ b/net/scapy/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- ./setup.py.orig	2010-01-05 11:40:22.000000000 +0100
++++ ./setup.py	2010-01-05 11:40:57.000000000 +0100
+@@ -42,7 +42,7 @@
+ setup(
+     name = 'scapy',
+     version = '2.1.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,
+     data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
+ 
diff --git a/net/scapy/pkg-plist b/net/scapy/pkg-plist
index 3cc8354b48e5..b9dbf4ef3d68 100644
--- a/net/scapy/pkg-plist
+++ b/net/scapy/pkg-plist
@@ -60,6 +60,12 @@ bin/scapy
 %%PYTHON_SITELIBDIR%%/scapy/config.py
 %%PYTHON_SITELIBDIR%%/scapy/config.pyc
 %%PYTHON_SITELIBDIR%%/scapy/config.pyo
+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.py
+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.pyc
+%%PYTHON_SITELIBDIR%%/scapy/crypto/__init__.pyo
+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.py
+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.pyc
+%%PYTHON_SITELIBDIR%%/scapy/crypto/cert.pyo
 %%PYTHON_SITELIBDIR%%/scapy/dadict.py
 %%PYTHON_SITELIBDIR%%/scapy/dadict.pyc
 %%PYTHON_SITELIBDIR%%/scapy/dadict.pyo
@@ -195,6 +201,9 @@ bin/scapy
 %%PYTHON_SITELIBDIR%%/scapy/plist.py
 %%PYTHON_SITELIBDIR%%/scapy/plist.pyc
 %%PYTHON_SITELIBDIR%%/scapy/plist.pyo
+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.py
+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.pyc
+%%PYTHON_SITELIBDIR%%/scapy/pton_ntop.pyo
 %%PYTHON_SITELIBDIR%%/scapy/route.py
 %%PYTHON_SITELIBDIR%%/scapy/route.pyc
 %%PYTHON_SITELIBDIR%%/scapy/route.pyo
@@ -231,6 +240,7 @@ bin/scapy
 @dirrm %%PYTHON_SITELIBDIR%%/scapy/tools
 @dirrm %%PYTHON_SITELIBDIR%%/scapy/modules
 @dirrm %%PYTHON_SITELIBDIR%%/scapy/layers
+@dirrm %%PYTHON_SITELIBDIR%%/scapy/crypto
 @dirrm %%PYTHON_SITELIBDIR%%/scapy/asn1
 @dirrm %%PYTHON_SITELIBDIR%%/scapy/arch
 @dirrm %%PYTHON_SITELIBDIR%%/scapy