- Update to 2.0.0.10

PR:		ports/128802
Submitted by:	Yi-Jheng Lin <yzlin AT cs.nctu.edu.tw>
Approved by:	vanhu AT netasq.com (maintainer)

4 files changed, 55 insertions, 24 deletions

diff --git a/net/scapy/files/patch-scapy.py b/net/scapy/files/patch-scapy.py
deleted file mode 100644
index 6caccc511708..000000000000
--- a/net/scapy/files/patch-scapy.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- /usr/ports/net/scapy/work/scapy-1.1.1/scapy.py	Mon Apr  9 13:17:35 2007
-+++ scapy.py	Sat Apr 21 22:24:12 2007
-@@ -482,7 +482,7 @@
-         pass
-     return manufdb
-     
--MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf")
-+MANUFDB = load_manuf("/usr/local/share/wireshark/manuf")
- 
- 
- 
-@@ -11856,9 +11856,9 @@
-     BTsocket = BluetoothL2CAPSocket
-     histfile = os.path.join(os.environ["HOME"], ".scapy_history")
-     padding = 1
--    p0f_base ="/etc/p0f/p0f.fp"
--    queso_base ="/etc/queso.conf"
--    nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
-+    p0f_base ="/usr/local/etc/p0f/p0f.fp"
-+    queso_base ="/usr/local/etc/queso.conf"
-+    nmap_base ="/usr/local/share/nmap/nmap-os-fingerprints"
-     IPCountry_base = "GeoIPCountry4Scapy.gz"
-     countryLoc_base = "countryLoc.csv"
-     gnuplot_world = "world.dat"
diff --git a/net/scapy/files/patch-scapy_config.py b/net/scapy/files/patch-scapy_config.py
new file mode 100644
index 000000000000..9b1ed49b270a
--- /dev/null
+++ b/net/scapy/files/patch-scapy_config.py
@@ -0,0 +1,11 @@
+--- scapy/config.py.orig	2008-11-12 05:01:38.000000000 +0800
++++ scapy/config.py	2008-11-12 05:01:59.000000000 +0800
+@@ -308,7 +308,7 @@
+     services_tcp = TCP_SERVICES
+     services_udp = UDP_SERVICES
+     extensions_paths = "."
+-    manufdb = load_manuf("/usr/share/wireshark/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
new file mode 100644
index 000000000000..1aa61cf9fd03
--- /dev/null
+++ b/net/scapy/files/patch-scapy_modules
@@ -0,0 +1,33 @@
+--- 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-scapy_utils6.py b/net/scapy/files/patch-scapy_utils6.py
new file mode 100644
index 000000000000..a384701a321f
--- /dev/null
+++ b/net/scapy/files/patch-scapy_utils6.py
@@ -0,0 +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 @@
+     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
+     is returned on error, "UNKNOWN" if the vendor is unknown.
+     """
+     mac = in6_addrtomac(addr)