Accepting request 633732 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/633732
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=99
This commit is contained in:
Yuchen Lin 2018-09-13 10:09:42 +00:00 committed by Git OBS Bridge
commit ab222a7476
7 changed files with 35 additions and 40 deletions

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e
size 675268

BIN
iproute2-4.18.0.tar.sign Normal file

Binary file not shown.

3
iproute2-4.18.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9e6c70c95f513871c5e1f4e452c04fcb3c4d8a05be651bd794cd994a52daa45
size 692868

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Fri Aug 31 05:27:00 UTC 2018 - mkubecek@suse.cz
- 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)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 1 08:28:16 UTC 2018 - mkubecek@suse.cz Wed Aug 1 08:28:16 UTC 2018 - mkubecek@suse.cz

View File

@ -17,9 +17,9 @@
Name: iproute2 Name: iproute2
Version: 4.17 Version: 4.18
Release: 0 Release: 0
%define rversion 4.17.0 %define rversion 4.18.0
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPL-2.0-only License: GPL-2.0-only
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing
@ -37,7 +37,6 @@ Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch
Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch
Patch6: split-link-and-compile-steps-for-binaries.patch Patch6: split-link-and-compile-steps-for-binaries.patch
Patch7: examples-fix-bashisms-in-example-script.patch Patch7: examples-fix-bashisms-in-example-script.patch
Patch8: rdma-sync-some-IP-headers-with-glibc.patch
Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
@ -85,7 +84,7 @@ bash command line completion support for iproute.
%prep %prep
%setup -qn %name-%rversion %setup -qn %name-%rversion
%patch -P 1 -P 2 -P 3 -P 4 -P 6 -P 7 -P 8 -p1 %patch -P 1 -P 2 -P 3 -P 4 -P 6 -P 7 -p1
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
%patch -P 102 -p1 %patch -P 102 -p1
%endif %endif

View File

@ -1,33 +0,0 @@
From: Hoang Le <hoang.h.le@dektech.com.au>
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 <hoang.h.le@dektech.com.au>
Acked-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
rdma/rdma.h | 1 +
1 file changed, 1 insertion(+)
--- a/rdma/rdma.h
+++ b/rdma/rdma.h
@@ -15,6 +15,7 @@
#include <string.h>
#include <errno.h>
#include <getopt.h>
+#include <netinet/in.h>
#include <libmnl/libmnl.h>
#include <rdma/rdma_netlink.h>
#include <rdma/rdma_user_cm.h>