From 1357f6f4a5a9948c67320361d7722ca4069f1c6a273148a16fedff75372d0fae Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 26 Mar 2016 19:14:46 +0000
Subject: [PATCH] - Update to new upstream release 4.5

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=117
---
 iproute2-4.4.0.tar.sign | Bin 543 -> 0 bytes
 iproute2-4.4.0.tar.xz   |   3 ---
 iproute2-4.5.0.tar.sign | Bin 0 -> 543 bytes
 iproute2-4.5.0.tar.xz   |   3 +++
 iproute2-dirs.diff      |  40 +++++++++++++---------------------------
 iproute2-doc.changes    |  15 +++++++++++++++
 iproute2-doc.spec       |   4 ++--
 iproute2.changes        |  15 +++++++++++++++
 iproute2.spec           |   4 ++--
 9 files changed, 50 insertions(+), 34 deletions(-)
 delete mode 100644 iproute2-4.4.0.tar.sign
 delete mode 100644 iproute2-4.4.0.tar.xz
 create mode 100644 iproute2-4.5.0.tar.sign
 create mode 100644 iproute2-4.5.0.tar.xz

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

literal 543
zcmV+)0^t3L0vrSY0SEvF1p-!+*+2ja2@rs%e_)l(<bIlN5B@Pf9KNI^Zxvt615&uQ
zW3ge!hZVzkk{~#gy-VSHMV3NrFMwkYF>G5w9h5(XPaNQ<a><w@({Q@vIu_u9t0Sn6
z1DFMKtmU}%m|v3D`+uXjPRn>UAhLh-h@bhMK5#Gb7AaPxFjHM5ncT~XxvKM#50Wn-
zxi#ETS^EC}4a;+a+{`y&B6fDd`P5uWa@jW1Zg<$F$xA&;Y1freFn=GfE7U_b+xy`-
zboow-o}uqSWi2nIu;1)A1Efvtq(3n1wQ8MZOz?m8aj!HkcpBCU(=>P1ad6{hyVGRY
zP9x3h9*2LviQj_UYCxG!n%F$H8E~^qIga-~E6C&iNust_rqP0se!ZlxS+}0CR;E2&
zj!vyV7=Skof3Shb_faXnV5>pS3gTWFSK4=p35S+?wz#tUhM8_3_yY-VNbFBgz6tOI
zEPwn~%d+0?2~|JtvfIODo^WSt)jo@U!DAT_7%t3+x$!YcArQwze(cpks1txCqb*uV
zM}SvA90%a!QE}?D3@TxEL|9ILLU5e+_->?`)`-Pj+>%1ycnxoegJo-zT-Ya5+0`Wz
z=f}J<RlZVG$@gEog#6pyvwD-~WeAm6;TPt@TU~Nn-V0y%im|%g5DgTI1njM#OvS&=
hyjums#!=o-c5M00FExkXG0156s+c)(&aeyn5QIVR4Z{Ec

diff --git a/iproute2-4.4.0.tar.xz b/iproute2-4.4.0.tar.xz
deleted file mode 100644
index b26a0fb..0000000
--- a/iproute2-4.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514
-size 528552
diff --git a/iproute2-4.5.0.tar.sign b/iproute2-4.5.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..26be837ec8bab029cf9f6e322c86e39a71ee4046018be670050ee9076ad526e4
GIT binary patch
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@+_

literal 0
HcmV?d00001

diff --git a/iproute2-4.5.0.tar.xz b/iproute2-4.5.0.tar.xz
new file mode 100644
index 0000000..19b85ea
--- /dev/null
+++ b/iproute2-4.5.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
+size 554500
diff --git a/iproute2-dirs.diff b/iproute2-dirs.diff
index 42c5606..56b11cb 100644
--- a/iproute2-dirs.diff
+++ b/iproute2-dirs.diff
@@ -1,14 +1,13 @@
 ---
- Makefile           |    4 ++--
- include/iptables.h |    2 +-
- netem/Makefile     |    6 ++++--
- tc/q_netem.c       |    2 +-
- 4 files changed, 8 insertions(+), 6 deletions(-)
+ Makefile       |    4 ++--
+ netem/Makefile |    6 ++++--
+ tc/q_netem.c   |    2 +-
+ 3 files changed, 7 insertions(+), 5 deletions(-)
 
-Index: iproute2-4.1.0/Makefile
+Index: iproute2-4.5.0/Makefile
 ===================================================================
---- iproute2-4.1.0.orig/Makefile
-+++ iproute2-4.1.0/Makefile
+--- iproute2-4.5.0.orig/Makefile
++++ iproute2-4.5.0/Makefile
 @@ -1,6 +1,6 @@
  PREFIX?=/usr
  LIBDIR?=$(PREFIX)/lib
@@ -26,23 +25,10 @@ Index: iproute2-4.1.0/Makefile
  ifneq ($(SHARED_LIBS),y)
  DEFINES+= -DNO_SHARED_LIBS
  endif
-Index: iproute2-4.1.0/include/iptables.h
+Index: iproute2-4.5.0/netem/Makefile
 ===================================================================
---- iproute2-4.1.0.orig/include/iptables.h
-+++ iproute2-4.1.0/include/iptables.h
-@@ -5,7 +5,7 @@
- #include "libiptc/libiptc.h"
- 
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR LIBDIR
- #endif
- 
- #ifndef IPPROTO_SCTP
-Index: iproute2-4.1.0/netem/Makefile
-===================================================================
---- iproute2-4.1.0.orig/netem/Makefile
-+++ iproute2-4.1.0/netem/Makefile
+--- iproute2-4.5.0.orig/netem/Makefile
++++ iproute2-4.5.0/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 
@@ -64,10 +50,10 @@ Index: iproute2-4.1.0/netem/Makefile
  	done
  
  clean:
-Index: iproute2-4.1.0/tc/q_netem.c
+Index: iproute2-4.5.0/tc/q_netem.c
 ===================================================================
---- iproute2-4.1.0.orig/tc/q_netem.c
-+++ iproute2-4.1.0/tc/q_netem.c
+--- iproute2-4.5.0.orig/tc/q_netem.c
++++ iproute2-4.5.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 d0b48f1..cf4dadb 100644
--- a/iproute2-doc.changes
+++ b/iproute2-doc.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Mar 26 19:01:48 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 4.5
+* {f,m}_bpf: allow for sharing maps
+* geneve: add support for IPv6 link partners
+* geneve: add support for lwt tunnel creation and dst port selection
+* route: allow routes to be configured with expire values
+* iplink: support setting addrgenmode stable_secret
+* tipc: add peer remove functionality
+* tc, clsact: add clsact frontend
+* ss: support closing inet sockets via SOCK_DESTROY.
+* bridge: support for static and dynamic fdb entries
+* iplink: Support VF Trust
+
 -------------------------------------------------------------------
 Thu Jan 14 09:57:42 UTC 2016 - mkubecek@suse.cz
 
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index 7a274ef..e2663ac 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        4.4
+Version:        4.5
 Release:        0
-%define rversion 4.4.0
+%define rversion 4.5.0
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
diff --git a/iproute2.changes b/iproute2.changes
index d0b48f1..cf4dadb 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Mar 26 19:01:48 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 4.5
+* {f,m}_bpf: allow for sharing maps
+* geneve: add support for IPv6 link partners
+* geneve: add support for lwt tunnel creation and dst port selection
+* route: allow routes to be configured with expire values
+* iplink: support setting addrgenmode stable_secret
+* tipc: add peer remove functionality
+* tc, clsact: add clsact frontend
+* ss: support closing inet sockets via SOCK_DESTROY.
+* bridge: support for static and dynamic fdb entries
+* iplink: Support VF Trust
+
 -------------------------------------------------------------------
 Thu Jan 14 09:57:42 UTC 2016 - mkubecek@suse.cz
 
diff --git a/iproute2.spec b/iproute2.spec
index 3dc4cae..ffd240a 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2
-Version:        4.4
+Version:        4.5
 Release:        0
-%define rversion 4.4.0
+%define rversion 4.5.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing