From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 21 19:30:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D705816A401 for ; Sat, 21 Apr 2007 19:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id B7A0E13C4BA for ; Sat, 21 Apr 2007 19:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3LJU2sZ071905 for ; Sat, 21 Apr 2007 19:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3LJU22p071904; Sat, 21 Apr 2007 19:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 21 Apr 2007 19:30:02 GMT Resent-Message-Id: <200704211930.l3LJU22p071904@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "R.Mahmatkhanov" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5804C16A400 for ; Sat, 21 Apr 2007 19:24:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 3E23E13C455 for ; Sat, 21 Apr 2007 19:24:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l3LJNxhM061347 for ; Sat, 21 Apr 2007 19:23:59 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l3LJIw8U060695; Sat, 21 Apr 2007 19:18:58 GMT (envelope-from nobody) Message-Id: <200704211918.l3LJIw8U060695@www.freebsd.org> Date: Sat, 21 Apr 2007 19:18:58 GMT From: "R.Mahmatkhanov" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/111989: [PATCH] net/scapy: add some options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Apr 2007 19:30:03 -0000 >Number: 111989 >Category: ports >Synopsis: [PATCH] net/scapy: add some options >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: Sat Apr 21 19:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: R.Mahmatkhanov >Release: 6.2-STABLE >Organization: SkyLink >Environment: FreeBSD 6.2-STABLE i386 >Description: - Add optional dependencies on p0f, nmap, queso and wireshark's databases (inspired by this comment in Makefile: """ TODO: - configurable --enable-xxx for various additional dependancies """ ). - Correct database files locations. - Bump PORTREVISION. >How-To-Repeat: >Fix: - After patch applying create ``files'' subdirectory in net/scapy. Then move created patch-scapy.py into net/scapy/files subdirectory. Patch attached with submission follows: diff -ruN /usr/ports/net/scapy/Makefile scapy/new/Makefile --- /usr/ports/net/scapy/Makefile Tue Apr 17 19:41:37 2007 +++ scapy/new/Makefile Sat Apr 21 22:54:46 2007 @@ -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 @@ 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 @@ -41,6 +46,22 @@ .if defined(WITH_PYGNUPLOT) 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: diff -ruN /usr/ports/net/scapy/files/patch-scapy.py scapy/new/files/patch-scapy.py --- /usr/ports/net/scapy/files/patch-scapy.py Thu Jan 1 00:00:00 1970 +++ scapy/new/files/patch-scapy.py Sat Apr 21 22:55:54 2007 @@ -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" >Release-Note: >Audit-Trail: >Unformatted: