Attachment #77825 for bug #111989

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

Lines 8-13 Link Here

(-)scapy/new/Makefile (-1 / +22 lines)
8		8
9	PORTNAME= scapy	9	PORTNAME= scapy
10	PORTVERSION= 1.1.1	10	PORTVERSION= 1.1.1
		11	PORTREVISION= 1
11	CATEGORIES= net	12	CATEGORIES= net
12	MASTER_SITES= http://secdev.org/projects/scapy/files/	13	MASTER_SITES= http://secdev.org/projects/scapy/files/
13		14
Lines 27-33 Link Here
27		28
28	OPTIONS= PYX "Support for PostScript and PDF graphs drawing" off \	29	OPTIONS= PYX "Support for PostScript and PDF graphs drawing" off \
29	PYCRYPTO "Support for py-crypto for WEP decoding" off \	30	PYCRYPTO "Support for py-crypto for WEP decoding" off \
30	PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off	31	PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off \
		32	P0F_BASE "Support for p0f OS signatures database" off \
		33	QUESO_BASE "Support for queso OS signatures database" off \
		34	NMAP "Support for nmap OS signatures database" off \
		35	MANUF "Support for wireshark's MANUF MAC database" off
31		36
32	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
33		38
Lines 41-46 Link Here
41		46
42	.if defined(WITH_PYGNUPLOT)	47	.if defined(WITH_PYGNUPLOT)
43	RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot	48	RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot
		49	.endif
		50
		51	.if defined(WITH_P0F_BASE)
		52	RUN_DEPENDS+= ${PREFIX}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f
		53	.endif
		54
		55	.if defined(WITH_QUESO_BASE)
		56	RUN_DEPENDS+= ${PREFIX}/etc/queso.conf:${PORTSDIR}/net/queso
		57	.endif
		58
		59	.if defined(WITH_NMAP)
		60	RUN_DEPENDS+= ${PREFIX}/share/nmap/nmap-os-fingerprints:${PORTSDIR}/security/nmap
		61	.endif
		62
		63	.if defined(WITH_MANUF)
		64	RUN_DEPENDS+= ${PREFIX}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
44	.endif	65	.endif
45		66
46	do-install:	67	do-install:




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

Return to bug 111989

Line 0 Link Here

(-)scapy/new/files/patch-scapy.py (+24 lines)
	1	--- /usr/ports/net/scapy/work/scapy-1.1.1/scapy.py Mon Apr 9 13:17:35 2007
	2	+++ scapy.py Sat Apr 21 22:24:12 2007
	3	@@ -482,7 +482,7 @@
	4	pass
	5	return manufdb
	6
	7	-MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf")
	8	+MANUFDB = load_manuf("/usr/local/share/wireshark/manuf")
	9
	10
	11
	12	@@ -11856,9 +11856,9 @@
	13	BTsocket = BluetoothL2CAPSocket
	14	histfile = os.path.join(os.environ["HOME"], ".scapy_history")
	15	padding = 1
	16	- p0f_base ="/etc/p0f/p0f.fp"
	17	- queso_base ="/etc/queso.conf"
	18	- nmap_base ="/usr/share/nmap/nmap-os-fingerprints"
	19	+ p0f_base ="/usr/local/etc/p0f/p0f.fp"
	20	+ queso_base ="/usr/local/etc/queso.conf"
	21	+ nmap_base ="/usr/local/share/nmap/nmap-os-fingerprints"
	22	IPCountry_base = "GeoIPCountry4Scapy.gz"
	23	countryLoc_base = "countryLoc.csv"
	24	gnuplot_world = "world.dat"