From d22c7dae73639694f3f0cd0f5ca84525c0b7691fa7e8f550060a3e7624b5a9c3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Sep 2018 12:37:01 +0000 Subject: [PATCH] Accepting request 632403 from home:mkubecek:branches:security:netfilter - Update to new upstream release 4.18 * tc: more JSON output * vxlan: fix ttl inherit behavior * gre/gre6: allow clearing {,i,o}{key,seq,csum} flags * bpf: don't offload perf array maps * tipc: Add support to set and get MTU for UDP bearer * tc: flower: add support for verbose logging * rdma: print driver resource attributes * devlink: introduce support for showing port flavours * ip address: Add support for address metric * ip route: print RTA_CACHEINFO if it exists * ip route get: support for sport, dport and ipproto match * ip route: Add support for a few routing protocols * ip address: strengthen check on 'label' input * ip: add rmnet initial support * tc: fix batch force option * ip address: Fix and make consistent label match handling * ip: add support for seg6local End.BPF action * lib/namespace: avoid double-mounting /sys * tc: flush output after each command in batch mode * ip link: don't stop batch processing * various command output fixes * documentation improvements - rdma-sync-some-IP-headers-with-glibc.patch: drop (present in 4.18) OBS-URL: https://build.opensuse.org/request/show/632403 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=164 --- iproute2-4.17.0.tar.sign | Bin 566 -> 0 bytes iproute2-4.17.0.tar.xz | 3 -- iproute2-4.18.0.tar.sign | Bin 0 -> 566 bytes iproute2-4.18.0.tar.xz | 3 ++ iproute2.changes | 29 ++++++++++++++++++ iproute2.spec | 7 ++--- rdma-sync-some-IP-headers-with-glibc.patch | 33 --------------------- 7 files changed, 35 insertions(+), 40 deletions(-) delete mode 100644 iproute2-4.17.0.tar.sign delete mode 100644 iproute2-4.17.0.tar.xz create mode 100644 iproute2-4.18.0.tar.sign create mode 100644 iproute2-4.18.0.tar.xz delete mode 100644 rdma-sync-some-IP-headers-with-glibc.patch diff --git a/iproute2-4.17.0.tar.sign b/iproute2-4.17.0.tar.sign deleted file mode 100644 index 8fc56dc6dfec0d432a55671038082ca3a048c452a61726b123bc98b16948e5e5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$Uom*8mC$5P+wD zV3p0}ewe}!|95&$yek>U*r8%pRl2<{{m`LVJZ>B-pq=y*2QM0Lq#y$j0uVZhU@^AF zTd?jk^s}cBFTSM=&r$`aS7SCER0{{Gt*w$=8ILhqXJYbT*s*yue8Swf1ED1NqFF<# z$J;PoJ(qPTTQMO8?nfS@A7z^jZcOuemgB;V7GHP?b5^P-Qd3KPO?jrpT_WpVc9?cG zH5rAAz=lFS0#JtikfnC1JBUe~ zC#a?AW+!&>5@I^O5n*nH0+=Su_w%my3-PHB3r-QClRXM&0yK!l{`uH-sv5JY5kXn0 zHy6~IuRGzK&E3WS&_9+1@}1~OwikeAwL8F>CXON41BT#3kpnp9i%tm)xfTG>0U!^{ zmHJ8_%2k$KQJ3O~$Ow`V)1@-;>RQu>3LZ?HF%6DYF3nCQ=!SbSW}2lZT#Gh?c-HGC z!Cv_VJip)k5jp9G9uGO-5G-$iu~BDEx7_pBD5e{R8tMCHm+12wtG01hrVrnrYU|kgH>OE@YvIlHixdqVlO|GjDcS(7fHnVkUR`lvl{m18Mi<+zNF{S@a zcP_RzhXKqeOVE$vkxLrC*_?6GWjsm6pW`&EU`Rpt`i5^{t~>GO5)<>i->4Jc+Xi=< zc9&Xqrc8RfuQ|D*4P;81u=_N3k_-)!UUIV*P&afv(27dT7a{lq8e>Lvc`75aIqYIg z?Y-8EvS^4G&qT3x&Rnd*up&Q%Qo6QPK=o}qGSsclN4|O17e;b%{ -Date: Wed, 13 Jun 2018 11:09:56 +0700 -Subject: rdma: sync some IP headers with glibc -Patch-mainline: v4.18.0 -Git-commit: 5887ff0922a06d978d3271df9f01fcb04fadc75f - -In the commit 9a362cc71a45, new userspace header: - (i.e rdma/rdma_user_cm.h -> linux/in6.h) -is included before the kernel space header: - (i.e utils.h -> resolv.h -> netinet/in.h). - -This leads to unsynchronous some IP headers and compiler got failure -with error: redefinition of some structs IP. - -In this commit, just reorder this including to make them in-sync. - -Signed-off-by: Hoang Le -Acked-by: Leon Romanovsky -Signed-off-by: Stephen Hemminger ---- - rdma/rdma.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/rdma/rdma.h -+++ b/rdma/rdma.h -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include