svn commit: r346977 - in head/net/scapy: . files

[Antoine Brodin]

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":