From dfc362339761d85a90717c4f0e4247f197c02d61 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 3 Feb 2011 19:11:43 +0100
Subject: [PATCH] iproute2: update to 2.6.37.

---
 srcpkgs/iproute2/patches/iproute2-fhs.patch | 66 +++++++++++++++------
 srcpkgs/iproute2/template                   |  6 +-
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/iproute2/patches/iproute2-fhs.patch b/srcpkgs/iproute2/patches/iproute2-fhs.patch
index f2d9c8a400..2608414db2 100644
--- a/srcpkgs/iproute2/patches/iproute2-fhs.patch
+++ b/srcpkgs/iproute2/patches/iproute2-fhs.patch
@@ -1,5 +1,6 @@
---- Makefile	2009-11-11 22:05:21.251407668 +0100
-+++ Makefile	2009-11-11 22:07:09.891833516 +0100
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile	2009-11-11 22:05:21.251407668 +0100
++++ iproute2-2.6.29/Makefile	2009-11-11 22:07:09.891833516 +0100
 @@ -1,11 +1,12 @@
  DESTDIR=/usr/
  ROOTDIR=$(DESTDIR)
@@ -16,22 +17,9 @@
 
  # Path to db_185.h include
  DBM_INCLUDE:=$(ROOTDIR)/usr/include
---- netem/Makefile	2009-11-11 22:05:21.284750207 +0100
-+++ netem/Makefile	2009-11-11 22:07:54.674736924 +0100
-@@ -20,9 +20,9 @@
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)/lib/tc
-+	mkdir -p $(DESTDIR)/${SHAREDIR}/tc
- 	for i in $(DISTDATA); \
--	do install -m 755 $$i $(DESTDIR)/lib/tc; \
-+	do install -m 755 $$i $(DESTDIR)/${SHAREDIR}/tc; \
- 	done
- 
- clean:
---- tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
-+++ tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
++++ iproute2-2.6.29/tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
 @@ -24,8 +24,8 @@
  #include "utils.h"
  #include "tc_util.h"
@@ -52,3 +40,45 @@
  
  	return lib_dir;
  }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile	2010-08-06 11:30:48.640940183 +0200
++++ iproute2-2.6.35/netem/Makefile	2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile	2010-08-06 11:48:35.607472252 +0200
++++ iproute2-2.6.35/tc/Makefile	2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
+-	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+-	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
+-	done
+-	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+-	if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+-	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+-		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+-	fi; \
+-	fi
++	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	install -m 0755 tc $(DESTDIR)$(SBINDIR)
++	for i in $(TCSO); \
++	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	done
+ 
+ clean:
+ 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8650d8e898..da05f5cd5a 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,12 +1,12 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=2.6.31
-revision=3
+version=2.6.37
+patch_args="-Np1"
 distfiles="http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="IP Routing Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=56875eaed9c581645422d89e00fa7da512256c82ac3dae3c5051ff6827e83152
+checksum=71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3
 long_desc="
  Iproute2 is a collection of utilities for controlling TCP/IP networking
  and traffic control in Linux."