- adds ath interface support

(Portage version: 2.0.51-r15)

4 files changed, 55 insertions, 5 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index c9d02a8ed83d..9c0a525762e6 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.24 2005/01/25 13:30:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.25 2005/02/27 00:20:02 solar Exp $
+
+  26 Feb 2005; <solar@gentoo.org> +files/iptraf-2.7.0-atheros.patch,
+  iptraf-2.7.0-r1.ebuild:
+  - Add atheros interface support
 
   25 Jan 2005; Markus Rothe <corsair@gentoo.org> iptraf-2.7.0-r1.ebuild:
   Added ~ppc64 to KEYWORDS; bug #79367
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index d083f6e7396f..2e6e65d5a317 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,6 +1,7 @@
-MD5 b7b9d3d0e01b86b2d191c6b3e540c2b6 ChangeLog 2814
-MD5 93c8b299ffd3fba45f02e6ab187113c5 iptraf-2.7.0-r1.ebuild 1215
+MD5 c4036f0f555f55f1571fe4880f246b11 iptraf-2.7.0-r1.ebuild 1263
 MD5 c9bffeaf46df5f049cac7648916475ab iptraf-2.7.0.ebuild 843
+MD5 2d629919ee93a6ffba9e16c43be95366 ChangeLog 2944
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
-MD5 68d035b52bb75c049cc9a59f51ce2a07 files/digest-iptraf-2.7.0 64
 MD5 1822bd37e9eff2ce7881d2a46c074037 files/digest-iptraf-2.7.0-r1 138
+MD5 68d035b52bb75c049cc9a59f51ce2a07 files/digest-iptraf-2.7.0 64
+MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
new file mode 100644
index 000000000000..3c79401b8a4d
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
@@ -0,0 +1,43 @@
+diff -ur iptraf-2.7.0/src/ifaces.c iptraf-2.7.0-ath0/src/ifaces.c
+--- iptraf-2.7.0/src/ifaces.c	2002-05-08 02:43:27.000000000 -0700
++++ iptraf-2.7.0-ath0/src/ifaces.c	2004-08-05 12:48:53.000000000 -0700
+@@ -32,14 +32,14 @@
+ #include "error.h"
+ 
+ extern int accept_unsupported_interfaces;
+-#define NUM_SUPPORTED_IFACES 20
++#define NUM_SUPPORTED_IFACES 21
+ 
+ extern int daemonized;
+ 
+ char ifaces[][6] =
+     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
+       "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
+-      "pent", "lec" };
++      "pent", "lec", "ath" };
+ 
+ char *ltrim(char *buf)
+ {
+diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-ath0/src/packet.c
+--- iptraf-2.7.0/src/packet.c	2002-05-08 02:44:08.000000000 -0700
++++ iptraf-2.7.0-ath0/src/packet.c	2004-08-05 12:56:57.000000000 -0700
+@@ -80,6 +80,8 @@
+     case ARPHRD_ETHER:
+ 	if (strncmp(ifname, "eth", 3) == 0)
+ 	    result = LINK_ETHERNET;
++	else if (strncmp(ifname, "ath", 3) == 0)
++	    result = LINK_ETHERNET;
+ 	else if (strncmp(ifname, "plip", 4) == 0)
+ 	    result = LINK_PLIP;
+ 	else if (strncmp(ifname, "fddi", 4) == 0)    /* For some Ethernet- */
+diff -ur iptraf-2.7.0/src/promisc.c iptraf-2.7.0-ath0/src/promisc.c
+--- iptraf-2.7.0/src/promisc.c	2002-01-15 17:51:03.000000000 -0800
++++ iptraf-2.7.0-ath0/src/promisc.c	2004-08-05 12:57:20.000000000 -0700
+@@ -81,6 +81,7 @@
+ 	     */
+ 
+ 	    if ((strncmp(buf, "eth", 3) == 0) ||
++	        (strncmp(buf, "ath", 3) == 0) ||
+ 		(strncmp(buf, "fddi", 4) == 0) ||
+   	        (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
+ 	        (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
index 644ab3ce7baa..85c56e3ac7b5 100644
--- a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
+++ b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.15 2005/01/25 13:30:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.16 2005/02/27 00:20:02 solar Exp $
 
 inherit eutils
 
@@ -20,7 +20,9 @@ DEPEND=">=sys-libs/ncurses-5.2-r1"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
+	epatch ${FILESDIR}/iptraf-2.7.0-atheros.patch
 	use ipv6 && epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
+
 	cd src
 	cp dirs.h dirs.h.orig
 	sed -e s:/var/local/iptraf:/var/lib/iptraf: -e s:/usr/local/bin:/usr/sbin: dirs.h.orig > dirs.h