Fix building with linux-2.6.27 headers.

(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)

3 files changed, 56 insertions, 4 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index b126a00339dc..7c661a1a11d3 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.112 2008/09/09 14:35:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.113 2008/10/27 02:10:47 vapier Exp $
+
+  27 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.26-linux-2.6.27-API.patch, iproute2-2.6.26-r2.ebuild:
+  Fix building with linux-2.6.27 headers.
 
 *iproute2-2.6.26-r2 (09 Sep 2008)
 
diff --git a/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch b/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch
new file mode 100644
index 000000000000..78647efa2cac
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.26-linux-2.6.27-API.patch
@@ -0,0 +1,48 @@
+From 5a67f8f9d3a7f80a49554fb1ca4e68a1effd5399 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen.hemminger@vyatta.com>
+Date: Mon, 15 Sep 2008 12:05:11 -0700
+Subject: [PATCH] Update to 2.6.27 API
+
+The one issue was the old multiqueue API, so that is handled
+by tc_util.h
+---
+ include/linux/atm.h                      |    1 +
+ include/linux/if.h                       |   15 ++++++++-------
+ include/linux/if_vlan.h                  |    1 +
+ include/linux/ip6_tunnel.h               |    4 ----
+ include/linux/netfilter.h                |    1 +
+ include/linux/netfilter_ipv4.h           |    1 +
+ include/linux/netfilter_ipv4/ip_tables.h |    1 +
+ include/linux/pkt_cls.h                  |    1 +
+ include/linux/pkt_sched.h                |   29 ++++++++++++++++++++---------
+ include/linux/rtnetlink.h                |    1 +
+ include/linux/socket.h                   |    5 ++++-
+ tc/tc_util.h                             |   12 ++++++++++++
+ 12 files changed, 51 insertions(+), 21 deletions(-)
+
+diff --git a/tc/tc_util.h b/tc/tc_util.h
+index 796da54..39d5367 100644
+--- a/tc/tc_util.h
++++ b/tc/tc_util.h
+@@ -7,6 +7,18 @@
+ #include <linux/gen_stats.h>
+ #include "tc_core.h"
+ 
++/* This is the deprecated multiqueue interface */
++#ifndef TCA_PRIO_MAX
++enum
++{
++	TCA_PRIO_UNSPEC,
++	TCA_PRIO_MQ,
++	__TCA_PRIO_MAX
++};
++
++#define TCA_PRIO_MAX    (__TCA_PRIO_MAX - 1)
++#endif
++
+ struct qdisc_util
+ {
+ 	struct  qdisc_util *next;
+-- 
+1.6.0.2
+
diff --git a/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild
index 08f9817d438a..25bbe4660224 100644
--- a/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild,v 1.1 2008/09/09 14:35:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild,v 1.2 2008/10/27 02:10:47 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -35,8 +35,8 @@ src_unpack() {
 	# build against system headers
 	rm -r include/linux include/netinet #include/ip{,6}tables{,_common}.h include/libiptc
 
-	# fix LDFLAGS usage bug #236861
-	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch #236861
+	epatch "${FILESDIR}"/${P}-linux-2.6.27-API.patch
 
 	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
 	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do