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..c20aa15 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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) +- Signature verification for the package + ------------------------------------------------------------------- Mon Apr 15 07:31:11 UTC 2013 - jengelh@inai.de diff --git a/iproute2.keyring b/iproute2.keyring new file mode 100644 index 0000000..ac05bda --- /dev/null +++ b/iproute2.keyring @@ -0,0 +1,97 @@ +pub 4096R/95CDE47E 2011-10-03 +uid Stephen Hemminger +uid Stephen Hemminger +uid Stephen Hemminger +uid Stephen Hemminger +sub 4096R/C0728CDC 2011-10-03 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQINBE6J28kBEADN+t/gag06JAMej0hhx0Ci9pUUs7FWp7dHXvj9HVsA1OsaDURB +Jc4er//8NOXuUT4gObLmGkCE0ZhTD9rhimi1lNGpqrsB6iqJDuKBaNgJKSugysh7 +7RZhW/urOQv8j8e2VoOe2VB+mSGw6Kb+sFAcoQx+suVy/VaqELjxtqh8KSPrJGdK +fHQTfdEVOWsM17c6POGUKDOXxSJr/J7X5tUUa/O+SDDvS2rKXmcLFvo4ug90TNTX +t+LbyOzDNW9r/9IVR+XnJapDTQO+J5K3jIqF6lL42j34AoB6l5VAem5SbdXqskph +IvrGmaC295mDmtjW1UWLEe6poJMjujdoLv01ro+T6Yq9C5cJYLc51wQm5m8CFXD7 +o+R8d+NNmf61blYP+IR7JxK8YHtrtInDQ9NkDKycI6iA2VFjMvFEaqNVy4NiBuQv +g70Dk4dTBBb2JQkqzNvDfeW3KoolWRif4kfMb/L+AHE/E5pj2kptWrZdoekD7HGF +5SanzFjMRt15xdSlmHeqqAepMUMO7JDg7BvdAl1ZPoUKeRvnm/PbWK9RM06IsVMf +DWhKQz2NqaSiAY/kVKKx+aTIW1kHSFyqTl3Y4lbVQT4sI6DMqG8ZaXBfFQCR7hzA +6J1UJavbPjbg1IxasJNarCzJT0OgxSVxbFcS6zJ5y236eUds+lHR+z23CQARAQAB +tClTdGVwaGVuIEhlbW1pbmdlciA8c2hlbW1pbmdlckB2eWF0dGEuY29tPokCNwQT +AQIAIQIbAwIeAQIXgAULCQgHAwUVCgkICwUWAgMBAAUCTpNeowAKCRCAp39glc3k +fsalEACHf61eo0tH0FgI6kstIw2otNAQEqnvJjruAv1wBT62s6fuiaZjHHjOZFQS +cEBNb5GdTHRy117enF6vBkirQAuUtvIUi0cWcwjbSLaHl4fCapj+C55bhSghGjhq +atXZxOCyaz+pYYtwvMFUJMPQn6BuIfs/Vp7UD5s3hE5WBT2p8rNOGfyuOVgQxzkc +6LaRmCHrSH6sgkokD8DSjNISxX1+TPaVg+Tv6KYvrlqd/+P596MAF7z5ZS+PW0VI +bbt1nGE4yNI+Vv6Abbd29YXG9juhswljOg3zQn2l1Mp2dEDCl3eWOgdJK8XfDgc+ +OPylHmQahuNYBY7miFlLepu3AtmHtexzVnvlzgBzTv6nS0F5lPAqlfZUiMNQ5ev2 +XawQvWOa3Hgwd1fZwovaeiS4NvsFpakvjKiDMjWbRcuLBd5ERWNKcQMwxVle7g2+ +/8QDeps2QwUK3qnz1lmsCrMrO0FRdcU3uTh5IC9MpUCGumk30U/AlA1qxiQan5Rc +pB9jhiUYzxdGy0/5cazqJFQidxOf6YJWMM6p/b/p/AC2aOQfXXsQ6trT7IUIeBp0 ++Jo/mz5K5xC3yYjVz9PUi0HrB7oxpsrHBI+yOZ95/kwWNkxq+9GbX7slWbd0zyh2 +uqom6ds35sK4AubUA8scmBNtu/Q8aJ3l8erfve4Mq1vs/2czJ7QuU3RlcGhlbiBI +ZW1taW5nZXIgPHN0ZXBoZW5AbmV0d29ya3BsdW1iZXIub3JnPokCNwQTAQgAIQUC +UPRebAIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCAp39glc3kfjqxEACP +bEYKHRQw9Mdhnj2dQE35u82rRFtCG4u/KBvl6klbmBzrxa1QijLY1E5+3HXVCvsd +cGv5WtQnQqSdFC5EawtvAqmTKXwo6U0CP1pBBhaktRHcA/tfp98XU7ZQ3mNGctrX +NcWtB+ynDNs/rwMOBHOp2VHrOqsvAHCEN1j4y6Iq51rJMrCSFObB0OilajeTP6Tq +l7eajmA7oyGqxgg9mFutYc+1VVUAK7pn8MY62/guS0hbHodGsRIzYmFVR+9Bu6jy +2oE5GaYD/EfNrCPl2498e0JkTuTui4+OEpJ02R1WkSAnjCXVgjaC79greD4IcbKs +xlTU/1xpTbNEnBxV6hgVUIrAWJzCzn4B0wy6GhBmlBgxrRfZxqUBX/7Ug6tW1MpZ +hwS6em8JpQe0iIUzxQNr9CeacGT3sCvIorGtTslUL6ypEEOmjzoe+EZhpnx9Gzpj +BvPmq9fTtRA2cTG2LDcqLlhSL6VqF8MeNnfOsSTwzfpccrNRMTCIUbEhZgTVb5um +FJrY8hPS8N63RHCDoII1CyM7lxUOPQ7Hdbkiv8DpqEyuGFhtqLXsjMj/sOnu+t9H +Jgg7wFnyPmHG6sqbTSvTUBq1tL6AMoo990QvKA7NKZ6022XFjR2LmkJXRSgOLNEp +uPWID5w0h62CLIgu1CzE3mdsLCwBaVwEUjLJx64jgrQvU3RlcGhlbiBIZW1taW5n +ZXIgPHN0ZXBoZW4uaGVtbWluZ2VyQGdtYWlsLmNvbT6JAjcEEwEIACECGwMFCwkI +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 +=3akb +-----END PGP PUBLIC KEY BLOCK----- diff --git a/iproute2.spec b/iproute2.spec index a3ebb46..1fd9233 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 @@ -70,6 +69,9 @@ BuildRequires: pkgconfig(xtables) >= 1.4.11 BuildRequires: libxtables-devel >= 1.4.11 %endif %endif +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif Provides: iproute = %version-%release %description @@ -100,6 +102,8 @@ This package contains the PDF documentation from iproute2, as well as examples and other outdated files. %prep +xz -dk "%{S:0}" +%{?gpg_verify: %gpg_verify %{S:2}} %if 0%{?__xz:1} %setup -q %else @@ -110,7 +114,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