Add patch from Aurelien Minet in bug 89458 that fixes compile issues when running a 2.6 kernel.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 76 insertions, 5 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index b96c6dc47103..a962f222fdd2 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.28 2005/06/25 22:33:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.29 2005/07/17 14:36:42 ka0ttic Exp $
+
+  17 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
+  Add patch from Aurelien Minet in bug 89458 that fixes compile issues when
+  running a 2.6 kernel.
 
   25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -iptraf-2.7.0.ebuild,
   iptraf-2.7.0-r1.ebuild:
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 35e1987fa35d..875895e9f26b 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,5 +1,16 @@
-MD5 39aaa452c2bc0064b76d349cc289244d iptraf-2.7.0-r1.ebuild 1268
-MD5 10e82ae7ff6fe7fd7095398648de86d5 ChangeLog 3271
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4847e1a7efe8539117d3242b0cba79a1 iptraf-2.7.0-r1.ebuild 1344
+MD5 7a48c99ce0ddb1e35fc1448fe2b4d309 ChangeLog 3475
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
 MD5 1822bd37e9eff2ce7881d2a46c074037 files/digest-iptraf-2.7.0-r1 138
+MD5 29df379f2586291b84b39c2cf1aa0b7f files/iptraf-2.7.0-2.6.patch 1587
 MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2m0iEZCkKN40op4RAgAvAKC8KVyg7rvHJCbf7MK2OMtkBb5MNwCaA4Pq
+96kmtNFwhP/OE8S5DPSDC6c=
+=UvzX
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
new file mode 100644
index 000000000000..e4468273816c
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
@@ -0,0 +1,52 @@
+diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-2.6.11-r2/src/packet.c
+--- iptraf-2.7.0/src/packet.c   2005-07-17 05:45:44.000000000 +0200
++++ iptraf-2.7.0-2.6.11-r2/src/packet.c 2005-07-17 05:43:50.000000000 +0200
+@@ -32,6 +32,9 @@
+ #include <sys/time.h>
+ #include <net/if_arp.h>
+ #include <net/if.h>
++#ifdef _NET_IF_H
++#define  _LINUX_IF_H
++#endif
+ #include <sys/ioctl.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+diff -ur iptraf-2.7.0/src/tcptable.h iptraf-2.7.0-2.6.11-r2/src/tcptable.h
+--- iptraf-2.7.0/src/tcptable.h 2001-12-28 03:16:39.000000000 +0100
++++ iptraf-2.7.0-2.6.11-r2/src/tcptable.h       2005-07-17 05:44:02.000000000 +0200
+@@ -20,11 +20,15 @@
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+ #include <asm/types.h>
++#include <net/if.h>
++#ifdef _NET_IF_H
++#define  _LINUX_IF_H
++#endif
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_fddi.h>
+ #include <linux/if_tr.h>
+-#include <net/if.h>
++//#include <net/if.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
+ #include "servname.h"
+diff -ur iptraf-2.7.0/src/othptab.c iptraf-2.7.0-2.6.11-r2/src/othptab.c
+--- iptraf-2.7.0/src/othptab.c  2001-12-28 03:23:59.000000000 +0100
++++ iptraf-2.7.0-2.6.11-r2/src/othptab.c        2005-07-17 14:24:00.000000000 +0200
+@@ -17,13 +17,10 @@
+ ***/
+
+ #include <asm/types.h>
+-#include <linux/if_ether.h>
+-#include <linux/if_tr.h>
+-#include <linux/if_fddi.h>
+ #include <winops.h>
++#include "tcptable.h"
+ #include "arphdr.h"
+ #include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"
+
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
index c7c4c2fbca0e..c2df5f7acaf6 100644
--- a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
+++ b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.19 2005/06/25 22:33:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.20 2005/07/17 14:36:42 ka0ttic Exp $
 
-inherit eutils
+inherit eutils check-kernel
 
 V6PATCH_LEVEL=alpha11
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
@@ -23,6 +23,9 @@ src_unpack() {
 	epatch ${FILESDIR}/iptraf-2.7.0-atheros.patch
 	use ipv6 && epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
 
+	# bug 89458
+	is_2_6_kernel && epatch ${FILESDIR}/${P}-2.6.patch
+
 	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