jengelh/iproute2
SHA256
1
0
Fork 0
forked from pool/iproute2
Code Pull Requests Activity

iproute2-4.14.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=149
This commit is contained in:
Jan Engelhardt 2017-11-17 21:11:21 +00:00 committed by Git OBS Bridge
parent 5fb68588dd
commit 538c893051
9 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
adjust-installation-directories-for-openSUSE-SLE.patch
View File

@ -5,15 +5,15 @@ Patch-mainline: Never, SUSE specific
Match the directory layout of openSUSE and SLE.
---
Makefile | 4 ++--
netem/Makefile | 6 ++++--
tc/q_netem.c | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
Makefile | 4 ++--
netem/Makefile | 5 +++--
tc/q_netem.c | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index dbb4a4afd608..3069ee91e159 100644
--- a/Makefile
+++ b/Makefile
Index: iproute2-4.14.1/Makefile
===================================================================
--- iproute2-4.14.1.orig/Makefile
+++ iproute2-4.14.1/Makefile
@@ -6,7 +6,7 @@ endif
PREFIX?=/usr
@ -32,20 +32,19 @@ index dbb4a4afd608..3069ee91e159 100644
ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS
endif
diff --git a/netem/Makefile b/netem/Makefile
index 2499f086f24d..9e36fe91fa41 100644
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -7,6 +7,8 @@ HOSTCC ?= $(CC)
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
HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm
+LIBDIR = /usr/lib
+
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
all: $(DISTGEN) $(DISTDATA)
@@ -22,9 +23,9 @@ stats: stats.c
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
install: all
@ -57,11 +56,11 @@ index 2499f086f24d..9e36fe91fa41 100644
done
clean:
diff --git a/tc/q_netem.c b/tc/q_netem.c
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)
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 *
char *line = NULL;
char name[128];
@ -70,6 +69,3 @@ index 5a9e747411e8..34c8f4315abd 100644
if ((f = fopen(name, "r")) == NULL) {
fprintf(stderr, "No distribution data for %s (%s: %s)\n",
type, name, strerror(errno));
--
2.14.1

BIN
iproute2-4.13.0.tar.sign
View File

Binary file not shown.

3
iproute2-4.13.0.tar.xz
View File

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

BIN
iproute2-4.14.1.tar.sign Normal file
View File

Binary file not shown.

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

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

4
iproute2-doc.spec
View File

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

19
iproute2.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Nov 17 21:05:25 UTC 2017 - jengelh@inai.de
- Update to new upstream release 4.14.1
* ss: distinguish between IPv4 and IPv6 wildcard sockets
* bridge: this patch adds json support for bridge mdb show
* tc actions: improved batching and time filtered dumping
* iproute: add support for SRv6 local segment processing
* ip: add new command line argument -json (mutually exclusive with -color)
* gre: add support for ERSPAN tunnel
* tc: m_ife: allow ife type to zero
* tc: m_ife: print IEEE ethertype format
* iproute: add support for seg6 l2encap mode
* devlink: Add support for special format protocol headers
* devlink: Add support for protocol IPv4/IPv6/Ethernet special formats
* ss: detect IPPROTO_ICMPV6 sockets
* tc/actions: introduce support for jump action
* devlink: add batch command support
-------------------------------------------------------------------
Wed Sep 6 07:09:53 UTC 2017 - mkubecek@suse.cz

4
iproute2.spec
View File

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

24
split-link-and-compile-steps-for-binaries.patch
View File

@ -7,22 +7,21 @@ 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(-)
diff --git a/misc/Makefile b/misc/Makefile
index fa90308e4848..5445bbc08356 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -17,6 +17,7 @@ endif
ifeq ($(IP_CONFIG_SETNS),y)
CFLAGS += -DHAVE_SETNS
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
ifeq ($(HAVE_BERKELEY_DB),y)
TARGETS += arpd
endif
+CFLAGS += -I$(DBM_INCLUDE)
ifeq ($(HAVE_MNL),y)
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
@@ -28,17 +29,17 @@ all: $(TARGETS)
all: $(TARGETS)
ss: $(SSOBJ)
$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
@ -48,6 +47,3 @@ index fa90308e4848..5445bbc08356 100644
ssfilter.c: ssfilter.y
$(QUIET_YACC)bison ssfilter.y -o ssfilter.c
--
2.14.1