From cf091e08c3bdf3bf6d1960016b8b97398cec2330569d22a03e684c4acbd44117 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 21 May 2016 09:41:49 +0000
Subject: [PATCH] iproute-4.6

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=120
---
 iproute2-4.5.0.tar.sign | Bin 543 -> 0 bytes
 iproute2-4.5.0.tar.xz   |   3 ---
 iproute2-4.6.0.tar.sign | Bin 0 -> 543 bytes
 iproute2-4.6.0.tar.xz   |   3 +++
 iproute2-doc.spec       |   4 ++--
 iproute2.changes        |  13 ++++++++++++
 iproute2.spec           |  44 +++++++++++++++++++++++++---------------
 kernel_xfrm6_raw.patch  |  24 +++++++++++-----------
 8 files changed, 58 insertions(+), 33 deletions(-)
 delete mode 100644 iproute2-4.5.0.tar.sign
 delete mode 100644 iproute2-4.5.0.tar.xz
 create mode 100644 iproute2-4.6.0.tar.sign
 create mode 100644 iproute2-4.6.0.tar.xz

diff --git a/iproute2-4.5.0.tar.sign b/iproute2-4.5.0.tar.sign
deleted file mode 100644
index 26be837ec8bab029cf9f6e322c86e39a71ee4046018be670050ee9076ad526e4..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0SEvF1p-#*Lk9o~2@rs%e_)l(<bHxD5CF*Tj3itq#^h|@<w`;4
zhb+kQl%mL3X}dmNYA_$5x~G<Ij|OCXld=F43&Y_-D)^?_z{%Oq!~J<mY~v?`+)m{+
zb$z8x6I_)YEp=vLdxtrRDN)O;jS?-VWTu%Qy#VK5sGFQ-H_*@@^|`v}%=b}(@}aoH
ztp8D-%p+mhux&`Om*Q-*v#yb<a5}>vbG<)eoWzc-^f9dP;|`>Da8};E*$fUj^R;$h
za_WP3S=i<wlD6$*^=WV>c)vr7{FC7UEJTi;)?XZdM?cSz`0AcHKF%xiX)|fL{}uUF
zn@bW%ZC^2vz~RJmiDebKQoc5J1+aCBst;*|B;*v3-h^&%QVYj6eB^#H{+*4XwGT2J
zw9lC}uwJadzq2R&?4Tdeo0kW%$kf_!H~gg*68*f1AR7&83*f3VD2itQPc(nCBQHGa
z!*hfglBSBJ7h`ZuxQYrpzTDm3A!kblx00Vtube{+<wf)#a;-qTUfmKd1fZ{sBSq2<
zn26qDpxQ+nIIR=oVJt?&Cx;PJz~6MQ*+CXNd)94gzF8GpG#5M!yDxOUoaqigPKIX6
z-VI)uFs5(zi8e5YMuty950U(1tIV0wY<c5}LQ5!YHXPK&yG72&T%de>!7X^%f@T<s
h%CfmVVaEKv4jIoP)R`Q1q}wJTL47_`5ja5m)qpZq2S@+_

