summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2005-07-17 14:36:42 +0000
committerAaron Walker <ka0ttic@gentoo.org>2005-07-17 14:36:42 +0000
commit3f103b463445edf2c57525860fd51bbb6545b510 (patch)
tree5542633fa4cd1cd1ad740284bb82a173fa027b89 /net-analyzer/iptraf/files
parentpunt alias hunks #99308 (diff)
downloadgentoo-2-3f103b463445edf2c57525860fd51bbb6545b510.tar.gz
gentoo-2-3f103b463445edf2c57525860fd51bbb6545b510.tar.bz2
gentoo-2-3f103b463445edf2c57525860fd51bbb6545b510.zip
Add patch from Aurelien Minet in bug 89458 that fixes compile issues when running a 2.6 kernel.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-analyzer/iptraf/files')
-rw-r--r--net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch52
1 files changed, 52 insertions, 0 deletions
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"
+