diff --git a/0001-build-resolve-compile-error-due-to-missing-include.patch b/0001-build-resolve-compile-error-due-to-missing-include.patch deleted file mode 100644 index b130134..0000000 --- a/0001-build-resolve-compile-error-due-to-missing-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a204b39e28a195e34a6e59d360fce05853eec17 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Wed, 17 Apr 2013 08:44:46 +0200 -Subject: [PATCH] build: resolve compile error due to missing include -Upstream: sent on Apr 17 08:53 +0200 - -I get a compilation error with linux-glibc-devel-2.6.32 (SLES 11 SP2): - -ipnetns.c: In function 'netns_exec': -ipnetns.c:156: error: 'MS_SLAVE' undeclared (first use in this function) -ipnetns.c:156: error: (Each undeclared identifier is reported only once -ipnetns.c:156: error: for each function it appears in.) -ipnetns.c:156: error: 'MS_REC' undeclared (first use in this function) -ipnetns.c: In function 'netns_add': -ipnetns.c:372: error: 'MS_SHARED' undeclared (first use in this function) -ipnetns.c:372: error: 'MS_REC' undeclared (first use in this function) -make[1]: *** [ipnetns.o] Error 1 - -This patch fixes that. ---- - ip/ipnetns.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index b047b97..48b1ad5 100644 ---- a/ip/ipnetns.c -+++ b/ip/ipnetns.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "utils.h" - #include "ip_common.h" --- -1.8.2 - diff --git a/iproute2-3.8.0.tar.sign b/iproute2-3.8.0.tar.sign deleted file mode 100644 index c328f4a..0000000 Binary files a/iproute2-3.8.0.tar.sign and /dev/null differ diff --git a/iproute2-3.8.0.tar.xz b/iproute2-3.8.0.tar.xz deleted file mode 100644 index 97b2f3b..0000000 --- a/iproute2-3.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f -size 407608 diff --git a/iproute2-3.9.0.tar.sign b/iproute2-3.9.0.tar.sign new file mode 100644 index 0000000..4d45436 Binary files /dev/null and b/iproute2-3.9.0.tar.sign differ diff --git a/iproute2-3.9.0.tar.xz b/iproute2-3.9.0.tar.xz new file mode 100644 index 0000000..1bb9698 --- /dev/null +++ b/iproute2-3.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16f027af432a05085813a2f859b7d42dafd29b8c035ead830d37565b7397592d +size 412616 diff --git a/iproute2.changes b/iproute2.changes index 9eb4692..0e24b49 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 5 13:01:09 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 3.9.0 +* Support for managing the forwarding tables in Bridge and VXLAN. +- Remove 0001-build-resolve-compile-error-due-to-missing-include.patch + (merged upstream) + ------------------------------------------------------------------- Mon Apr 15 07:31:11 UTC 2013 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index a3ebb46..0ef6ac5 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,7 +17,7 @@ Name: iproute2 -Version: 3.8.0 +Version: 3.9.0 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0 @@ -27,12 +27,11 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking #DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 -Source: %name-%version.tar.xz -Source2: %name-%version.tar.sign +Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.xz +Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.sign Patch1: iproute2-dirs.diff Patch2: iproute2-HZ.diff Patch3: revert-pdf-creation.diff -Patch4: 0001-build-resolve-compile-error-due-to-missing-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -110,7 +109,6 @@ tar -xf "%{S:0}" --use=xz; %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) %patch -P 3 -p1 %endif -%patch -P 4 -p1 find . -name *.orig -delete %build