fix #54708

4 files changed, 170 insertions, 2 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index f7c976df217e..d563cd2b0af5 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.9 2004/06/22 03:00:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.10 2004/06/22 19:57:43 vapier Exp $
+
+  22 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.6.7.20040608-misc-deb-fixes.patch,
+  +files/2.6.7.20040608-misc-gentoo-fixes.patch,
+  iproute2-2.6.7.20040608.ebuild:
+  Add some patches to resolve issues with different kernel header versions
+  #54708.
 
 *iproute2-2.6.7.20040608 (21 Jun 2004)
 
diff --git a/sys-apps/iproute2/files/2.6.7.20040608-misc-deb-fixes.patch b/sys-apps/iproute2/files/2.6.7.20040608-misc-deb-fixes.patch
new file mode 100644
index 000000000000..8f4dc393e72f
--- /dev/null
+++ b/sys-apps/iproute2/files/2.6.7.20040608-misc-deb-fixes.patch
@@ -0,0 +1,23 @@
+--- iproute-20010824.orig/tc/tc_qdisc.c
++++ iproute-20010824/tc/tc_qdisc.c
+@@ -245,7 +245,7 @@
+ 	fprintf(fp, "\n");
+ 	if (show_stats) {
+ 		if (tb[TCA_STATS]) {
+-			if (RTA_PAYLOAD(tb[TCA_STATS]) < sizeof(struct tc_stats))
++			if (RTA_PAYLOAD(tb[TCA_STATS]) < offsetof(struct tc_stats,backlog)+sizeof(((struct tc_stats*)0)->backlog))
+ 				fprintf(fp, "statistics truncated");
+ 			else {
+ 				struct tc_stats st;
+--- iproute-20010824.orig/include-glibc/glibc-bugs.h
++++ iproute-20010824/include-glibc/glibc-bugs.h
+@@ -12,9 +12,6 @@
+ 
+ #include <linux/types.h>
+ 
+-typedef __u16 in_port_t;
+-typedef __u32 in_addr_t;
+-
+ #endif
+ 
+ #endif
diff --git a/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch b/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch
new file mode 100644
index 000000000000..7acde047b2d4
--- /dev/null
+++ b/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch
@@ -0,0 +1,126 @@
+diff -ur iproute2-2.6.7.orig/lib/ll_addr.c iproute2-2.6.7/lib/ll_addr.c
+--- iproute2-2.6.7.orig/lib/ll_addr.c	2004-06-22 15:23:26.671351840 -0400
++++ iproute2-2.6.7/lib/ll_addr.c	2004-06-22 15:24:05.193495584 -0400
+@@ -17,10 +17,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+diff -ur iproute2-2.6.7.orig/lib/ll_proto.c iproute2-2.6.7/lib/ll_proto.c
+--- iproute2-2.6.7.orig/lib/ll_proto.c	2004-06-22 15:23:26.671351840 -0400
++++ iproute2-2.6.7/lib/ll_proto.c	2004-06-22 15:23:55.268004488 -0400
+@@ -17,10 +17,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+diff -ur iproute2-2.6.7.orig/lib/ll_types.c iproute2-2.6.7/lib/ll_types.c
+--- iproute2-2.6.7.orig/lib/ll_types.c	2004-06-22 15:23:26.671351840 -0400
++++ iproute2-2.6.7/lib/ll_types.c	2004-06-22 15:23:42.533940360 -0400
+@@ -17,10 +17,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+diff -ur iproute2-2.6.7.orig/ip/ipaddress.c iproute2-2.6.7/ip/ipaddress.c
+--- iproute2-2.6.7.orig/ip/ipaddress.c	2004-06-22 15:26:00.353988528 -0400
++++ iproute2-2.6.7/ip/ipaddress.c	2004-06-22 15:26:11.743257096 -0400
+@@ -20,10 +20,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ #include <fnmatch.h>
+diff -ur iproute2-2.6.7.orig/misc/ss.c iproute2-2.6.7/misc/ss.c
+--- iproute2-2.6.7.orig/misc/ss.c	2004-06-22 15:26:00.414979256 -0400
++++ iproute2-2.6.7/misc/ss.c	2004-06-22 15:26:30.166456344 -0400
+@@ -35,6 +35,7 @@
+ #include <asm/byteorder.h>
+ #include <linux/tcp.h>
+ #include <linux/tcp_diag.h>
++#include <linux/version.h>
+ 
+ int resolve_hosts = 0;
+ int resolve_services = 1;
+@@ -1318,11 +1319,14 @@
+ 		if (info->tcpi_snd_ssthresh < 0xFFFF)
+ 			printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
+ 		
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,6)
+ 		if (info->tcpi_rcv_rtt)
+ 			printf(" rcv_rtt:%g", (double) info->tcpi_rcv_rtt/1000);
+ 		if (info->tcpi_rcv_space)
+ 			printf(" rcv_space:%d", info->tcpi_rcv_space);
++#endif
+ 
++#ifdef TCPDIAG_VEGASINFO
+ 		if (tb[TCPDIAG_VEGASINFO]) {
+ 			const struct tcpvegas_info *vinfo
+ 				= RTA_DATA(tb[TCPDIAG_VEGASINFO]);
+@@ -1340,6 +1341,7 @@
+ 				       8000000. / (double) vinfo->tcpv_rtt);
+ 			}
+ 		}
++#endif
+ 	}
+ }
+ 
+diff -ur iproute2-2.6.7.orig/ip/ipmaddr.c iproute2-2.6.7/ip/ipmaddr.c
+--- iproute2-2.6.7.orig/ip/ipmaddr.c	2004-06-22 15:27:35.910461736 -0400
++++ iproute2-2.6.7/ip/ipmaddr.c	2004-06-22 15:28:30.871106448 -0400
+@@ -17,11 +17,11 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+diff -ur iproute2-2.6.7.orig/ip/ipmroute.c iproute2-2.6.7/ip/ipmroute.c
+--- iproute2-2.6.7.orig/ip/ipmroute.c	2004-06-22 15:27:35.912461432 -0400
++++ iproute2-2.6.7/ip/ipmroute.c	2004-06-22 15:28:55.027434128 -0400
+@@ -17,11 +17,11 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/netdevice.h>
+ #include <linux/if.h>
+ #include <linux/if_arp.h>
+ #include <linux/sockios.h>
+-#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
diff --git a/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild b/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
index 03e622acdae6..404abe86c8bd 100644
--- a/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild,v 1.1 2004/06/22 03:00:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild,v 1.2 2004/06/22 19:57:43 vapier Exp $
 
 inherit eutils
 
@@ -34,7 +34,19 @@ src_unpack() {
 	else
 		ewarn "Your linux-headers in /usr/include/linux are too old to"
 		ewarn "support the HFSC scheduler.  It has been disabled."
+		echo
 	fi
+	# Disable q_delay if need be
+	if [ -z "`grep tc_dly_qopt ${ROOT}/usr/include/linux/pkt_sched.h`" ] ; then
+		ewarn "Your linux-headers in /usr/include/linux are too old to"
+		ewarn "support the DELAY scheduler.  It has been disabled."
+		echo
+		sed -i '/q_delay/s:.*::' tc/Makefile
+	fi
+
+	# Add a few debian fixes
+	epatch ${FILESDIR}/${PV}-misc-deb-fixes.patch
+	epatch ${FILESDIR}/${PV}-misc-gentoo-fixes.patch
 
 	# Fix cflags and db code
 	sed -i \