Adding header patches to fix bug #128965, thanks to plasmaroo

Package-Manager: portage-2.1_pre7-r5

5 files changed, 52 insertions, 8 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 409a6f7b2fd0..f37f1e87d1b8 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.35 2006/03/21 23:01:42 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.36 2006/04/15 22:30:11 jokey Exp $
+
+  15 Apr 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/iptraf-3.0.0-headerfix.patch,
+  +files/iptraf-3.0.0-ipv6-headerfix.patch, iptraf-3.0.0-r2.ebuild:
+  Adding header patches to fix bug #128965, thanks to plasmaroo
 
 *iptraf-3.0.0-r2 (21 Mar 2006)
 *iptraf-2.7.0-r2 (21 Mar 2006)
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 1480fd2344c3..e912c179c243 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,6 +1,6 @@
-MD5 69b77973cd512d74984c353703360978 ChangeLog 4895
-RMD160 abec1b286fb3aa1d11f7760bf546cadf78e8d1ba ChangeLog 4895
-SHA256 9c9fbe4d449cb3c4cf6a8ea8b8526ed963c11b0e940f911bfe051ec23d1ee971 ChangeLog 4895
+MD5 5401a8377752e5002229489901590d16 ChangeLog 5116
+RMD160 0287cd64803a0073c03b0b406f5d536eafe4417a ChangeLog 5116
+SHA256 f5d4ab24047aef2564d64e9736ab4d7a7addd7130374404c1f58fee96c6686e6 ChangeLog 5116
 MD5 65e102b7957229dfe2075b4d76c2f9fe files/digest-iptraf-2.7.0-r1 506
 RMD160 15ac4fd6a3a2fe747dc1f98b9a856239513384f1 files/digest-iptraf-2.7.0-r1 506
 SHA256 ccd3a95582730408892aed8b56a36bf5145c020fd1df7c35b17b811fa1b477f1 files/digest-iptraf-2.7.0-r1 506
@@ -37,9 +37,15 @@ SHA256 dcd54d8dd2cb5c92448359f9ffe9312d6171586fb47a2d091a3c933040713531 files/ip
 MD5 20c0e87723c58d6ce51de7fc3af1781a files/iptraf-3.0.0-build.patch 949
 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee files/iptraf-3.0.0-build.patch 949
 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91 files/iptraf-3.0.0-build.patch 949
+MD5 b0b0afa24758a3811a34426b28feec3e files/iptraf-3.0.0-headerfix.patch 376
+RMD160 28db2b6bbfad091c4b1662b6181c3dce5c4fb023 files/iptraf-3.0.0-headerfix.patch 376
+SHA256 5d667b5186c4135dd569e7ff3613a13498aacc4bc9357b865f40695b87e02cc9 files/iptraf-3.0.0-headerfix.patch 376
 MD5 d2fea82d823f7372e4d0dad01440ea53 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
 RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
 SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
+MD5 943fa327945f1f752d9d89a03d9c480b files/iptraf-3.0.0-ipv6-headerfix.patch 442
+RMD160 c2703551f6c306a8691fb73f4c10d7c73a016a9b files/iptraf-3.0.0-ipv6-headerfix.patch 442
+SHA256 943fe8ebb745363c90c2a5f1b1c8c1616baad86a12e7ef4c6865c4c0c6f182ae files/iptraf-3.0.0-ipv6-headerfix.patch 442
 MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963
 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 files/iptraf-3.0.0-linux-headers.patch 963
 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae files/iptraf-3.0.0-linux-headers.patch 963
@@ -52,9 +58,9 @@ SHA256 d1c315c154eb27110aa5c1e3846d585fa5bef38fa8c8e5e013e2f903c444a842 iptraf-2
 MD5 28828d5f3b6ea64612609f2f4644bb9a iptraf-3.0.0-r1.ebuild 1211
 RMD160 3a38fb3aa64099fdf045f644001678ac620525d1 iptraf-3.0.0-r1.ebuild 1211
 SHA256 875e521ff99538b66aeb894a38a0f80eb120cfd6fa426a0009e9ae5e18d12aaa iptraf-3.0.0-r1.ebuild 1211
-MD5 96ac79c4b46d45e69f16bfae1eac9ce5 iptraf-3.0.0-r2.ebuild 1767
-RMD160 ef400a5a1d37bec70cc0dd606b35b0484659031a iptraf-3.0.0-r2.ebuild 1767
-SHA256 09b0a23d283542c2e68f13113a96c289bb13b286b12879f837b27803af88d5b8 iptraf-3.0.0-r2.ebuild 1767
+MD5 deb8102317b0452765bd7051c8fc4a61 iptraf-3.0.0-r2.ebuild 1886
+RMD160 f29dcfe2545b119b380b12cf4b6e97704ed6b213 iptraf-3.0.0-r2.ebuild 1886
+SHA256 b895f36f38f784c863be4ba114c42a5ea560fdeff42160ee6a49ace967f8daac iptraf-3.0.0-r2.ebuild 1886
 MD5 31ec4dadb0b55040e589c0048b14298b iptraf-3.0.0.ebuild 1159
 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 iptraf-3.0.0.ebuild 1159
 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0 iptraf-3.0.0.ebuild 1159
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch
new file mode 100644
index 000000000000..7ce5e7c66eb9
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch
@@ -0,0 +1,13 @@
+diff -urN ./iptraf-3.0.0.orig/src/tr.c ./iptraf-3.0.0/src/tr.c
+--- ./iptraf-3.0.0.orig/src/tr.c	2005-09-13 08:42:54.000000000 +0200
++++ ./iptraf-3.0.0/src/tr.c	2006-04-16 00:20:06.000000000 +0200
+@@ -7,8 +7,8 @@
+  */
+ 
+ #include <asm/types.h>
+-#include <linux/if_tr.h>
+ #include <netinet/in.h>
++#include <linux/if_tr.h>
+ 
+ unsigned int get_tr_ip_offset(unsigned char *pkt)
+ {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch
new file mode 100644
index 000000000000..a2ec93eb6bce
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch
@@ -0,0 +1,14 @@
+diff -urN ./iptraf-3.0.0.orig/src/othptab.c ./iptraf-3.0.0/src/othptab.c
+--- ./iptraf-3.0.0.orig/src/othptab.c	2006-04-16 00:20:52.000000000 +0200
++++ ./iptraf-3.0.0/src/othptab.c	2006-04-16 00:22:01.000000000 +0200
+@@ -17,9 +17,9 @@
+ ***/
+ 
+ #include <asm/types.h>
+-#include <linux/if_ether.h>
+ #include <netinet/ip6.h>
+ #include <netinet/icmp6.h>
++#include <linux/if_ether.h>
+ #include <winops.h>
+ #include "arphdr.h"
+ #include "options.h"
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild
index 84fb33ec13b2..27323e7c3526 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild,v 1.1 2006/03/21 23:01:42 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r2.ebuild,v 1.2 2006/04/15 22:30:11 jokey Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,6 +25,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-bnep.patch
 	epatch ${FILESDIR}/${P}-Makefile.patch
 
+	# bug 128965
+	epatch ${FILESDIR}/${P}-headerfix.patch
+
 	sed -i \
 		-e 's:/var/local/iptraf:/var/lib/iptraf:g' \
 		-e "s:Documentation/:/usr/share/doc/${PF}:g" \
@@ -37,6 +40,9 @@ src_unpack() {
 		if has_version '>=sys-libs/glibc-2.4' ; then
 			epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
 		fi
+
+		# bug 128965
+		epatch ${FILESDIR}/${P}-ipv6-headerfix.patch
 	fi
 }