Attachment #101824 for bug #141471

View | Details | Raw Unified | Return to bug 141471
Collapse All | Expand All

Lines 7-14 Link Here

(-)/tmp/scapy/Makefile 2009-12-15 02:48:27.000000000 +0100 (-3 / +3 lines)
7	# TODO: - configurable --enable-xxx for various additional dependancies	7	# TODO: - configurable --enable-xxx for various additional dependancies
8		8
9	PORTNAME= scapy	9	PORTNAME= scapy
10	PORTVERSION= 2.0.1	10	PORTVERSION= 2.1.0
11	PORTREVISION= 2
12	CATEGORIES= net	11	CATEGORIES= net
13	MASTER_SITES= http://secdev.org/projects/scapy/files/	12	MASTER_SITES= http://secdev.org/projects/scapy/files/
14		13
Lines 85-90 Link Here
85	@${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \	84	@${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \
86	${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \	85	${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \
87	${WRKSRC}/scapy/config.py \	86	${WRKSRC}/scapy/config.py \
88	${WRKSRC}/scapy/utils6.py	87	${WRKSRC}/scapy/utils6.py \
		88	${WRKSRC}/setup.py
89		89
90	.include <bsd.port.post.mk>	90	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/tmp/scapy/distinfo 2009-12-15 03:15:34.000000000 +0100 (-3 / +3 lines)
1	MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb	1	MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1
2	SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1	2	SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
3	SIZE (scapy-2.0.1.tar.gz) = 864953	3	SIZE (scapy-2.1.0.tar.gz) = 956785

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-layers-inet.py 1970-01-01 01:00:00.000000000 +0100 (-11 lines)
1	--- scapy/layers/inet.py.orig 2009-05-25 14:36:27.000000000 +0200
2	+++ scapy/layers/inet.py 2009-05-25 14:36:30.000000000 +0200
3	@@ -780,7 +780,7 @@
4	self.label.visible ^= 1
5
6	visual.scene = visual.display()
7	- visual.scene.exit_on_close(0)
8	+ #visual.scene.exit_on_close(0)
9	start = visual.box()
10	rings={}
11	tr3d = {}

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-scapy-sendrecv.py 1970-01-01 01:00:00.000000000 +0100 (-11 lines)
1	--- scapy/sendrecv.py.orig 2009-07-15 18:19:31.000000000 +0200
2	+++ scapy/sendrecv.py 2009-07-15 18:19:46.000000000 +0200
3	@@ -9,7 +9,7 @@
4	from arch import *
5	from config import conf
6	from packet import Gen
7	-from utils import warning
8	+from utils import warning,PcapReader
9	import plist
10	from error import log_runtime,log_interactive
11




--- ./scapy/data.py.orig        2009-12-15 03:07:30.000000000 +0100
+++ ./scapy/data.py     2009-12-15 03:08:45.000000000 +0100
@@ -6,6 +6,7 @@
 import os,sys,re
 from dadict import DADict
 from error import log_loading
+from scapy.arch import WINDOWS, FREEBSD
 
 ############
 ## Consts ##
@@ -46,9 +47,6 @@
 
 MTU = 0x7fff # a.k.a give me all you have
 
-WINDOWS=sys.platform.startswith("win")
-
- 
 # file parsing to get some values :
 
 def load_protocols(filename):
@@ -174,6 +172,11 @@
     IP_PROTOS=load_protocols(os.environ["SystemRoot"]+"\system32\drivers\etc\protocol")
     TCP_SERVICES,UDP_SERVICES=load_services(os.environ["SystemRoot"] + "\system32\drivers\etc\services")
     MANUFDB = load_manuf(os.environ["ProgramFiles"] + "\\wireshark\\manuf")
+elif FREEBSD:
+    IP_PROTOS=load_protocols("/etc/protocols")
+    ETHER_TYPES=load_ethertypes("/etc/ethertypes")
+    TCP_SERVICES,UDP_SERVICES=load_services("/etc/services")
+    MANUFDB = load_manuf("%%LOCALBASE%%/usr/share/wireshark/wireshark/manuf")
 else:
     IP_PROTOS=load_protocols("/etc/protocols")
     ETHER_TYPES=load_ethertypes("/etc/ethertypes")




--- ./scapy/modules/nmap.py.orig        2009-12-15 03:05:20.000000000 +0100
+++ ./scapy/modules/nmap.py     2009-12-15 03:06:11.000000000 +0100
@@ -7,11 +7,13 @@
 
 from scapy.data import KnowledgeBase
 from scapy.config import conf
-from scapy.arch import WINDOWS
+from scapy.arch import WINDOWS, FREEBSD
 
 
 if WINDOWS:
     conf.nmap_base=os.environ["ProgramFiles"] + "\\nmap\\nmap-os-fingerprints"
+elif FREEBSD:
+    conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
 else:
     conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
 




--- ./scapy/modules/p0f.py.orig 2009-12-15 02:35:29.000000000 +0100
+++ ./scapy/modules/p0f.py      2009-12-15 02:36:37.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"
 
 
 ###############

Line 0 Link Here

(-)/tmp/scapy/files/patch-scapy__modules__queso.py 2009-12-15 02:47:19.000000000 +0100 (+11 lines)
	1	--- ./scapy/modules/queso.py.orig 2009-03-08 13:35:08.000000000 +0100
	2	+++ ./scapy/modules/queso.py 2009-12-15 02:38:01.000000000 +0100
	3	@@ -8,7 +8,7 @@
	4	from scapy.layers.inet import IP,TCP
	5	#from
	6
	7	-conf.queso_base ="/etc/queso.conf"
	8	+conf.queso_base ="%%LOCALBASE%%/etc/queso.conf"
	9
	10
	11	#################

Line 0 Link Here

(-)/tmp/scapy/files/patch-scapy__utils6.py 2009-12-15 02:47:19.000000000 +0100 (+11 lines)
	1	--- ./scapy/utils6.py.orig 2009-12-15 02:27:31.000000000 +0100
	2	+++ ./scapy/utils6.py 2009-12-15 02:28:28.000000000 +0100
	3	@@ -267,7 +267,7 @@
	4	Extract the MAC address from a modified EUI-64 constructed IPv6
	5	address provided and use the IANA oui.txt file to get the vendor.
	6	The database used for the conversion is the one loaded by Scapy,
	7	- based on Wireshark (/usr/share/wireshark/wireshark/manuf) None
	8	+ based on Wireshark (%%LOCALBASE%%/share/wireshark/wireshark/manuf) None
	9	is returned on error, "UNKNOWN" if the vendor is unknown.
	10	"""
	11	mac = in6_addrtomac(addr)

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-scapy_config.py 1970-01-01 01:00:00.000000000 +0100 (-11 lines)
1	--- scapy/config.py.orig 2009-02-09 17:41:39.000000000 +0500
2	+++ scapy/config.py 2009-06-24 16:11:35.000000000 +0600
3	@@ -309,7 +309,7 @@
4	services_tcp = TCP_SERVICES
5	services_udp = UDP_SERVICES
6	extensions_paths = "."
7	- manufdb = load_manuf("/usr/share/wireshark/manuf")
8	+ manufdb = load_manuf("%%LOCALBASE%%/share/wireshark/manuf")
9	stats_classic_protocols = []
10	stats_dot11_protocols = []
11	temp_files = []




--- 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"
 
 
 #################

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-scapy_utils6.py 1970-01-01 01:00:00.000000000 +0100 (-7 lines)
1	--- scapy/utils6.py.orig 2008-11-12 05:06:52.000000000 +0800
2	+++ scapy/utils6.py 2008-11-12 05:07:08.000000000 +0800
3	@@ -194,7 +194,7 @@
4	Extract the MAC address from a modified EUI-64 constructed IPv6
5	address provided and use the IANA oui.txt file to get the vendor.
6	The database used for the conversion is the one loaded by Scapy,
7	- based on Wireshark (/usr/share/wireshark/wireshark/manuf) None

Lines 7-14 Link Here

(-)/tmp/scapy/Makefile 2009-12-15 02:48:27.000000000 +0100 (-3 / +3 lines)
7	# TODO: - configurable --enable-xxx for various additional dependancies	7	# TODO: - configurable --enable-xxx for various additional dependancies
8		8
9	PORTNAME= scapy	9	PORTNAME= scapy
10	PORTVERSION= 2.0.1	10	PORTVERSION= 2.1.0
11	PORTREVISION= 2
12	CATEGORIES= net	11	CATEGORIES= net
13	MASTER_SITES= http://secdev.org/projects/scapy/files/	12	MASTER_SITES= http://secdev.org/projects/scapy/files/
14		13
Lines 85-90 Link Here
85	@${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \	84	@${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \
86	${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \	85	${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \
87	${WRKSRC}/scapy/config.py \	86	${WRKSRC}/scapy/config.py \
88	${WRKSRC}/scapy/utils6.py	87	${WRKSRC}/scapy/utils6.py \
		88	${WRKSRC}/setup.py
89		89
90	.include <bsd.port.post.mk>	90	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/tmp/scapy/distinfo 2009-12-15 03:15:34.000000000 +0100 (-3 / +3 lines)
1	MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb	1	MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1
2	SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1	2	SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
3	SIZE (scapy-2.0.1.tar.gz) = 864953	3	SIZE (scapy-2.1.0.tar.gz) = 956785

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-layers-inet.py 1970-01-01 01:00:00.000000000 +0100 (-11 lines)
1	--- scapy/layers/inet.py.orig 2009-05-25 14:36:27.000000000 +0200
2	+++ scapy/layers/inet.py 2009-05-25 14:36:30.000000000 +0200
3	@@ -780,7 +780,7 @@
4	self.label.visible ^= 1
5
6	visual.scene = visual.display()
7	- visual.scene.exit_on_close(0)
8	+ #visual.scene.exit_on_close(0)
9	start = visual.box()
10	rings={}
11	tr3d = {}

Lines 1-11 Link Here

(-)/tmp/scapy/files/patch-scapy-sendrecv.py 1970-01-01 01:00:00.000000000 +0100 (-2 lines)
1	--- scapy/sendrecv.py.orig 2009-07-15 18:19:31.000000000 +0200
2	+++ scapy/sendrecv.py 2009-07-15 18:19:46.000000000 +0200

Return to bug 141471

Line 0 Link Here

(-)/tmp/scapy/files/patch-scapy__data.py 2009-12-15 03:08:56.000000000 +0100 (+32 lines)
	1	--- ./scapy/data.py.orig 2009-12-15 03:07:30.000000000 +0100
	2	+++ ./scapy/data.py 2009-12-15 03:08:45.000000000 +0100
	3	@@ -6,6 +6,7 @@
	4	import os,sys,re
	5	from dadict import DADict
	6	from error import log_loading
	7	+from scapy.arch import WINDOWS, FREEBSD
	8
	9	############
	10	## Consts ##
	11	@@ -46,9 +47,6 @@
	12
	13	MTU = 0x7fff # a.k.a give me all you have
	14
	15	-WINDOWS=sys.platform.startswith("win")
	16	-
	17	-
	18	# file parsing to get some values :
	19
	20	def load_protocols(filename):
	21	@@ -174,6 +172,11 @@
	22	IP_PROTOS=load_protocols(os.environ["SystemRoot"]+"\system32\drivers\etc\protocol")
	23	TCP_SERVICES,UDP_SERVICES=load_services(os.environ["SystemRoot"] + "\system32\drivers\etc\services")
	24	MANUFDB = load_manuf(os.environ["ProgramFiles"] + "\\wireshark\\manuf")
	25	+elif FREEBSD:
	26	+ IP_PROTOS=load_protocols("/etc/protocols")
	27	+ ETHER_TYPES=load_ethertypes("/etc/ethertypes")
	28	+ TCP_SERVICES,UDP_SERVICES=load_services("/etc/services")
	29	+ MANUFDB = load_manuf("%%LOCALBASE%%/usr/share/wireshark/wireshark/manuf")
	30	else:
	31	IP_PROTOS=load_protocols("/etc/protocols")
	32	ETHER_TYPES=load_ethertypes("/etc/ethertypes")

Line 0 Link Here

(-)/tmp/scapy/files/patch-scapy__modules__nmap.py 2009-12-15 03:08:56.000000000 +0100 (+17 lines)
	1	--- ./scapy/modules/nmap.py.orig 2009-12-15 03:05:20.000000000 +0100
	2	+++ ./scapy/modules/nmap.py 2009-12-15 03:06:11.000000000 +0100
	3	@@ -7,11 +7,13 @@
	4
	5	from scapy.data import KnowledgeBase
	6	from scapy.config import conf
	7	-from scapy.arch import WINDOWS
	8	+from scapy.arch import WINDOWS, FREEBSD
	9
	10
	11	if WINDOWS:
	12	conf.nmap_base=os.environ["ProgramFiles"] + "\\nmap\\nmap-os-fingerprints"
	13	+elif FREEBSD:
	14	+ conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
	15	else:
	16	conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
	17

Line 0 Link Here

(-)/tmp/scapy/files/patch-scapy__modules__p0f.py 2009-12-15 02:47:19.000000000 +0100 (+17 lines)
	1	--- ./scapy/modules/p0f.py.orig 2009-12-15 02:35:29.000000000 +0100
	2	+++ ./scapy/modules/p0f.py 2009-12-15 02:36:37.000000000 +0100
	3	@@ -8,10 +8,10 @@
	4	from scapy.layers.inet import IP, TCP, TCPOptions
	5	from scapy.packet import NoPayload
	6
	7	-conf.p0f_base ="/etc/p0f/p0f.fp"
	8	-conf.p0fa_base ="/etc/p0f/p0fa.fp"
	9	-conf.p0fr_base ="/etc/p0f/p0fr.fp"
	10	-conf.p0fo_base ="/etc/p0f/p0fo.fp"
	11	+conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp"
	12	+conf.p0fa_base ="%%LOCALBASE%%/etc/p0f/p0fa.fp"
	13	+conf.p0fr_base ="%%LOCALBASE%%/etc/p0f/p0fr.fp"
	14	+conf.p0fo_base ="%%LOCALBASE%%/etc/p0f/p0fo.fp"
	15
	16
	17	###############

Lines 1-33 Link Here

(-)/tmp/scapy/files/patch-scapy_modules 1970-01-01 01:00:00.000000000 +0100 (-33 lines)
1	--- scapy/modules/nmap.py.orig 2008-11-12 04:11:51.000000000 +0800
2	+++ scapy/modules/nmap.py 2008-11-12 04:14:50.000000000 +0800
3	@@ -6,7 +6,7 @@
4	from scapy.data import KnowledgeBase
5	from scapy.config import conf
6
7	-conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
8	+conf.nmap_base ="%%LOCALBASE%%/share/nmap/nmap-os-fingerprints"
9
10
11	######################
12	--- scapy/modules/p0f.py.orig 2008-11-12 04:12:07.000000000 +0800
13	+++ scapy/modules/p0f.py 2008-11-12 04:20:49.000000000 +0800
14	@@ -6,7 +6,7 @@
15	from scapy.data import KnowledgeBase
16	from scapy.config import conf
17
18	-conf.p0f_base ="/etc/p0f/p0f.fp"
19	+conf.p0f_base ="%%LOCALBASE%%/etc/p0f/p0f.fp"
20
21
22	###############
23	--- scapy/modules/queso.py.orig 2008-11-12 04:12:14.000000000 +0800
24	+++ scapy/modules/queso.py 2008-11-12 04:21:04.000000000 +0800
25	@@ -8,7 +8,7 @@
26	from scapy.layers.inet import IP,TCP
27	#from
28
29	-conf.queso_base ="/etc/queso.conf"
30	+conf.queso_base ="%%LOCALBASE%%/etc/queso.conf"
31
32
33	#################