diff --git a/iproute2-3.16.0.tar.sign b/iproute2-3.16.0.tar.sign deleted file mode 100644 index 0aaa33a..0000000 Binary files a/iproute2-3.16.0.tar.sign and /dev/null differ diff --git a/iproute2-3.16.0.tar.xz b/iproute2-3.16.0.tar.xz deleted file mode 100644 index 5bfe1a1..0000000 --- a/iproute2-3.16.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79 -size 438820 diff --git a/iproute2-3.17.0.tar.sign b/iproute2-3.17.0.tar.sign new file mode 100644 index 0000000..83346bb Binary files /dev/null and b/iproute2-3.17.0.tar.sign differ diff --git a/iproute2-3.17.0.tar.xz b/iproute2-3.17.0.tar.xz new file mode 100644 index 0000000..bae7fa2 --- /dev/null +++ b/iproute2-3.17.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000 +size 440188 diff --git a/iproute2-doc.changes b/iproute2-doc.changes index 846279a..cdc67f1 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz + +- Update to new upstream release 3.17 +* ip: allow to set ipv6 address generation mode +* nstat: 64-bit support on 32-bit architectures +* ip: do not require "name" keyword when adding device + (3.16 regression) +* ip: support of usec rtt in tcp_metrics +* ip: allow to change slave options via type_slave +* ip: add support for IPv6 VTI tunnels +* tc: rsvp/tcindex/route classifier support for multiple actions +* ip: print stats with "ip -s addr show" +- Add revert-bison-fix.diff: + fix build on SLE11 + ------------------------------------------------------------------- Sun Aug 10 16:02:36 UTC 2014 - jengelh@inai.de diff --git a/iproute2-doc.spec b/iproute2-doc.spec index 201eda2..a4cba7c 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -17,9 +17,9 @@ Name: iproute2-doc -Version: 3.16 +Version: 3.17 Release: 0 -%define rversion 3.16.0 +%define rversion 3.17.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other diff --git a/iproute2.changes b/iproute2.changes index 846279a..11487b8 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz + +- Update to new upstream release 3.17 +* ip: allow to set ipv6 address generation mode +* nstat: 64bit support on 32bit architectures +* ip: don't require "name" keyword when adding device + (3.16 regression) +* ip: support of usec rtt in tcp_metrics +* ip: allow to change slave options via type_slave +* ip: add support for IPv6 VTI tunnels +* tc: rsvp/tcindex/route classifier support for multiple actions +* ip: print stats with "ip -s addr show" +- Add revert-bison-fix.diff: + fix build on SLE11 + ------------------------------------------------------------------- Sun Aug 10 16:02:36 UTC 2014 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index 3f64ad2..fa7d044 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,9 @@ Name: iproute2 -Version: 3.16 +Version: 3.17 Release: 0 -%define rversion 3.16.0 +%define rversion 3.17.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -35,6 +35,7 @@ Source667: %name.keyring Patch1: iproute2-dirs.diff Patch2: iproute2-HZ.diff Patch3: revert-pdf-creation.diff +Patch4: revert-bison-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -69,17 +70,14 @@ Provides: libnetlink = %version-%release libnetlink provides a higher level interface to rtnetlink(7). %prep -%{?gpg_verify: xz -dfk "%{S:0}"; %gpg_verify %{S:2}} -%if 0%{?__xz:1} %setup -qn %name-%rversion -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name-%rversion -%endif %patch -P 1 -P 2 -p1 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) %patch -P 3 -p1 %endif +%if 0%{?sles_version} == 11 +%patch -P 4 -p1 +%endif find . -name *.orig -delete %build @@ -127,9 +125,8 @@ cp -an README* COPYING "$b/%_docdir/%name/" %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* -%_libdir/tc -%dir %_datadir/tc -%attr(644,root,root)%_datadir/tc/* +%_libdir/tc/ +%_datadir/tc/ %files -n libnetlink-devel %defattr(-,root,root) diff --git a/revert-bison-fix.diff b/revert-bison-fix.diff new file mode 100644 index 0000000..d3e11bf --- /dev/null +++ b/revert-bison-fix.diff @@ -0,0 +1,28 @@ +From 184ea2afa279c94248db86f74a3f4fd3ba3cded1 Mon Sep 17 00:00:00 2001 +From: Michal Kubecek +Date: Tue, 25 Nov 2014 08:39:36 +0100 +Subject: [PATCH] Revert "emp: fix warning on deprecated bison directive" + +This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. + +For SLE11 only. Its bison [version 2.3] does not allow new syntax. +--- + tc/emp_ematch.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tc/emp_ematch.y b/tc/emp_ematch.y +index bc08da2..7043a80 100644 +--- a/tc/emp_ematch.y ++++ b/tc/emp_ematch.y +@@ -9,7 +9,7 @@ + %locations + %token-table + %error-verbose +-%name-prefix "ematch_" ++%name-prefix="ematch_" + + %union { + unsigned int i; +-- +1.8.4.5 +