diff --git a/iproute2-3.11.0.tar.sign b/iproute2-3.11.0.tar.sign new file mode 100644 index 0000000..e4f9e2d Binary files /dev/null and b/iproute2-3.11.0.tar.sign differ diff --git a/iproute2-3.11.0.tar.xz b/iproute2-3.11.0.tar.xz new file mode 100644 index 0000000..65e25ef --- /dev/null +++ b/iproute2-3.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ab31b52b5fd5ff0d3cf03f2068f05eeb4f0b37d107070fbbaacac94df5e88b7 +size 420300 diff --git a/iproute2-3.9.0.tar.sign b/iproute2-3.9.0.tar.sign deleted file mode 100644 index 4d45436..0000000 Binary files a/iproute2-3.9.0.tar.sign and /dev/null differ diff --git a/iproute2-3.9.0.tar.xz b/iproute2-3.9.0.tar.xz deleted file mode 100644 index 1bb9698..0000000 --- a/iproute2-3.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16f027af432a05085813a2f859b7d42dafd29b8c035ead830d37565b7397592d -size 412616 diff --git a/iproute2-dirs.diff b/iproute2-dirs.diff index 82f3ae6..83718ed 100644 --- a/iproute2-dirs.diff +++ b/iproute2-dirs.diff @@ -4,10 +4,10 @@ netem/Makefile | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) -Index: iproute2-3.8.0/Makefile +Index: iproute2-3.11.0/Makefile =================================================================== ---- iproute2-3.8.0.orig/Makefile -+++ iproute2-3.8.0/Makefile +--- iproute2-3.11.0.orig/Makefile ++++ iproute2-3.11.0/Makefile @@ -1,7 +1,7 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr @@ -18,7 +18,7 @@ Index: iproute2-3.8.0/Makefile DATADIR=$(PREFIX)/share DOCDIR=$(DATADIR)/doc/iproute2 @@ -33,7 +33,7 @@ CCOPTS = -O2 - WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes + WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes WFLAGS += -Wmissing-declarations -Wold-style-definition -CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) @@ -26,10 +26,10 @@ Index: iproute2-3.8.0/Makefile YACCFLAGS = -d -t -v SUBDIRS=lib ip tc bridge misc netem genl man -Index: iproute2-3.8.0/include/iptables.h +Index: iproute2-3.11.0/include/iptables.h =================================================================== ---- iproute2-3.8.0.orig/include/iptables.h -+++ iproute2-3.8.0/include/iptables.h +--- iproute2-3.11.0.orig/include/iptables.h ++++ iproute2-3.11.0/include/iptables.h @@ -5,7 +5,7 @@ #include "libiptc/libiptc.h" @@ -39,10 +39,10 @@ Index: iproute2-3.8.0/include/iptables.h #endif #ifndef IPPROTO_SCTP -Index: iproute2-3.8.0/netem/Makefile +Index: iproute2-3.11.0/netem/Makefile =================================================================== ---- iproute2-3.8.0.orig/netem/Makefile -+++ iproute2-3.8.0/netem/Makefile +--- iproute2-3.11.0.orig/netem/Makefile ++++ iproute2-3.11.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm diff --git a/iproute2.changes b/iproute2.changes index 5de8f9e..ccd435d 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Sep 12 21:44:57 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 3.11 +* Support for Linux 3.11 +* iptunnel: check SIT_ISATAP flag only for SIT tunnel +* ss: show destination address for netlink sockets +* ss: Get netlink sockets info via sock_diag +* vxlan: Allow setting destination to unicast address +* ss: add fastopen support +* htb: report overhead attribute +* ip: allow to specify mode for sit tunnels +* ip: iplink_vlan: add 802.1ad support +* iptuntap: allow creation of multi-queue tun/tap device + ------------------------------------------------------------------- Wed Sep 11 13:13:56 UTC 2013 - werner@suse.de diff --git a/iproute2.spec b/iproute2.spec index dea148f..a508c39 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,8 +17,9 @@ Name: iproute2 -Version: 3.9.0 +Version: 3.11 Release: 0 +%define rversion 3.11.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -27,8 +28,8 @@ 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: 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 +Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz +Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign Patch1: iproute2-dirs.diff Patch2: iproute2-HZ.diff Patch3: revert-pdf-creation.diff @@ -72,9 +73,6 @@ 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 @@ -105,13 +103,12 @@ 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}} +%{?gpg_verify: xz -dfk "%{S:0}"; %gpg_verify %{S:2}} %if 0%{?__xz:1} -%setup -q +%setup -qn %name-%rversion %else tar -xf "%{S:0}" --use=xz; -%setup -DTq +%setup -DTqn %name-%rversion %endif %patch -P 1 -P 2 -p1 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)