From 5fb68588dd9175d484588b12657faa21b3ce16e1bc0875f700d84a6854aa42a5 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 6 Sep 2017 09:40:10 +0000 Subject: [PATCH] Accepting request 521631 from home:mkubecek:branches:security:netfilter iproute2 4.13 OBS-URL: https://build.opensuse.org/request/show/521631 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=147 --- ...llation-directories-for-openSUSE-SLE.patch | 20 ++++++------ iproute2-4.12.0.tar.sign | Bin 566 -> 0 bytes iproute2-4.12.0.tar.xz | 3 -- iproute2-4.13.0.tar.sign | Bin 0 -> 566 bytes iproute2-4.13.0.tar.xz | 3 ++ iproute2-doc.changes | 30 ++++++++++++++++++ iproute2-doc.spec | 4 +-- iproute2.changes | 30 ++++++++++++++++++ iproute2.spec | 4 +-- ...-link-and-compile-steps-for-binaries.patch | 25 ++++++++------- 10 files changed, 90 insertions(+), 29 deletions(-) delete mode 100644 iproute2-4.12.0.tar.sign delete mode 100644 iproute2-4.12.0.tar.xz create mode 100644 iproute2-4.13.0.tar.sign create mode 100644 iproute2-4.13.0.tar.xz diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index bb53eeb..79e3021 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -11,10 +11,10 @@ Match the directory layout of openSUSE and SLE. 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index 18de7dcb315b..d8702a769a07 100644 +index dbb4a4afd608..3069ee91e159 100644 --- a/Makefile +++ b/Makefile -@@ -9,7 +9,7 @@ endif +@@ -6,7 +6,7 @@ endif PREFIX?=/usr LIBDIR?=$(PREFIX)/lib @@ -23,7 +23,7 @@ index 18de7dcb315b..d8702a769a07 100644 CONFDIR?=/etc/iproute2 DATADIR?=$(PREFIX)/share HDRDIR?=$(PREFIX)/include/iproute2 -@@ -24,7 +24,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include +@@ -21,7 +21,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -33,19 +33,19 @@ index 18de7dcb315b..d8702a769a07 100644 DEFINES+= -DNO_SHARED_LIBS endif diff --git a/netem/Makefile b/netem/Makefile -index a68e2fdb3037..efff5850d9c1 100644 +index 2499f086f24d..9e36fe91fa41 100644 --- a/netem/Makefile +++ b/netem/Makefile -@@ -5,6 +5,8 @@ HOSTCC ?= $(CC) +@@ -7,6 +7,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm +LIBDIR = /usr/lib + - all: $(DISTGEN) $(DISTDATA) - - $(DISTGEN): -@@ -20,9 +22,9 @@ stats: stats.c + ifeq ($(HAVE_MNL),y) + CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) + LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs) +@@ -27,9 +29,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all @@ -58,7 +58,7 @@ index a68e2fdb3037..efff5850d9c1 100644 clean: diff --git a/tc/q_netem.c b/tc/q_netem.c -index 0975ae111de9..3a7084563eaf 100644 +index 5a9e747411e8..34c8f4315abd 100644 --- a/tc/q_netem.c +++ b/tc/q_netem.c @@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) diff --git a/iproute2-4.12.0.tar.sign b/iproute2-4.12.0.tar.sign deleted file mode 100644 index 1f87f1fc2e41b5ada55f2aaf1c0a6b3130389f2e1ac60a48e3046dd7998b951f..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$E)S!~hBj5P+wD zV3p0}ergF20ERh}o~p4P+cAxlN9h6y%Up39FF^PZO*l>|)c*!9`Y)vCt`&`bT#u}g zot?ZS^|b{;Bz_^KKGgCN;xa%B-QZPAYnIWCTKDqa&8r~+gc(~R~k#m0QQ4X z=^2hDg8CeES|WIO?t9Gdy_@l5C`E8x8n@L5) zSfJckEH!Ye3;qu8B0As0g9a7kby&oAZ6~(nxS*-db!K8yD@>h3!HMXO zpgG(}EZ=e_Wf8a`_$)*8zzFk1m`h2jC)*OiG?R2R-+HqMX|<+V8S)hXFVzC;b5SF7 zg{|=eOdwT;1-Cfx6aa-dco0vb3o`rf#e$DZ3r|6P0v$VVV_6Oc-(2uu8ksrMw3tna zS;!h+i7`u4Ho$Q)dQnVJ7{u$F66`(2V;8V`qmee%A6ZCSz>FAeE9lcJFB2l_YALN{ zhwpE@3#9_-3ecg{x0Y6n%cY&gjywh2s4eEnHaaC{WD>TsFPEROUjQQYPkI)9Qxd~( zNM9AM_POXgM=D6SQbv!dj8DLkaJFHRjAqJdg)>xfd*8Rku4K=WR7u;dy;yBU=OH#} E?l5x%!~g&Q diff --git a/iproute2-4.12.0.tar.xz b/iproute2-4.12.0.tar.xz deleted file mode 100644 index b01ec99..0000000 --- a/iproute2-4.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d -size 662424 diff --git a/iproute2-4.13.0.tar.sign b/iproute2-4.13.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..2fd45958e975b23e3013bf3f6a9e663aa79b9f657e9acef7e940e995446481c4 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$HxpL;wm25P+wD zV3p0}ex+~^{0+W+ihxk!$r`IPYFnFDRnW-3ybolF4)DXa$kp%?| ziF>p=SIX|-@l^wNmO`LKS%(;MV+JoJZpChk3V(yEA~J`Y(ulR1!gBK@T{Dc87=`0bkMiYu!!Uwh&yYc!@A_OZXQj!WNawX^=X}CAah{Svy_9psbEu|GgMR E7)^{CMF0Q* literal 0 HcmV?d00001 diff --git a/iproute2-4.13.0.tar.xz b/iproute2-4.13.0.tar.xz new file mode 100644 index 0000000..7c2c4e0 --- /dev/null +++ b/iproute2-4.13.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 +size 670340 diff --git a/iproute2-doc.changes b/iproute2-doc.changes index d220dbe..df718c8 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Sep 6 07:09:53 UTC 2017 - mkubecek@suse.cz + +- Update to new upstream release 4.13 + * extended ack support + * ip monitor: support IFLA_EVENT + * many BPF improvements + * new command rdma + * fixes for issues reported by Coverity + * updated documentation and examples + * bridge: distinguish between ext. learned vs offloaded FDBs + * ip netns: make /var/run/netns bind-mount recursive + * geneve: support for modifying geneve device + * utils: return default family when rtm_family is not + RTNL_FAMILY_IPMR/IP6MR + * tc: m_tunnel_key: add csum/nocsum option + * tc filter: add support for chain index + * tc action: introduce support for goto chain action + * tc: flower: add support for tcp flags + * tc: add support for TRAP action + * tc: flower: add support for matching on ip tos and ttl + * ip: add support for GRE ignore-df knob + * ip route get: extend to return matching fib route + * ip route get: extend for mpls routes + * ss: enclose IPv6 address in brackets + * vti: print keys in hex not dotted notation +- Refresh + adjust-installation-directories-for-openSUSE-SLE.patch + split-link-and-compile-steps-for-binaries.patch + ------------------------------------------------------------------- Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz diff --git a/iproute2-doc.spec b/iproute2-doc.spec index d199bb2..67da7db 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -17,9 +17,9 @@ Name: iproute2-doc -Version: 4.12 +Version: 4.13 Release: 0 -%define rversion 4.12.0 +%define rversion 4.13.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other diff --git a/iproute2.changes b/iproute2.changes index d220dbe..df718c8 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Sep 6 07:09:53 UTC 2017 - mkubecek@suse.cz + +- Update to new upstream release 4.13 + * extended ack support + * ip monitor: support IFLA_EVENT + * many BPF improvements + * new command rdma + * fixes for issues reported by Coverity + * updated documentation and examples + * bridge: distinguish between ext. learned vs offloaded FDBs + * ip netns: make /var/run/netns bind-mount recursive + * geneve: support for modifying geneve device + * utils: return default family when rtm_family is not + RTNL_FAMILY_IPMR/IP6MR + * tc: m_tunnel_key: add csum/nocsum option + * tc filter: add support for chain index + * tc action: introduce support for goto chain action + * tc: flower: add support for tcp flags + * tc: add support for TRAP action + * tc: flower: add support for matching on ip tos and ttl + * ip: add support for GRE ignore-df knob + * ip route get: extend to return matching fib route + * ip route get: extend for mpls routes + * ss: enclose IPv6 address in brackets + * vti: print keys in hex not dotted notation +- Refresh + adjust-installation-directories-for-openSUSE-SLE.patch + split-link-and-compile-steps-for-binaries.patch + ------------------------------------------------------------------- Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz diff --git a/iproute2.spec b/iproute2.spec index 7b749f9..62db6ff 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,9 @@ Name: iproute2 -Version: 4.12 +Version: 4.13 Release: 0 -%define rversion 4.12.0 +%define rversion 4.13.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing diff --git a/split-link-and-compile-steps-for-binaries.patch b/split-link-and-compile-steps-for-binaries.patch index 2977e84..8b01a45 100644 --- a/split-link-and-compile-steps-for-binaries.patch +++ b/split-link-and-compile-steps-for-binaries.patch @@ -11,39 +11,40 @@ to work. 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/misc/Makefile b/misc/Makefile -index 72807678054b..bb9009bdb1f8 100644 +index fa90308e4848..5445bbc08356 100644 --- a/misc/Makefile +++ b/misc/Makefile -@@ -17,23 +17,24 @@ endif +@@ -17,6 +17,7 @@ endif ifeq ($(IP_CONFIG_SETNS),y) CFLAGS += -DHAVE_SETNS endif +CFLAGS += -I$(DBM_INCLUDE) - all: $(TARGETS) - + ifeq ($(HAVE_MNL),y) + CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags) +@@ -28,17 +29,17 @@ all: $(TARGETS) ss: $(SSOBJ) $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ -nstat: nstat.c -- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LIBNETLINK) -lm +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LDLIBS) -lm +nstat: nstat.o -+ $(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LIBNETLINK) -lm ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LDLIBS) -lm -ifstat: ifstat.c -- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LIBNETLINK) -lm +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LDLIBS) -lm +ifstat: ifstat.o -+ $(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LIBNETLINK) -lm ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LDLIBS) -lm -rtacct: rtacct.c -- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm +- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm +rtacct: rtacct.o -+ $(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LIBNETLINK) -lm ++ $(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 $(LIBNETLINK) -ldb -lpthread +- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb -lpthread +arpd: arpd.o -+ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LIBNETLINK) -ldb -lpthread ++ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb -lpthread ssfilter.c: ssfilter.y $(QUIET_YACC)bison ssfilter.y -o ssfilter.c