From owner-svn-ports-head@FreeBSD.ORG Tue Mar 4 00:07:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C576695; Tue, 4 Mar 2014 00:07:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E41602DD; Tue, 4 Mar 2014 00:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2406xTH093274; Tue, 4 Mar 2014 00:06:59 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2406x3D093272; Tue, 4 Mar 2014 00:06:59 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201403040006.s2406x3D093272@svn.freebsd.org> From: Antoine Brodin Date: Tue, 4 Mar 2014 00:06:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346977 - in head/net/scapy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 00:07:00 -0000 Author: antoine Date: Tue Mar 4 00:06:59 2014 New Revision: 346977 URL: http://svnweb.freebsd.org/changeset/ports/346977 QAT: https://qat.redports.org/buildarchive/r346977/ Log: Fix runtime on FreeBSD >= 10 Added: head/net/scapy/files/patch-scapy__arch__unix.py (contents, props changed) Modified: head/net/scapy/Makefile Modified: head/net/scapy/Makefile ============================================================================== --- head/net/scapy/Makefile Mon Mar 3 23:45:26 2014 (r346976) +++ head/net/scapy/Makefile Tue Mar 4 00:06:59 2014 (r346977) @@ -3,6 +3,7 @@ PORTNAME= scapy PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://secdev.org/projects/scapy/files/ @@ -35,7 +36,7 @@ GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/Magi P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f/p0f.fp:${PORTSDIR}/net-mgmt/p0f QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:${PORTSDIR}/net/queso NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:${PORTSDIR}/security/nmap -MANUF_RUN_DEPENDS+= ${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark +MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:${PORTSDIR}/net/wireshark SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox post-patch: Added: head/net/scapy/files/patch-scapy__arch__unix.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/scapy/files/patch-scapy__arch__unix.py Tue Mar 4 00:06:59 2014 (r346977) @@ -0,0 +1,32 @@ +--- ./scapy/arch/unix.py.orig 2010-08-10 23:09:40.000000000 +0000 ++++ ./scapy/arch/unix.py 2014-03-03 23:59:21.000000000 +0000 +@@ -38,6 +38,8 @@ + ok = 0 + mtu_present = False + prio_present = False ++ refs_present = False ++ use_present = False + routes = [] + pending_if = [] + for l in f.readlines(): +@@ -51,6 +53,8 @@ + ok = 1 + mtu_present = l.find("Mtu") >= 0 + prio_present = l.find("Prio") >= 0 ++ refs_present = l.find("Refs") >= 0 ++ use_present = l.find("Use") >= 0 + continue + if not l: + break +@@ -64,7 +68,10 @@ + else: + rt = l.split() + dest,gw,flg = rt[:3] +- netif = rt[5+mtu_present+prio_present] ++ if scapy.arch.FREEBSD: ++ netif = rt[3+refs_present+use_present+mtu_present] ++ else: ++ netif = rt[5+mtu_present+prio_present] + if flg.find("Lc") >= 0: + continue + if dest == "default":