From 538c8930517608aba1c282d2222cc6ff43bb77c775cd6fbdc6b21477ec591665 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 17 Nov 2017 21:11:21 +0000
Subject: [PATCH] iproute2-4.14.1

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=149
---
 ...llation-directories-for-openSUSE-SLE.patch |  50 ++++++++----------
 iproute2-4.13.0.tar.sign                      | Bin 566 -> 0 bytes
 iproute2-4.13.0.tar.xz                        |   3 --
 iproute2-4.14.1.tar.sign                      | Bin 0 -> 566 bytes
 iproute2-4.14.1.tar.xz                        |   3 ++
 iproute2-doc.spec                             |   4 +-
 iproute2.changes                              |  19 +++++++
 iproute2.spec                                 |   4 +-
 ...-link-and-compile-steps-for-binaries.patch |  24 ++++-----
 9 files changed, 59 insertions(+), 48 deletions(-)
 delete mode 100644 iproute2-4.13.0.tar.sign
 delete mode 100644 iproute2-4.13.0.tar.xz
 create mode 100644 iproute2-4.14.1.tar.sign
 create mode 100644 iproute2-4.14.1.tar.xz

diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch
index 79e3021..4f68a48 100644
--- a/adjust-installation-directories-for-openSUSE-SLE.patch
+++ b/adjust-installation-directories-for-openSUSE-SLE.patch
@@ -5,15 +5,15 @@ Patch-mainline: Never, SUSE specific
 
 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 @@ index dbb4a4afd608..3069ee91e159 100644
  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 $@ $@.c -lm
  
  install: all
@@ -57,11 +56,11 @@ index 2499f086f24d..9e36fe91fa41 100644
  	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 @@ index 5a9e747411e8..34c8f4315abd 100644
  	if ((f = fopen(name, "r")) == NULL) {
  		fprintf(stderr, "No distribution data for %s (%s: %s)\n",
  			type, name, strerror(errno));
--- 
-2.14.1
-
diff --git a/iproute2-4.13.0.tar.sign b/iproute2-4.13.0.tar.sign
deleted file mode 100644
index 2fd45958e975b23e3013bf3f6a9e663aa79b9f657e9acef7e940e995446481c4..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$HxpL;wm25P+wD
zV3p0}ex+~^{0+W+ihxk!$r`IPYF<Th-W=v9iVc3S>nFDRnW-3ybolF4)DXa$kp%?|
ziF>p=SIX|-@l^wNmO`LKS%(;MV+JoJZpChk3V(yEA~J`Y(ulR1!gBK@<E3hlZ??l(
zh@gG+jD?mg#}N#t9{<5o?a&0;C@$q+qhf4p07c)%tFDxs0q@zDV#`=i83WJQX_$$k
z_9J%?Sm{{TpKI<$^+{Zv7TRDAZ%=)I=vJ<R&^b*vJHX+N$FJSS+HP{T*)4xbO;Cw%
z6s)cmbli3mpV%`N_;IcD_20dYhs_evt1c-yV`!10N)GOXhHM#Ju}J@cCZ?If5I1<7
zccB;$s!C?|Cw^&MhsW@vaYM@pNsIgJ{Buov<1G{A`OqdFj)!$|^pBt#fQVEc;$(9c
zrG#fe=fVA0jtO%G{0_JZ2)|)ag49-r0<Pxvp+3#RuJDSCLXKxj)ZlR@dc9Tab;Yys
z<PcndTzAhxp^{w3CH$V8(pK}?{=@cy=xFvIJrQmQR4??`K#;YvXPNHyr&TUg8Qf0b
z5OG*+`V%=U`teV71A*d=bn1l#od|tq(E)Z=H^^VGe}u;F&5KWA*|@~aBEtz};h9Q;
z(>T{Dc87=`0bkMiYu!!Uwh&yYc!@A_OZXQj!WNawX^=X}CAah{Svy_9psbEu|GgMR
E7)^{CMF0Q*

diff --git a/iproute2-4.13.0.tar.xz b/iproute2-4.13.0.tar.xz
deleted file mode 100644
index 7c2c4e0..0000000
--- a/iproute2-4.13.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50
-size 670340
diff --git a/iproute2-4.14.1.tar.sign b/iproute2-4.14.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..2008e71cff0f2e3385fc4a02e3febf42775265d5bb8e9c23faabae3ae0fede56
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$K^*^#BS95P+wD
zV3p0}ey7|J0Lx`AaYZm-n5qE%lMc2$R-v~kO)P1MAG1ZUarwX>Ds!@c%z49C7%8C+
z?#bzRPM-+Rw7@O#cxX&kKKk=e4(`p=%Y<CT3b_4oc&36whWp01euAMX3K#%ES`mme
z6OUwLUV?E}Rb9c>bcdE8im*bLfi<^@TZ9(*oyRio<c!HpPa1SYbJqF1$ALNVCmpC`
z{>z7gVvK<Xu-uZf!kke_QOEQC#aV<P?+u{s-l*tGTWFvRr8bkZpNHU1F124B><0Lr
z>aLSWgL4;ZjMcpvQxng01`QB3Ls3=(-MfwjjAMpLojqK4X^^bgW_jHMx&w`0Ww)%0
z`DrH=^Qy0?3MMI-`{5uelg{-w&I$4zPG|UJPavgx-E9gC23zWdxr1v((UjrCs?M%+
zQQ-YJY-SpC|Be`R$;>u!03u|7D|3k5>mOI__HuLe&Qek+;$HslB+W%<xsJFgiz-lM
zHa=t}-ELkQv1XE!-3TS}zF@+m4Bg0~TR5@xq|D0u-O2$EwiA<PZ;l#C+7*2y;mzS}
z^tKg%q;?za#SAu_3V_}^=@Ctz_Y+C@Y%fRVPK9BF+44dmpBa^sQQ18!-9pnUTl-R2
z4$_VbA%m)VzT@cM#<%AuQK_`KJ8f%m#wU}03ELGuEXce*58@m@1#_fFZ&3h(t^72Y
EyAL7~$^ZZW

literal 0
HcmV?d00001

diff --git a/iproute2-4.14.1.tar.xz b/iproute2-4.14.1.tar.xz
new file mode 100644
index 0000000..31ae5d1
--- /dev/null
+++ b/iproute2-4.14.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067
+size 636876
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index 67da7db..f7294c1 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        4.13
+Version:        4.14.1
 Release:        0
-%define rversion 4.13.0
+%define rversion 4.14.1
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
diff --git a/iproute2.changes b/iproute2.changes
index df718c8..e072ec9 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Nov 17 21:05:25 UTC 2017 - jengelh@inai.de
+
+- 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
+
 -------------------------------------------------------------------
 Wed Sep  6 07:09:53 UTC 2017 - mkubecek@suse.cz
 
diff --git a/iproute2.spec b/iproute2.spec
index 62db6ff..0c82105 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -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
diff --git a/split-link-and-compile-steps-for-binaries.patch b/split-link-and-compile-steps-for-binaries.patch
index 8b01a45..9e74ba2 100644
--- a/split-link-and-compile-steps-for-binaries.patch
+++ b/split-link-and-compile-steps-for-binaries.patch
@@ -7,22 +7,21 @@ Do not compile and link in one step so that CFLAGS and LDFLAGS are only
 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 @@ index fa90308e4848..5445bbc08356 100644
  
  ssfilter.c: ssfilter.y
  	$(QUIET_YACC)bison ssfilter.y -o ssfilter.c
--- 
-2.14.1
-