ports/136160: [net/scapy] Add config options and fix a bug with VPython

[Aurélien Ansel]

>Number:         136160
>Category:       ports
>Synopsis:       [net/scapy] Add config options and fix a bug with VPython
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 29 13:00:13 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Aurélien Ansel
>Release:        7.2-STABLE
>Organization:
NETASQ
>Environment:
FreeBSD aureliena2.netasq.com 7.2-STABLE FreeBSD 7.2-STABLE #11: Thu Jun 11 15:46:45 CEST 2009     root at aureliena2.netasq.com:/usr/obj/usr/src/sys/NOYAU  i386
>Description:
_ Add some options for 'make config'
_ Fix 2 dependencies (Queso and Nmap)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rNu /usr/ports/net/scapy/Makefile port/Makefile
--- /usr/ports/net/scapy/Makefile	2009-06-25 04:15:46.000000000 +0200
+++ port/Makefile	2009-06-29 12:02:19.000000000 +0200
@@ -8,6 +8,7 @@
 
 PORTNAME=	scapy
 PORTVERSION=	2.0.1
+PORTREVISION=   1
 CATEGORIES=	net
 MASTER_SITES=	http://secdev.org/projects/scapy/files/
 
@@ -26,10 +27,13 @@
 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 \
+		GRAPH	"Support for graph generation and visualization" 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
+		MANUF "Support for wireshark's MANUF MAC database" off \
+		VPYTHON "Support for 3D representation of traceroute" off \
+		SOX "Support for VoIP" off
 
 .include <bsd.port.pre.mk>
 
@@ -45,22 +49,36 @@
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:${PORTSDIR}/math/py-gnuplot
 .endif
 
+.if defined(WITH_GRAPH)
+RUN_DEPENDS+=	${LOCALBASE}/bin/MagickCore-config:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+.endif
+
 .if defined(WITH_P0F_BASE)
 RUN_DEPENDS+=	${LOCALBASE}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f
 .endif
 
 .if defined(WITH_QUESO_BASE)
-RUN_DEPENDS+=	${LOCALBASE}/etc/queso.conf:${PORTSDIR}/net/queso
+RUN_DEPENDS+=	${LOCALBASE}/etc/queso.conf.sample:${PORTSDIR}/net/queso
 .endif
 
 .if defined(WITH_NMAP)
-RUN_DEPENDS+=	${LOCALBASE}/share/nmap/nmap-os-fingerprints:${PORTSDIR}/security/nmap
+RUN_DEPENDS+=	${LOCALBASE}/share/nmap/nmap-os-db:${PORTSDIR}/security/nmap
 .endif
 
 .if defined(WITH_MANUF)
 RUN_DEPENDS+=	${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark
 .endif
 
+.if defined(WITH_VPYTHON)
+RUN_DEPENDS+=   ${LOCALBASE}/bin/vpython:${PORTSDIR}/graphics/py-visual
+.endif
+
+.if defined(WITH_SOX)
+RUN_DEPENDS+=	${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox
+.endif
+
+
 SCAPY_MODULES=	nmap.py p0f.py queso.py
 
 post-patch:
diff -rNu /usr/ports/net/scapy/files/patch-layers-inet.py port/files/patch-layers-inet.py
--- /usr/ports/net/scapy/files/patch-layers-inet.py	1970-01-01 01:00:00.000000000 +0100
+++ port/files/patch-layers-inet.py	2009-06-29 14:38:32.000000000 +0200
@@ -0,0 +1,11 @@
+--- 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 = {}


>Release-Note:
>Audit-Trail:
>Unformatted: