diff --git a/iproute2-4.11.0.tar.sign b/iproute2-4.11.0.tar.sign new file mode 100644 index 0000000..22f2f37 Binary files /dev/null and b/iproute2-4.11.0.tar.sign differ diff --git a/iproute2-4.11.0.tar.xz b/iproute2-4.11.0.tar.xz new file mode 100644 index 0000000..48416b6 --- /dev/null +++ b/iproute2-4.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 +size 657100 diff --git a/iproute2-4.9.0.tar.sign b/iproute2-4.9.0.tar.sign deleted file mode 100644 index 90720df..0000000 Binary files a/iproute2-4.9.0.tar.sign and /dev/null differ diff --git a/iproute2-4.9.0.tar.xz b/iproute2-4.9.0.tar.xz deleted file mode 100644 index 036fc96..0000000 --- a/iproute2-4.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 -size 613032 diff --git a/iproute2-dirs.diff b/iproute2-dirs.diff index b9bf48f..c6d4aaa 100644 --- a/iproute2-dirs.diff +++ b/iproute2-dirs.diff @@ -4,11 +4,11 @@ tc/q_netem.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) -Index: iproute2-4.8.0/Makefile +Index: iproute2-4.11.0/Makefile =================================================================== ---- iproute2-4.8.0.orig/Makefile -+++ iproute2-4.8.0/Makefile -@@ -4,7 +4,7 @@ endif +--- iproute2-4.11.0.orig/Makefile ++++ iproute2-4.11.0/Makefile +@@ -9,7 +9,7 @@ endif PREFIX?=/usr LIBDIR?=$(PREFIX)/lib @@ -16,8 +16,8 @@ Index: iproute2-4.8.0/Makefile +SBINDIR?=/usr/sbin CONFDIR?=/etc/iproute2 DATADIR?=$(PREFIX)/share - DOCDIR?=$(DATADIR)/doc/iproute2 -@@ -18,7 +18,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + HDRDIR?=$(PREFIX)/include/iproute2 +@@ -24,7 +24,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -26,13 +26,13 @@ Index: iproute2-4.8.0/Makefile ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif -Index: iproute2-4.8.0/netem/Makefile +Index: iproute2-4.11.0/netem/Makefile =================================================================== ---- iproute2-4.8.0.orig/netem/Makefile -+++ iproute2-4.8.0/netem/Makefile +--- iproute2-4.11.0.orig/netem/Makefile ++++ iproute2-4.11.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) - LDLIBS += -lm + LDLIBS += -lm +LIBDIR = /usr/lib + @@ -51,10 +51,10 @@ Index: iproute2-4.8.0/netem/Makefile done clean: -Index: iproute2-4.8.0/tc/q_netem.c +Index: iproute2-4.11.0/tc/q_netem.c =================================================================== ---- iproute2-4.8.0.orig/tc/q_netem.c -+++ iproute2-4.8.0/tc/q_netem.c +--- iproute2-4.11.0.orig/tc/q_netem.c ++++ iproute2-4.11.0/tc/q_netem.c @@ -113,7 +113,7 @@ static int get_distribution(const char * char *line = NULL; char name[128]; diff --git a/iproute2-doc.changes b/iproute2-doc.changes index b2fd601..1abe491 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -1,21 +1,43 @@ +------------------------------------------------------------------- +Thu Jun 29 13:38:22 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 4.11 + * ip: support UID range routing. + * ss: Add inet raw sockets information gathering via netlink diag interface + * ss: print new tcp_info fields: delivery_rate and app_limited + * ss: print new tcp_info fields: busy, rwnd-limited, sndbuf-limited times + * tc: flower: support matching on ICMP type and code + * lwt: BPF support for LWT + * Introduce ip vrf command + * iplink: bridge: add support for displaying xstats + * iplink: bridge_slave: add support for displaying xstats + * ip: Add support for MPLS netconf + +------------------------------------------------------------------- +Sat Jun 10 14:29:22 UTC 2017 - meissner@suse.com + +- split link and compile steps for binaries, so LDFLAGS and CFLAGS + are not mixed so the the PIE default build work. +- Add iproute2-split-make.patch + ------------------------------------------------------------------- Tue Dec 13 14:05:49 UTC 2016 - jengelh@inai.de - Update to new upstream release 4.9 -* bridge: vlan: add support to display per-vlan statistics -* tipc: add the ability to get UDP bearer options -* tc: flower: Introduce vlan support -* ss: output TCP BBR diag information -* iptnl: add support for collect_md flag in IPv4 and IPv6 tunnels -* ss: Support displaying and filtering on socket marks. -* tc: fq: display unthrottle latency -* ip link: Add support to configure SR-IOV VF to vlan protocol 802.1ad (VST QinQ) -* ip rule: add selector support -* bridge: add support for the multicast flood flag -* ip: update link types to show 6lowpan and ieee802.15.4 monitor -* ss: Add support for SCTP protocol -* iproute2: macvlan: add "source" mode - + * bridge: vlan: add support to display per-vlan statistics + * tipc: add the ability to get UDP bearer options + * tc: flower: Introduce vlan support + * ss: output TCP BBR diag information + * iptnl: add support for collect_md flag in IPv4 and IPv6 tunnels + * ss: Support displaying and filtering on socket marks. + * tc: fq: display unthrottle latency + * ip link: Add support to configure SR-IOV VF to vlan protocol + 802.1ad (VST QinQ) + * ip rule: add selector support + * bridge: add support for the multicast flood flag + * ip: update link types to show 6lowpan and ieee802.15.4 monitor + * ss: Add support for SCTP protocol + * iproute2: macvlan: add "source" mode ------------------------------------------------------------------- Wed Nov 16 08:29:11 UTC 2016 - jslaby@suse.com diff --git a/iproute2-doc.spec b/iproute2-doc.spec index e7eb62a..75033f5 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -1,7 +1,7 @@ # # spec file for package iproute2-doc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: iproute2-doc -Version: 4.9 +Version: 4.11 Release: 0 -%define rversion 4.9.0 +%define rversion 4.11.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other diff --git a/iproute2-split-make.patch b/iproute2-split-make.patch new file mode 100644 index 0000000..4310205 --- /dev/null +++ b/iproute2-split-make.patch @@ -0,0 +1,37 @@ +Index: iproute2-4.9.0/misc/Makefile +=================================================================== +--- iproute2-4.9.0.orig/misc/Makefile ++++ iproute2-4.9.0/misc/Makefile +@@ -17,23 +17,24 @@ endif + ifeq ($(IP_CONFIG_SETNS),y) + CFLAGS += -DHAVE_SETNS + endif ++CFLAGS += -I$(DBM_INCLUDE) + + all: $(TARGETS) + + ss: $(SSOBJ) + $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ + +-nstat: nstat.c +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LIBNETLINK) -lm ++nstat: nstat.o ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LIBNETLINK) -lm + +-ifstat: ifstat.c +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LIBNETLINK) -lm ++ifstat: ifstat.o ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LIBNETLINK) -lm + +-rtacct: rtacct.c +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm ++rtacct: rtacct.o ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LIBNETLINK) -lm + +-arpd: arpd.c +- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb -lpthread ++arpd: arpd.o ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LIBNETLINK) -ldb -lpthread + + ssfilter.c: ssfilter.y + $(QUIET_YACC)bison ssfilter.y -o ssfilter.c diff --git a/iproute2.changes b/iproute2.changes index b165766..1abe491 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Jun 29 13:38:22 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 4.11 + * ip: support UID range routing. + * ss: Add inet raw sockets information gathering via netlink diag interface + * ss: print new tcp_info fields: delivery_rate and app_limited + * ss: print new tcp_info fields: busy, rwnd-limited, sndbuf-limited times + * tc: flower: support matching on ICMP type and code + * lwt: BPF support for LWT + * Introduce ip vrf command + * iplink: bridge: add support for displaying xstats + * iplink: bridge_slave: add support for displaying xstats + * ip: Add support for MPLS netconf + +------------------------------------------------------------------- +Sat Jun 10 14:29:22 UTC 2017 - meissner@suse.com + +- split link and compile steps for binaries, so LDFLAGS and CFLAGS + are not mixed so the the PIE default build work. +- Add iproute2-split-make.patch + ------------------------------------------------------------------- Tue Dec 13 14:05:49 UTC 2016 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index a708924..9d69d3f 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,7 +1,7 @@ # # spec file for package iproute2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: iproute2 -Version: 4.9 +Version: 4.11 Release: 0 -%define rversion 4.9.0 +%define rversion 4.11.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -38,6 +38,7 @@ Patch3: revert-pdf-creation.diff Patch4: revert-bison-fix.diff Patch5: kernel_xfrm6_raw.patch Patch6: man-fix-documentation-references-in-manual-pages.patch +Patch7: iproute2-split-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -89,7 +90,7 @@ bash command line completion support for iproute. %if 0%{?sles_version} == 11 %patch -P 4 -p1 %endif -%patch -P 5 -P 6 -p1 +%patch -P 5 -P 6 -P 7 -p1 find . -name *.orig -delete %build