diff --git a/iproute2-4.5.0.tar.xz b/iproute2-4.5.0.tar.xz
deleted file mode 100644
index 19b85ea..0000000
--- a/iproute2-4.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
-size 554500
diff --git a/iproute2-4.6.0.tar.sign b/iproute2-4.6.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..d51a8a78f2c87ffe559f447d52a9ac3d3f5e3ab953015a889adb472e73af7f28
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SEvF1p-$*z)S!N2@rs%e_)l(<bG6h5CE3p^O6KccMkXI%9rP%
z4MC5d3(k6eb6_;&d%KAFsz^yj&UmsTy3?_QwwXRH`!m@X_@@@x<lfiDuZY@D)%bgM
zDPou*?$>gQ4sZhsFLAL3rw-nMUEB>!?456$%!div^87e*j}QRo5{-GKs|}vVp=^iY
z=gDS1OJ}$4f{J>&1Z5+NQtPk#{aBLG>+9X1yVq(PwNVQxdHKbW8cNKJ+V`Cb^kvt>
zY||#0I7=^6^kE!nJwy&MhsY*D%Ji~Il%#4-PA{W5r)W#u_PLG^)r&LyOC=fovm-y6
z1@B<-bGVZw-iS8$*qRX3;7St+m{$MTVwL9Tq=ll1Zlg$Ne*^1IS^;zK0b$Ev_a6#t
zCObv2V*RQM+_ANfbM-1=zNW7mpNT31<Ey!&Z85L>Fu_=K*)Y{p&*UaIR#2mnpkM#p
zf1pi+dwdab_|R`Tl?_Wy6D#z!U|>s$J=qwg>ld;5P)HC2lx<tDAY(nkP`KZ#>yw`d
zQf2%K`SenuK+ju<OddKJfl=apzK`2b!yC{vZpr><ynC7ow>DUc$$1Ld%v6=@z3?W@
zmmz6W3G^D#p^<SQ6lXo_qPtXydwUlFKL?=b(4&nw|3I;0szE@a<JOqI2JsoeIA1w+
hDH5k1eq^~m)USj*#8IMlUP|`E0)dy)EF;eUN*Pi543Yo<

literal 0
HcmV?d00001

diff --git a/iproute2-4.6.0.tar.xz b/iproute2-4.6.0.tar.xz
new file mode 100644
index 0000000..ffd3db7
--- /dev/null
+++ b/iproute2-4.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406
+size 570960
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index c7831fb..26b4f19 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        4.5
+Version:        4.6
 Release:        0
-%define rversion 4.5.0
+%define rversion 4.6.0
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
diff --git a/iproute2.changes b/iproute2.changes
index cf4dadb..448ee79 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 4.6
+* vxlan: add support to set flow label
+* tc, bpf: add new csum and tunnel signatures
+* tc, bpf: further improve error reporting
+* tc, bpf: add support for map pre/allocation
+* ip link: Add support for kernel side filtering
+* tc: introduce IFE action
+* add devlink tool
+* iplink: display IFLA_PHYS_PORT_NAME
+
 -------------------------------------------------------------------
 Sat Mar 26 19:01:48 UTC 2016 - jengelh@inai.de
 
diff --git a/iproute2.spec b/iproute2.spec
index ffd240a..cd417f2 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2
-Version:        4.5
+Version:        4.6
 Release:        0
-%define rversion 4.5.0
+%define rversion 4.6.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing
@@ -70,6 +70,14 @@ Provides:       libnetlink = %version-%release
 libnetlink provides a higher-level interface to rtnetlink(7).
 New programs should use libmnl-devel instead.
 
+%package bash-completion
+Summary:        Bash completion for iproute
+License:        GPL-2.0+
+Group:          System/Shells
+
+%description bash-completion
+bash command line completion support for iproute.
+
 %prep
 %setup -qn %name-%rversion
 %patch -P 1 -P 2 -p1
@@ -85,30 +93,30 @@ find . -name *.orig -delete
 %build
 # build with -fPIC. For details see
 # https://bugzilla.novell.com/show_bug.cgi?id=388021
-xt_libdir="$(pkg-config xtables --variable=xtlibdir)";
-xt_cflags="$(pkg-config xtables --cflags)";
+xt_libdir="$(pkg-config xtables --variable=xtlibdir)"
+xt_cflags="$(pkg-config xtables --cflags)"
 make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -Wno-error -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags"
 
 %install
-b="%buildroot";
+b="%buildroot"
 install -d "$b"/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
 install -d "$b"/{/usr/include,%_libdir,/usr/share}
 make install DESTDIR="$b" LIBDIR="%_libdir" \
-	MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name";
+	MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name"
 # We have m_xt
-rm -f "$b/%_libdir/tc/m_ipt.so";
-install -pm0644 "lib/libnetlink.a" "$b/%_libdir/";
-chmod -x "$b/%_libdir/libnetlink.a";
-install -pm0644 "include/libnetlink.h" "$b/%_includedir/";
-chmod -x "$b/%_includedir/libnetlink.h";
+rm -f "$b/%_libdir/tc/m_ipt.so"
+install -pm0644 "lib/libnetlink.a" "$b/%_libdir/"
+chmod -x "$b/%_libdir/libnetlink.a"
+install -pm0644 "include/libnetlink.h" "$b/%_includedir/"
+chmod -x "$b/%_includedir/libnetlink.h"
 #UsrMerge
-ln -s "%_sbindir/ip" "$b/sbin";
-mkdir -p "$b/bin";
-ln -sf "%_sbindir/ip" "$b/bin/ip";
+ln -s "%_sbindir/ip" "$b/sbin"
+mkdir -p "$b/bin"
+ln -sf "%_sbindir/ip" "$b/bin/ip"
 #EndUsrMerge
-rm "$b/%_sbindir/ifcfg";
+rm "$b/%_sbindir/ifcfg"
 
-mkdir -p "$b/%_docdir/%name";
+mkdir -p "$b/%_docdir/%name"
 # packaged in iproute2-doc:
 rm -rf $b/%_docdir/%name/*
 cp -an README* COPYING "$b/%_docdir/%name/"
@@ -136,4 +144,8 @@ cp -an README* COPYING "$b/%_docdir/%name/"
 %_mandir/man3/libnetlink*
 %_libdir/lib*
 
+%files bash-completion
+%defattr(-,root,root)
+%_datadir/bash-completion/
+
 %changelog
diff --git a/kernel_xfrm6_raw.patch b/kernel_xfrm6_raw.patch
index 4491684..1226883 100644
--- a/kernel_xfrm6_raw.patch
+++ b/kernel_xfrm6_raw.patch
@@ -12,12 +12,12 @@ and included in openSUSE so as to facilitate mip6d-ng.
  ip/xfrm_state.c  |    1 +
  3 files changed, 3 insertions(+), 1 deletion(-)
 
-Index: iproute2-3.18.0/ip/ipxfrm.c
+Index: iproute2-4.6.0/ip/ipxfrm.c
 ===================================================================
---- iproute2-3.18.0.orig/ip/ipxfrm.c
-+++ iproute2-3.18.0/ip/ipxfrm.c
-@@ -115,7 +115,7 @@ struct typeent {
- static const struct typeent xfrmproto_types[]= {
+--- iproute2-4.6.0.orig/ip/ipxfrm.c
++++ iproute2-4.6.0/ip/ipxfrm.c
+@@ -114,7 +114,7 @@ struct typeent {
+ static const struct typeent xfrmproto_types[] = {
  	{ "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP },
  	{ "route2", IPPROTO_ROUTING }, { "hao", IPPROTO_DSTOPTS },
 -	{ "ipsec-any", IPSEC_PROTO_ANY },
@@ -25,10 +25,10 @@ Index: iproute2-3.18.0/ip/ipxfrm.c
  	{ NULL, -1 }
  };
  
-Index: iproute2-3.18.0/ip/xfrm_policy.c
+Index: iproute2-4.6.0/ip/xfrm_policy.c
 ===================================================================
---- iproute2-3.18.0.orig/ip/xfrm_policy.c
-+++ iproute2-3.18.0/ip/xfrm_policy.c
+--- iproute2-4.6.0.orig/ip/xfrm_policy.c
++++ iproute2-4.6.0/ip/xfrm_policy.c
 @@ -93,6 +93,7 @@ static void usage(void)
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
@@ -37,11 +37,11 @@ Index: iproute2-3.18.0/ip/xfrm_policy.c
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
  	fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
  	fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n");
-Index: iproute2-3.18.0/ip/xfrm_state.c
+Index: iproute2-4.6.0/ip/xfrm_state.c
 ===================================================================
---- iproute2-3.18.0.orig/ip/xfrm_state.c
-+++ iproute2-3.18.0/ip/xfrm_state.c
-@@ -73,6 +73,7 @@ static void usage(void)
+--- iproute2-4.6.0.orig/ip/xfrm_state.c
++++ iproute2-4.6.0/ip/xfrm_state.c
+@@ -72,6 +72,7 @@ static void usage(void)
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
  	fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP));