From f4ccd7dfb997db047d8833df993910081c34b537438802a759b574b3c98b025f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 6 Aug 2018 13:38:29 +0000 Subject: [PATCH] Accepting request 626868 from home:mkubecek:branches:security:netfilter - Update to new upstream release 4.17 OBS-URL: https://build.opensuse.org/request/show/626868 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=162 --- ...llation-directories-for-openSUSE-SLE.patch | 38 ++++++------- iproute2-4.16.0.tar.sign | Bin 566 -> 0 bytes iproute2-4.16.0.tar.xz | 3 -- iproute2-4.17.0.tar.sign | Bin 0 -> 566 bytes iproute2-4.17.0.tar.xz | 3 ++ iproute2.changes | 40 ++++++++++++++ iproute2.spec | 6 +-- rdma-sync-some-IP-headers-with-glibc.patch | 33 ++++++++++++ ...-link-and-compile-steps-for-binaries.patch | 14 +++-- ...et-family-for-default-any-all-addres.patch | 50 ------------------ 10 files changed, 101 insertions(+), 86 deletions(-) delete mode 100644 iproute2-4.16.0.tar.sign delete mode 100644 iproute2-4.16.0.tar.xz create mode 100644 iproute2-4.17.0.tar.sign create mode 100644 iproute2-4.17.0.tar.xz create mode 100644 rdma-sync-some-IP-headers-with-glibc.patch delete mode 100644 utils-Do-not-reset-family-for-default-any-all-addres.patch diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index 4f68a48..cf69184 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -5,25 +5,23 @@ Patch-mainline: Never, SUSE specific Match the directory layout of openSUSE and SLE. --- - Makefile | 4 ++-- - netem/Makefile | 5 +++-- - tc/q_netem.c | 2 +- + Makefile | 4 ++-- + netem/Makefile | 5 +++-- + tc/q_netem.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) -Index: iproute2-4.14.1/Makefile -=================================================================== ---- iproute2-4.14.1.orig/Makefile -+++ iproute2-4.14.1/Makefile -@@ -6,7 +6,7 @@ endif +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ endif PREFIX?=/usr LIBDIR?=$(PREFIX)/lib -SBINDIR?=/sbin +SBINDIR?=/usr/sbin CONFDIR?=/etc/iproute2 - DATADIR?=$(PREFIX)/share - HDRDIR?=$(PREFIX)/include/iproute2 -@@ -21,7 +21,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + NETNS_RUN_DIR?=/var/run/netns + NETNS_ETC_DIR?=/etc/netns +@@ -31,7 +31,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -32,11 +30,9 @@ Index: iproute2-4.14.1/Makefile ifneq ($(SHARED_LIBS),y) DEFINES+= -DNO_SHARED_LIBS endif -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 +--- a/netem/Makefile ++++ b/netem/Makefile +@@ -7,6 +7,7 @@ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm @@ -44,7 +40,7 @@ Index: iproute2-4.14.1/netem/Makefile all: $(DISTGEN) $(DISTDATA) -@@ -22,9 +23,9 @@ stats: stats.c +@@ -23,9 +24,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all @@ -56,11 +52,9 @@ Index: iproute2-4.14.1/netem/Makefile done clean: -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 * +--- a/tc/q_netem.c ++++ b/tc/q_netem.c +@@ -96,7 +96,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) char *line = NULL; char name[128]; diff --git a/iproute2-4.16.0.tar.sign b/iproute2-4.16.0.tar.sign deleted file mode 100644 index 031634e3b44a4773fd9504b9c92ff6954fbfddc06f4f42af6db926ff7c0e51f3..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$Rdj0RRdK5P+wD zV3p0}et*Od|6gZA2TZZlweUn9uz@!chf&x_qCc627b26SX^~bAN<4*dZ1#TH{r8@^ z1n{Mc`jH%?p(wjec+Ll9e`B3zFv2twRc_QbkQ$Fdbvhq;4BSX zM`Fl#y^mU7gN{`2k!T%=gBR`OocOlXDTlckv9@Pxwb&LRM5P5(?42%mz?z>^A1BMu zc6Kk_U8$x?)mrO$Q2o%A5Qv*3q#nw%41_MuL0b10#F=|N|3^l4aRWx{KzN3Ne|9qY z$-aS6Yk&uE!KC${1W%5`yZk)an97~0aEO^7Unh@K+9gr7(s^1vl8MuDZWhd$ z#m8I#5k5Iw%CULSFrt02QZ6nilh|)X?TltzoHERH*7v;!jb{32@o)D3#5pR4n+VG) EVa%HlTL1t6 diff --git a/iproute2-4.16.0.tar.xz b/iproute2-4.16.0.tar.xz deleted file mode 100644 index 90aec23..0000000 --- a/iproute2-4.16.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a -size 661336 diff --git a/iproute2-4.17.0.tar.sign b/iproute2-4.17.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..8fc56dc6dfec0d432a55671038082ca3a048c452a61726b123bc98b16948e5e5 GIT binary patch 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+12wtG01h +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 diff --git a/split-link-and-compile-steps-for-binaries.patch b/split-link-and-compile-steps-for-binaries.patch index 9e74ba2..a385d7b 100644 --- a/split-link-and-compile-steps-for-binaries.patch +++ b/split-link-and-compile-steps-for-binaries.patch @@ -7,14 +7,12 @@ 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(-) -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 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -9,23 +9,24 @@ include ../config.mk ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd endif @@ -41,9 +39,9 @@ Index: iproute2-4.14.1/misc/Makefile + $(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LDLIBS) -lm -arpd: arpd.c -- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb -lpthread +- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb +arpd: arpd.o -+ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb -lpthread ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb ssfilter.c: ssfilter.y $(QUIET_YACC)bison ssfilter.y -o ssfilter.c diff --git a/utils-Do-not-reset-family-for-default-any-all-addres.patch b/utils-Do-not-reset-family-for-default-any-all-addres.patch deleted file mode 100644 index 6a0ca62..0000000 --- a/utils-Do-not-reset-family-for-default-any-all-addres.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: David Ahern -Date: Fri, 13 Apr 2018 09:36:33 -0700 -Subject: utils: Do not reset family for default, any, all addresses -Patch-mainline: v4.17.0 -Git-commit: d42c7891d26e4d5616a55aac9fe10813767fcf9c -References: bsc#1091603 - -Thomas reported a change in behavior with respect to autodectecting -address families. Specifically, 'ip ro add default via fe80::1' -syntax was failing to treat fe80::1 as an IPv6 address as it did in -prior releases. The root causes appears to be a change in family when -the default keyword is parsed. - -'default', 'any' and 'all' are relevant outside of AF_INET. Leave the -family arg as is for these when setting addr. - -Fixes: 93fa12418dc6 ("utils: Always specify family and ->bytelen in get_prefix_1()") -Reported-by: Thomas Deutschmann -Signed-off-by: David Ahern -Cc: Serhey Popovych - ---- - lib/utils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/utils.c b/lib/utils.c -index b9e9a6caaf54..803bcc45f2f2 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -566,7 +566,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) - if (strcmp(name, "default") == 0) { - if ((family == AF_DECnet) || (family == AF_MPLS)) - return -1; -- addr->family = (family != AF_UNSPEC) ? family : AF_INET; -+ addr->family = family; - addr->bytelen = af_byte_len(addr->family); - addr->bitlen = -2; - addr->flags |= PREFIXLEN_SPECIFIED; -@@ -577,7 +577,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) - strcmp(name, "any") == 0) { - if ((family == AF_DECnet) || (family == AF_MPLS)) - return -1; -- addr->family = AF_UNSPEC; -+ addr->family = family; - addr->bytelen = 0; - addr->bitlen = -2; - return 0; --- -2.16.3 -