Accepting request 437193 from security:netfilter

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/437193
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2016-10-26 11:27:33 +00:00 committed by Git OBS Bridge
commit 929573c6b8
10 changed files with 68 additions and 25 deletions

Binary file not shown.

View File

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

BIN
iproute2-4.8.0.tar.sign Normal file

Binary file not shown.

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

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

View File

@ -2,13 +2,13 @@
lib/utils.c | 8 ++++++-- lib/utils.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
Index: iproute2-3.18.0/lib/utils.c Index: iproute2-4.8.0/lib/utils.c
=================================================================== ===================================================================
--- iproute2-3.18.0.orig/lib/utils.c --- iproute2-4.8.0.orig/lib/utils.c
+++ iproute2-3.18.0/lib/utils.c +++ iproute2-4.8.0/lib/utils.c
@@ -34,6 +34,10 @@ @@ -49,6 +49,10 @@ int get_hex(char c)
return -1;
int timestamp_short = 0; }
+#ifndef HZ +#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK) +#define HZ sysconf(_SC_CLK_TCK)
@ -17,7 +17,7 @@ Index: iproute2-3.18.0/lib/utils.c
int get_integer(int *val, const char *arg, int base) int get_integer(int *val, const char *arg, int base)
{ {
long res; long res;
@@ -558,8 +562,8 @@ int matches(const char *cmd, const char @@ -683,8 +687,8 @@ int matches(const char *cmd, const char
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{ {

View File

@ -4,11 +4,12 @@
tc/q_netem.c | 2 +- tc/q_netem.c | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-) 3 files changed, 7 insertions(+), 5 deletions(-)
Index: iproute2-4.5.0/Makefile Index: iproute2-4.8.0/Makefile
=================================================================== ===================================================================
--- iproute2-4.5.0.orig/Makefile --- iproute2-4.8.0.orig/Makefile
+++ iproute2-4.5.0/Makefile +++ iproute2-4.8.0/Makefile
@@ -1,6 +1,6 @@ @@ -4,7 +4,7 @@ endif
PREFIX?=/usr PREFIX?=/usr
LIBDIR?=$(PREFIX)/lib LIBDIR?=$(PREFIX)/lib
-SBINDIR?=/sbin -SBINDIR?=/sbin
@ -16,7 +17,7 @@ Index: iproute2-4.5.0/Makefile
CONFDIR?=/etc/iproute2 CONFDIR?=/etc/iproute2
DATADIR?=$(PREFIX)/share DATADIR?=$(PREFIX)/share
DOCDIR?=$(DATADIR)/doc/iproute2 DOCDIR?=$(DATADIR)/doc/iproute2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include @@ -18,7 +18,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
SHARED_LIBS = y SHARED_LIBS = y
@ -25,10 +26,10 @@ Index: iproute2-4.5.0/Makefile
ifneq ($(SHARED_LIBS),y) ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS DEFINES+= -DNO_SHARED_LIBS
endif endif
Index: iproute2-4.5.0/netem/Makefile Index: iproute2-4.8.0/netem/Makefile
=================================================================== ===================================================================
--- iproute2-4.5.0.orig/netem/Makefile --- iproute2-4.8.0.orig/netem/Makefile
+++ iproute2-4.5.0/netem/Makefile +++ iproute2-4.8.0/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC) @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS) CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm LDLIBS += -lm
@ -50,10 +51,10 @@ Index: iproute2-4.5.0/netem/Makefile
done done
clean: clean:
Index: iproute2-4.5.0/tc/q_netem.c Index: iproute2-4.8.0/tc/q_netem.c
=================================================================== ===================================================================
--- iproute2-4.5.0.orig/tc/q_netem.c --- iproute2-4.8.0.orig/tc/q_netem.c
+++ iproute2-4.5.0/tc/q_netem.c +++ iproute2-4.8.0/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char * @@ -113,7 +113,7 @@ static int get_distribution(const char *
char *line = NULL; char *line = NULL;
char name[128]; char name[128];

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Oct 17 08:58:54 UTC 2016 - jengelh@inai.de
- Update to new upstream release 4.7
* add support for VXLAN-GPE
* ss: add SK_MEMINFO_DROPS display
* devlink: implement shared buffer support
* devlink: implement shared buffer occupancy control
* ip, token: add del command
* fq_codel: add per queue memory limit
* ip: add MACsec support
* ipaddress: Allow listing addresses by type
* ip rule: Add support for l3mdev rules
* ss: Add support to filter on device
* ip link/addr/route: Add support for vrf keyword
* bridge: add json support for bridge fdb/vlan show
- Update to new upstream release 4.8
* ip: report IFLA_GSO_MAX_SIZE and IFLA_GSO_MAX_SEGS
* tc: Add support for the matchall traffic classifier.
* iptuntap: show processes using tuntap interface
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de

View File

@ -17,9 +17,9 @@
Name: iproute2-doc Name: iproute2-doc
Version: 4.6 Version: 4.8
Release: 0 Release: 0
%define rversion 4.6.0 %define rversion 4.8.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,24 @@
-------------------------------------------------------------------
Mon Oct 17 08:58:54 UTC 2016 - jengelh@inai.de
- Update to new upstream release 4.7
* add support for VXLAN-GPE
* ss: add SK_MEMINFO_DROPS display
* devlink: implement shared buffer support
* devlink: implement shared buffer occupancy control
* ip, token: add del command
* fq_codel: add per queue memory limit
* ip: add MACsec support
* ipaddress: Allow listing addresses by type
* ip rule: Add support for l3mdev rules
* ss: Add support to filter on device
* ip link/addr/route: Add support for vrf keyword
* bridge: add json support for bridge fdb/vlan show
- Update to new upstream release 4.8
* ip: report IFLA_GSO_MAX_SIZE and IFLA_GSO_MAX_SEGS
* tc: Add support for the matchall traffic classifier.
* iptuntap: show processes using tuntap interface
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de Sat May 21 08:21:36 UTC 2016 - jengelh@inai.de

View File

@ -17,9 +17,9 @@
Name: iproute2 Name: iproute2
Version: 4.6 Version: 4.8
Release: 0 Release: 0
%define rversion 4.6.0 %define rversion 4.8.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