diff --git a/iproute2-2.6.29-1-warnings.diff b/iproute2-2.6.29-1-warnings.diff index df4c417..b7a95fa 100644 --- a/iproute2-2.6.29-1-warnings.diff +++ b/iproute2-2.6.29-1-warnings.diff @@ -16,7 +16,7 @@ Index: ip/ip6tunnel.c =================================================================== --- ip/ip6tunnel.c.orig +++ ip/ip6tunnel.c -@@ -261,8 +261,9 @@ static int do_tunnels_list(struct ip6_tn +@@ -262,8 +262,9 @@ static int do_tunnels_list(struct ip6_tn } /* skip two lines at the begenning of the file */ @@ -70,7 +70,7 @@ Index: ip/iptunnel.c =================================================================== --- ip/iptunnel.c.orig +++ ip/iptunnel.c -@@ -412,8 +412,9 @@ static int do_tunnels_list(struct ip_tun +@@ -407,8 +407,9 @@ static int do_tunnels_list(struct ip_tun return -1; } @@ -81,7 +81,7 @@ Index: ip/iptunnel.c + res = fgets(buf, sizeof(buf), fp); while (fgets(buf, sizeof(buf), fp) != NULL) { - char *ptr; + int index, type; Index: ip/rtmon.c =================================================================== --- ip/rtmon.c.orig @@ -117,7 +117,7 @@ Index: misc/ifstat.c =================================================================== --- misc/ifstat.c.orig +++ misc/ifstat.c -@@ -717,8 +717,9 @@ int main(int argc, char *argv[]) +@@ -716,8 +716,9 @@ int main(int argc, char *argv[]) fclose(tfp); } if (uptime >= 0 && time(NULL) >= stb.st_mtime+uptime) { @@ -128,7 +128,7 @@ Index: misc/ifstat.c } } -@@ -760,7 +761,8 @@ int main(int argc, char *argv[]) +@@ -759,7 +760,8 @@ int main(int argc, char *argv[]) dump_incr_db(stdout); } if (!no_update) { diff --git a/iproute2-2.6.35+9.tar.bz2 b/iproute2-2.6.35+9.tar.bz2 deleted file mode 100644 index ae7b9c1..0000000 --- a/iproute2-2.6.35+9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06d028c301203b39e82b7c1923fffc0169231951080238a91e13a0c2739512cf -size 387857 diff --git a/iproute2-2.6.37.tar.bz2 b/iproute2-2.6.37.tar.bz2 new file mode 100644 index 0000000..cbb24c4 --- /dev/null +++ b/iproute2-2.6.37.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3 +size 388866 diff --git a/iproute2.changes b/iproute2.changes index e017f09..63e6781 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 11 00:45:02 UTC 2011 - jengelh@medozas.de + +- Update to iproute2-2.6.37 +* Support for iptables >= 1.4.9 +* Support for GRE in XFRM +* tc f_flow now knows rxhash +* Support for macvtap "mode" parameter +* tc ACT_CSUM support +* added `ip route save` and `ip route restore` commands + ------------------------------------------------------------------- Fri Dec 3 10:29:55 CET 2010 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index 81b5a0b..3ff9068 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,5 +1,5 @@ # -# spec file for package iproute2 (Version 2.6.35+9) +# spec file for package iproute2 (Version 2.6.37) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ License: GPLv2+ Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on -Version: 2.6.35+9 -Release: 3 -%define rversion 2.6.35+9 +Version: 2.6.37 +Release: 1 +%define rversion 2.6.37 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%rversion.tar.bz2