bump to 2.6.37

diff --git a/Makefile b/Makefile
index 39e4da1..ecfb4cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ WEBFETCH                := wget
 SHA1SUM                        := sha1sum
 
 ALL                    += iproute2
 SHA1SUM                        := sha1sum
 
 ALL                    += iproute2

-iproute2-URL           := http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-2.6.35.tar.bz2
-iproute2-SHA1SUM       := 862b86ac73ea696867675765d119654553a22aeb
+iproute2-URL            := http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-2.6.37.tar.bz2
+iproute2-SHA1SUM        := 7852fb66fb745dc3c1fabee24d7d8ff017c48d36

 iproute2               := $(notdir $(iproute2-URL))
 
 all: $(ALL)
 iproute2               := $(notdir $(iproute2-URL))
 
 all: $(ALL)

diff --git a/compile.patch b/compile.patch
new file mode 100644 (file)
index 0000000..b020096
--- /dev/null
+++ b/compile.patch
@@ -0,0 +1,18 @@
+commit ca9c3c2670beb338817aea7ca488dd040b517905
+Author: S.Çağlar Onur <caglar@cs.princeton.edu>
+Date:   Thu Jan 13 14:56:05 2011 -0500
+
+    sync with SVN
+
+diff --git a/ip/iptunnel.c b/ip/iptunnel.c
+index d30e008..8111799 100644
+--- a/ip/iptunnel.c
++++ b/ip/iptunnel.c
+@@ -22,6 +22,7 @@
+ #include <net/if_arp.h>
+ #include <linux/ip.h>
+ #include <linux/if_tunnel.h>
++#include <linux/if_ether.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"

diff --git a/iproute.spec b/iproute.spec
index aadbb82..fd715af 100644 (file)
--- a/iproute.spec
+++ b/iproute.spec
@@ -4,7 +4,7 @@
 %define url $URL$
 
 %define name iproute
 %define url $URL$
 
 %define name iproute

-%define version 2.6.35
+%define version 2.6.37

 %define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}


@@ -25,6 +25,7 @@ Group: Applications/System
 #URL:    http://developer.osdl.org/dev/iproute2/
 Source: iproute2-%{version}.tar.bz2
 Patch1: gre.patch
 #URL:    http://developer.osdl.org/dev/iproute2/
 Source: iproute2-%{version}.tar.bz2
 Patch1: gre.patch

+Patch2: compile.patch

 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison flex
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison flex


@@ -37,6 +38,7 @@ capabilities of the Linux 2.4.x and 2.6.x kernel.
 %prep
 %setup -q -n iproute2-%{version}
 %patch1 -p1
 %prep
 %setup -q -n iproute2-%{version}
 %patch1 -p1

+%patch2 -p1

 
 %build
 make
 
 %build
 make