- Add optional dependencies on p0f, nmap, queso and wireshark's databases

- Correct database files locations
- Bump PORTREVISION

PR:		111989
Submitted by:	"R.Mahmatkhanov" <R.Mahmatkhanov AT SKYLINK.ru>
Approved by:	VANHULLEBUS Yvan <yvan.vanhullebus AT netasq.com> (maintainer)
		clsung (mentor, implicitly)

2 files changed, 46 insertions, 1 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 12fb08f530ba..c53b6d73a735 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	scapy
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
@@ -27,7 +28,11 @@ NO_BUILD=	yes
 
 OPTIONS=	PYX "Support for PostScript and PDF graphs drawing" off \
 		PYCRYPTO "Support for py-crypto for WEP decoding" off \
-		PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off
+		PYGNUPLOT "Support for py-gnuplot wrapper to plot graphs" off \
+		P0F_BASE "Support for p0f OS signatures database" off \
+		QUESO_BASE "Support for queso OS signatures database" off \
+		NMAP "Support for nmap OS signatures database" off \
+		MANUF "Support for wireshark's MANUF MAC database" off
 
 .include <bsd.port.pre.mk>
 
@@ -43,6 +48,22 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-py
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot
 .endif
 
+.if defined(WITH_P0F_BASE)
+RUN_DEPENDS+=	${PREFIX}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f
+.endif
+
+.if defined(WITH_QUESO_BASE)
+RUN_DEPENDS+=	${PREFIX}/etc/queso.conf:${PORTSDIR}/net/queso
+.endif
+
+.if defined(WITH_NMAP)
+RUN_DEPENDS+=	${PREFIX}/share/nmap/nmap-os-fingerprints:${PORTSDIR}/security/nmap
+.endif
+
+.if defined(WITH_MANUF)
+RUN_DEPENDS+=	${PREFIX}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
+.endif
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scapy.py ${PREFIX}/bin/scapy
 	${INSTALL_MAN} ${WRKSRC}/scapy.1 ${MAN1PREFIX}/man/man1
diff --git a/net/scapy/files/patch-scapy.py b/net/scapy/files/patch-scapy.py
new file mode 100644
index 000000000000..6caccc511708
--- /dev/null
+++ b/net/scapy/files/patch-scapy.py
@@ -0,0 +1,24 @@
+--- /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"