Accepting request 521654 from security:netfilter

1

OBS-URL: https://build.opensuse.org/request/show/521654
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2017-09-09 18:22:33 +00:00 committed by Git OBS Bridge
commit cb5cad6e9b
10 changed files with 90 additions and 29 deletions

View File

@ -11,10 +11,10 @@ Match the directory layout of openSUSE and SLE.
3 files changed, 7 insertions(+), 5 deletions(-) 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 18de7dcb315b..d8702a769a07 100644 index dbb4a4afd608..3069ee91e159 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -9,7 +9,7 @@ endif @@ -6,7 +6,7 @@ endif
PREFIX?=/usr PREFIX?=/usr
LIBDIR?=$(PREFIX)/lib LIBDIR?=$(PREFIX)/lib
@ -23,7 +23,7 @@ index 18de7dcb315b..d8702a769a07 100644
CONFDIR?=/etc/iproute2 CONFDIR?=/etc/iproute2
DATADIR?=$(PREFIX)/share DATADIR?=$(PREFIX)/share
HDRDIR?=$(PREFIX)/include/iproute2 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 SHARED_LIBS = y
@ -33,19 +33,19 @@ index 18de7dcb315b..d8702a769a07 100644
DEFINES+= -DNO_SHARED_LIBS DEFINES+= -DNO_SHARED_LIBS
endif endif
diff --git a/netem/Makefile b/netem/Makefile diff --git a/netem/Makefile b/netem/Makefile
index a68e2fdb3037..efff5850d9c1 100644 index 2499f086f24d..9e36fe91fa41 100644
--- a/netem/Makefile --- a/netem/Makefile
+++ b/netem/Makefile +++ b/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC) @@ -7,6 +7,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm LDLIBS += -lm
+LIBDIR = /usr/lib +LIBDIR = /usr/lib
+ +
all: $(DISTGEN) $(DISTDATA) ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
$(DISTGEN): LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
@@ -20,9 +22,9 @@ stats: stats.c @@ -27,9 +29,9 @@ stats: stats.c
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
install: all install: all
@ -58,7 +58,7 @@ index a68e2fdb3037..efff5850d9c1 100644
clean: clean:
diff --git a/tc/q_netem.c b/tc/q_netem.c 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 --- a/tc/q_netem.c
+++ b/tc/q_netem.c +++ b/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) @@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)

Binary file not shown.

View File

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

BIN
iproute2-4.13.0.tar.sign Normal file

Binary file not shown.

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

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

View File

@ -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 Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz

View File

@ -17,9 +17,9 @@
Name: iproute2-doc Name: iproute2-doc
Version: 4.12 Version: 4.13
Release: 0 Release: 0
%define rversion 4.12.0 %define rversion 4.13.0
Summary: Documentation to iproute2 Summary: Documentation to iproute2
License: GPL-2.0+ License: GPL-2.0+
Group: Documentation/Other Group: Documentation/Other

View File

@ -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 Tue Aug 22 12:58:39 UTC 2017 - mkubecek@suse.cz

View File

@ -17,9 +17,9 @@
Name: iproute2 Name: iproute2
Version: 4.12 Version: 4.13
Release: 0 Release: 0
%define rversion 4.12.0 %define rversion 4.13.0
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPL-2.0 License: GPL-2.0
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing

View File

@ -11,39 +11,40 @@ to work.
1 file changed, 9 insertions(+), 8 deletions(-) 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/misc/Makefile b/misc/Makefile diff --git a/misc/Makefile b/misc/Makefile
index 72807678054b..bb9009bdb1f8 100644 index fa90308e4848..5445bbc08356 100644
--- a/misc/Makefile --- a/misc/Makefile
+++ b/misc/Makefile +++ b/misc/Makefile
@@ -17,23 +17,24 @@ endif @@ -17,6 +17,7 @@ endif
ifeq ($(IP_CONFIG_SETNS),y) ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS CFLAGS += -DHAVE_SETNS
endif endif
+CFLAGS += -I$(DBM_INCLUDE) +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) ss: $(SSOBJ)
$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
-nstat: nstat.c -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 +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 -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 +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 -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 +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 -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 +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 ssfilter.c: ssfilter.y
$(QUIET_YACC)bison ssfilter.y -o ssfilter.c $(QUIET_YACC)bison ssfilter.y -o ssfilter.c