Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2017-12-13 11:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2" Wed Dec 13 11:55:51 2017 rev:93 rq:555790 version:4.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2017-09-09 20:22:35.891382608 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2017-12-13 11:55:55.219769251 +0100 @@ -1,0 +2,25 @@ +Sun Dec 10 23:47:36 UTC 2017 - [email protected] + +- Remove iproute2-doc (removed upstream) and + doc-revert-PDF-creation.patch . + +------------------------------------------------------------------- +Fri Nov 17 21:05:25 UTC 2017 - [email protected] + +- Update to new upstream release 4.14.1 + * ss: distinguish between IPv4 and IPv6 wildcard sockets + * bridge: this patch adds json support for bridge mdb show + * tc actions: improved batching and time filtered dumping + * iproute: add support for SRv6 local segment processing + * ip: add new command line argument -json (mutually exclusive with -color) + * gre: add support for ERSPAN tunnel + * tc: m_ife: allow ife type to zero + * tc: m_ife: print IEEE ethertype format + * iproute: add support for seg6 l2encap mode + * devlink: Add support for special format protocol headers + * devlink: Add support for protocol IPv4/IPv6/Ethernet special formats + * ss: detect IPPROTO_ICMPV6 sockets + * tc/actions: introduce support for jump action + * devlink: add batch command support + +------------------------------------------------------------------- Old: ---- doc-revert-PDF-creation.patch iproute2-4.13.0.tar.sign iproute2-4.13.0.tar.xz iproute2-doc.changes iproute2-doc.spec pre_checkin.sh New: ---- iproute2-4.14.1.tar.sign iproute2-4.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.QFxgcp/_old 2017-12-13 11:55:56.711697230 +0100 +++ /var/tmp/diff_new_pack.QFxgcp/_new 2017-12-13 11:55:56.715697037 +0100 @@ -17,9 +17,9 @@ Name: iproute2 -Version: 4.13 +Version: 4.14.1 Release: 0 -%define rversion 4.13.0 +%define rversion 4.14.1 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -30,11 +30,19 @@ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 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 -Source666: pre_checkin.sh -Source667: %name.keyring +Source9: %name.keyring +Patch1: adjust-installation-directories-for-openSUSE-SLE.patch +Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch +Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch +Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch +Patch5: man-fix-documentation-references-in-manual-pages.patch +Patch6: split-link-and-compile-steps-for-binaries.patch +Patch7: examples-fix-bashisms-in-example-script.patch +Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel +BuildRequires: fdupes BuildRequires: flex BuildRequires: libelf-devel BuildRequires: pkgconfig >= 0.21 @@ -48,16 +56,6 @@ Provides: iproute = %version-%release Provides: %name(xfrm6_raw) = %version-%release -Patch1: adjust-installation-directories-for-openSUSE-SLE.patch -Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch -Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch -Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch -Patch5: man-fix-documentation-references-in-manual-pages.patch -Patch6: split-link-and-compile-steps-for-binaries.patch -Patch7: examples-fix-bashisms-in-example-script.patch -Patch101: doc-revert-PDF-creation.patch -Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch - %description iproute2 is a collection of user-space utilities to set up networking under Linux from the command-line. It can inspect and configure, @@ -86,18 +84,9 @@ %prep %setup -qn %name-%rversion -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) -%patch101 -p1 -%endif +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1 %if 0%{?sles_version} == 11 -%patch102 -p1 +%patch -P 102 -p1 %endif find . -name *.orig -delete @@ -126,20 +115,14 @@ ln -sf "%_sbindir/ip" "$b/bin/ip" #EndUsrMerge for BIN in lnstat nstat routef routel ss; do - ln -sf "%{_sbindir}/$BIN" "$b%{_bindir}/$BIN" + ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" done rm "$b/%_sbindir/ifcfg" - -mkdir -p "$b/%_docdir/%name" -# packaged in iproute2-doc: -rm -rf $b/%_docdir/%name/* cp -an README* COPYING "$b/%_docdir/%name/" +%fdupes %buildroot/%_prefix %files %defattr(-,root,root) -%dir %_docdir/%name -%_docdir/%name/README* -%_docdir/%name/COPYING %_bindir/lnstat %_bindir/nstat %_bindir/routef @@ -156,6 +139,7 @@ %config(noreplace) %_sysconfdir/iproute2/* %_libdir/tc/ %_datadir/tc/ +%_docdir/%name/ %files -n libnetlink-devel %defattr(-,root,root) ++++++ adjust-installation-directories-for-openSUSE-SLE.patch ++++++ --- /var/tmp/diff_new_pack.QFxgcp/_old 2017-12-13 11:55:56.739695878 +0100 +++ /var/tmp/diff_new_pack.QFxgcp/_new 2017-12-13 11:55:56.739695878 +0100 @@ -5,15 +5,15 @@ Match the directory layout of openSUSE and SLE. --- - Makefile | 4 ++-- - netem/Makefile | 6 ++++-- - tc/q_netem.c | 2 +- - 3 files changed, 7 insertions(+), 5 deletions(-) + Makefile | 4 ++-- + netem/Makefile | 5 +++-- + tc/q_netem.c | 2 +- + 3 files changed, 6 insertions(+), 5 deletions(-) -diff --git a/Makefile b/Makefile -index dbb4a4afd608..3069ee91e159 100644 ---- a/Makefile -+++ b/Makefile +Index: iproute2-4.14.1/Makefile +=================================================================== +--- iproute2-4.14.1.orig/Makefile ++++ iproute2-4.14.1/Makefile @@ -6,7 +6,7 @@ endif PREFIX?=/usr @@ -32,20 +32,19 @@ ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif -diff --git a/netem/Makefile b/netem/Makefile -index 2499f086f24d..9e36fe91fa41 100644 ---- a/netem/Makefile -+++ b/netem/Makefile -@@ -7,6 +7,8 @@ HOSTCC ?= $(CC) +Index: iproute2-4.14.1/netem/Makefile +=================================================================== +--- iproute2-4.14.1.orig/netem/Makefile ++++ iproute2-4.14.1/netem/Makefile +@@ -6,6 +6,7 @@ DISTDATA = normal.dist pareto.dist paret + HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm - +LIBDIR = /usr/lib -+ - ifeq ($(HAVE_MNL),y) - CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) - LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs) -@@ -27,9 +29,9 @@ stats: stats.c + + all: $(DISTGEN) $(DISTDATA) + +@@ -22,9 +23,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ [email protected] -lm install: all @@ -57,11 +56,11 @@ done clean: -diff --git a/tc/q_netem.c b/tc/q_netem.c -index 5a9e747411e8..34c8f4315abd 100644 ---- a/tc/q_netem.c -+++ b/tc/q_netem.c -@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) +Index: iproute2-4.14.1/tc/q_netem.c +=================================================================== +--- iproute2-4.14.1.orig/tc/q_netem.c ++++ iproute2-4.14.1/tc/q_netem.c +@@ -113,7 +113,7 @@ static int get_distribution(const char * char *line = NULL; char name[128]; @@ -70,6 +69,3 @@ if ((f = fopen(name, "r")) == NULL) { fprintf(stderr, "No distribution data for %s (%s: %s)\n", type, name, strerror(errno)); --- -2.14.1 - ++++++ iproute2-4.13.0.tar.xz -> iproute2-4.14.1.tar.xz ++++++ ++++ 49423 lines of diff (skipped) ++++++ split-link-and-compile-steps-for-binaries.patch ++++++ --- /var/tmp/diff_new_pack.QFxgcp/_old 2017-12-13 11:55:57.095678693 +0100 +++ /var/tmp/diff_new_pack.QFxgcp/_new 2017-12-13 11:55:57.095678693 +0100 @@ -7,22 +7,21 @@ applied to the phase they are intended for. This is needed for PIE default to work. --- - misc/Makefile | 17 +++++++++-------- + misc/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -diff --git a/misc/Makefile b/misc/Makefile -index fa90308e4848..5445bbc08356 100644 ---- a/misc/Makefile -+++ b/misc/Makefile -@@ -17,6 +17,7 @@ endif - ifeq ($(IP_CONFIG_SETNS),y) - CFLAGS += -DHAVE_SETNS +Index: iproute2-4.14.1/misc/Makefile +=================================================================== +--- iproute2-4.14.1.orig/misc/Makefile ++++ iproute2-4.14.1/misc/Makefile +@@ -8,23 +8,24 @@ include ../config.mk + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd endif +CFLAGS += -I$(DBM_INCLUDE) - ifeq ($(HAVE_MNL),y) - CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) -@@ -28,17 +29,17 @@ all: $(TARGETS) + all: $(TARGETS) + ss: $(SSOBJ) $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ @@ -48,6 +47,3 @@ ssfilter.c: ssfilter.y $(QUIET_YACC)bison ssfilter.y -o ssfilter.c --- -2.14.1 -
