From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 15 02:40:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8086A1065693 for ; Tue, 15 Dec 2009 02:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 431388FC24 for ; Tue, 15 Dec 2009 02:40:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBF2e3GS099000 for ; Tue, 15 Dec 2009 02:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBF2e3hf098999; Tue, 15 Dec 2009 02:40:03 GMT (envelope-from gnats) Resent-Date: Tue, 15 Dec 2009 02:40:03 GMT Resent-Message-Id: <200912150240.nBF2e3hf098999@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, Sofian Brabez Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5187D106566B for ; Tue, 15 Dec 2009 02:31:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 3615A8FC08 for ; Tue, 15 Dec 2009 02:31:44 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nBF2Vimd049914 for ; Tue, 15 Dec 2009 02:31:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nBF2VisD049913; Tue, 15 Dec 2009 02:31:44 GMT (envelope-from nobody) Message-Id: <200912150231.nBF2VisD049913@www.freebsd.org> Date: Tue, 15 Dec 2009 02:31:44 GMT From: Sofian Brabez To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/141471: [patch] net/scapy : update to 2.1.0 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: Tue, 15 Dec 2009 02:40:03 -0000 >Number: 141471 >Category: ports >Synopsis: [patch] net/scapy : update to 2.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Dec 15 02:40:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sofian Brabez >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: FreeBSD freebsd.ifr.lan 7.2-STABLE FreeBSD 7.2-STABLE #2: Thu Nov 19 01:59:45 CET 2009 root@freebsd.ifr.lan:/usr/obj/usr/src/sys/FREEBSD i386 >Description: - Update to 2.1.0 - Remove unnecessary patchs, they're now applied upstream >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN --exclude=CVS /usr/ports/net/scapy/Makefile /tmp/scapy/Makefile --- /usr/ports/net/scapy/Makefile 2009-07-28 16:11:27.000000000 +0200 +++ /tmp/scapy/Makefile 2009-12-15 02:48:27.000000000 +0100 @@ -7,8 +7,7 @@ # TODO: - configurable --enable-xxx for various additional dependancies PORTNAME= scapy -PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTVERSION= 2.1.0 CATEGORIES= net MASTER_SITES= http://secdev.org/projects/scapy/files/ @@ -85,6 +84,7 @@ @${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \ ${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \ ${WRKSRC}/scapy/config.py \ - ${WRKSRC}/scapy/utils6.py + ${WRKSRC}/scapy/utils6.py \ + ${WRKSRC}/setup.py .include diff -ruN --exclude=CVS /usr/ports/net/scapy/distinfo /tmp/scapy/distinfo --- /usr/ports/net/scapy/distinfo 2009-06-25 04:15:46.000000000 +0200 +++ /tmp/scapy/distinfo 2009-12-15 03:15:34.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb -SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1 -SIZE (scapy-2.0.1.tar.gz) = 864953 +MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1 +SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba +SIZE (scapy-2.1.0.tar.gz) = 956785 diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-layers-inet.py /tmp/scapy/files/patch-layers-inet.py --- /usr/ports/net/scapy/files/patch-layers-inet.py 2009-07-06 16:33:06.000000000 +0200 +++ /tmp/scapy/files/patch-layers-inet.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 = {} diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy-sendrecv.py /tmp/scapy/files/patch-scapy-sendrecv.py --- /usr/ports/net/scapy/files/patch-scapy-sendrecv.py 2009-07-28 16:11:27.000000000 +0200 +++ /tmp/scapy/files/patch-scapy-sendrecv.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- scapy/sendrecv.py.orig 2009-07-15 18:19:31.000000000 +0200 -+++ scapy/sendrecv.py 2009-07-15 18:19:46.000000000 +0200 -@@ -9,7 +9,7 @@ - from arch import * - from config import conf - from packet import Gen --from utils import warning -+from utils import warning,PcapReader - import plist - from error import log_runtime,log_interactive - diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__data.py /tmp/scapy/files/patch-scapy__data.py --- /usr/ports/net/scapy/files/patch-scapy__data.py 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/scapy/files/patch-scapy__data.py 2009-12-15 03:08:56.000000000 +0100 @@ -0,0 +1,32 @@ +--- ./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") diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__nmap.py /tmp/scapy/files/patch-scapy__modules__nmap.py --- /usr/ports/net/scapy/files/patch-scapy__modules__nmap.py 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/scapy/files/patch-scapy__modules__nmap.py 2009-12-15 03:08:56.000000000 +0100 @@ -0,0 +1,17 @@ +--- ./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" + diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__p0f.py /tmp/scapy/files/patch-scapy__modules__p0f.py --- /usr/ports/net/scapy/files/patch-scapy__modules__p0f.py 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/scapy/files/patch-scapy__modules__p0f.py 2009-12-15 02:47:19.000000000 +0100 @@ -0,0 +1,17 @@ +--- ./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" + + + ############### diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__modules__queso.py /tmp/scapy/files/patch-scapy__modules__queso.py --- /usr/ports/net/scapy/files/patch-scapy__modules__queso.py 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/scapy/files/patch-scapy__modules__queso.py 2009-12-15 02:47:19.000000000 +0100 @@ -0,0 +1,11 @@ +--- ./scapy/modules/queso.py.orig 2009-03-08 13:35:08.000000000 +0100 ++++ ./scapy/modules/queso.py 2009-12-15 02:38:01.000000000 +0100 +@@ -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" + + + ################# diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy__utils6.py /tmp/scapy/files/patch-scapy__utils6.py --- /usr/ports/net/scapy/files/patch-scapy__utils6.py 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/scapy/files/patch-scapy__utils6.py 2009-12-15 02:47:19.000000000 +0100 @@ -0,0 +1,11 @@ +--- ./scapy/utils6.py.orig 2009-12-15 02:27:31.000000000 +0100 ++++ ./scapy/utils6.py 2009-12-15 02:28:28.000000000 +0100 +@@ -267,7 +267,7 @@ + Extract the MAC address from a modified EUI-64 constructed IPv6 + address provided and use the IANA oui.txt file to get the vendor. + The database used for the conversion is the one loaded by Scapy, +- based on Wireshark (/usr/share/wireshark/wireshark/manuf) None ++ based on Wireshark (%%LOCALBASE%%/share/wireshark/wireshark/manuf) None + is returned on error, "UNKNOWN" if the vendor is unknown. + """ + mac = in6_addrtomac(addr) diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_config.py /tmp/scapy/files/patch-scapy_config.py --- /usr/ports/net/scapy/files/patch-scapy_config.py 2009-06-25 04:15:46.000000000 +0200 +++ /tmp/scapy/files/patch-scapy_config.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- scapy/config.py.orig 2009-02-09 17:41:39.000000000 +0500 -+++ scapy/config.py 2009-06-24 16:11:35.000000000 +0600 -@@ -309,7 +309,7 @@ - services_tcp = TCP_SERVICES - services_udp = UDP_SERVICES - extensions_paths = "." -- manufdb = load_manuf("/usr/share/wireshark/manuf") -+ manufdb = load_manuf("%%LOCALBASE%%/share/wireshark/manuf") - stats_classic_protocols = [] - stats_dot11_protocols = [] - temp_files = [] diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_modules /tmp/scapy/files/patch-scapy_modules --- /usr/ports/net/scapy/files/patch-scapy_modules 2008-11-19 21:41:56.000000000 +0100 +++ /tmp/scapy/files/patch-scapy_modules 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ ---- 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" - - - ################# diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy_utils6.py /tmp/scapy/files/patch-scapy_utils6.py --- /usr/ports/net/scapy/files/patch-scapy_utils6.py 2008-11-19 21:41:56.000000000 +0100 +++ /tmp/scapy/files/patch-scapy_utils6.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- scapy/utils6.py.orig 2008-11-12 05:06:52.000000000 +0800 -+++ scapy/utils6.py 2008-11-12 05:07:08.000000000 +0800 -@@ -194,7 +194,7 @@ - Extract the MAC address from a modified EUI-64 constructed IPv6 - address provided and use the IANA oui.txt file to get the vendor. - The database used for the conversion is the one loaded by Scapy, -- based on Wireshark (/usr/share/wireshark/wireshark/manuf) None diff -ruN --exclude=CVS /usr/ports/net/scapy/Makefile /tmp/scapy/Makefile --- /usr/ports/net/scapy/Makefile 2009-07-28 16:11:27.000000000 +0200 +++ /tmp/scapy/Makefile 2009-12-15 02:48:27.000000000 +0100 @@ -7,8 +7,7 @@ # TODO: - configurable --enable-xxx for various additional dependancies PORTNAME= scapy -PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTVERSION= 2.1.0 CATEGORIES= net MASTER_SITES= http://secdev.org/projects/scapy/files/ @@ -85,6 +84,7 @@ @${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE}," \ ${SCAPY_MODULES:S,^,${WRKSRC}/scapy/modules/,} \ ${WRKSRC}/scapy/config.py \ - ${WRKSRC}/scapy/utils6.py + ${WRKSRC}/scapy/utils6.py \ + ${WRKSRC}/setup.py .include diff -ruN --exclude=CVS /usr/ports/net/scapy/distinfo /tmp/scapy/distinfo --- /usr/ports/net/scapy/distinfo 2009-06-25 04:15:46.000000000 +0200 +++ /tmp/scapy/distinfo 2009-12-15 03:15:34.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (scapy-2.0.1.tar.gz) = eaf09bce872c835135a8c66327f920cb -SHA256 (scapy-2.0.1.tar.gz) = 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1 -SIZE (scapy-2.0.1.tar.gz) = 864953 +MD5 (scapy-2.1.0.tar.gz) = 357b5b21ea3b4f289a326c0905b715c1 +SHA256 (scapy-2.1.0.tar.gz) = 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba +SIZE (scapy-2.1.0.tar.gz) = 956785 diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-layers-inet.py /tmp/scapy/files/patch-layers-inet.py --- /usr/ports/net/scapy/files/patch-layers-inet.py 2009-07-06 16:33:06.000000000 +0200 +++ /tmp/scapy/files/patch-layers-inet.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 = {} diff -ruN --exclude=CVS /usr/ports/net/scapy/files/patch-scapy-sendrecv.py /tmp/scapy/files/patch-scapy-sendrecv.py --- /usr/ports/net/scapy/files/patch-scapy-sendrecv.py 2009-07-28 16:11:27.000000000 +0200 +++ /tmp/scapy/files/patch-scapy-sendrecv.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- scapy/sendrecv.py.orig 2009-07-15 18:19:31.000000000 +0200 -+++ scapy/sendrecv.py 2009-07-15 18:19:46.000000000 +0200 >Release-Note: >Audit-Trail: >Unformatted: