Accepting request 280449 from security:netfilter

- Update to new upstream release 3.18

OBS-URL: https://build.opensuse.org/request/show/280449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=74

iproute2-3.16.0-fix-bashisms.patch

@@ -0,0 +1,46 @@
+From: Oleksandr Chumachenko <ledest@gmail.com>
+Date: Sun, 28 Dec 2014 17:35:02 +0100
+
+---
+ examples/gaiconf |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: iproute2-3.17.0/examples/gaiconf
+===================================================================
+--- iproute2-3.17.0.orig/examples/gaiconf
++++ iproute2-3.17.0/examples/gaiconf
+@@ -11,7 +11,7 @@ DEFAULT_GAICONF=/etc/gai.conf
+ verbose=
+ debug=
+ 
+-function run ()
++run ()
+ {
+ 	if [ x"$verbose" != x"" ]; then
+ 		echo "$@"
+@@ -21,7 +21,7 @@ function run ()
+ 	fi
+ }
+ 
+-function do_load_config ()
++do_load_config ()
+ {
+ 	file=$1; shift
+ 	flush=1
+@@ -36,14 +36,14 @@ function do_load_config ()
+ 	done
+ }
+ 
+-function do_list_config ()
++do_list_config ()
+ {
+ 	${IP} -6 addrlabel list | while read p pfx l lbl; do
+ 		echo label ${pfx} ${lbl}
+ 	done
+ }
+ 
+-function help ()
++help ()
+ {
+ 	echo "Usage: $0 [-v] {--list | --config [ ${DEFAULT_GAICONF} ] | --default}"
+ 	exit 1

iproute2-3.17.0.tar.xz

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

iproute2-3.18.0.tar.xz

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

iproute2-HZ.diff

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

iproute2-doc.changes

@@ -1,10 +1,28 @@
+-------------------------------------------------------------------
+Wed Jan  7 09:11:03 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 3.18
+* Human readable output for `ip -s link` (ip -s -h link)
+* Permit filtering `ip monitor` events by device per "dev NAME".
+* Permit filtering `ip link` output by device per "master NAME",
+  and by type per `type T` (e.g. type vlan).
+* Permit filtering `ip addr` output by flags like "tentative" and
+  "-tentative".
+
+-------------------------------------------------------------------
+Sun Dec 28 16:30:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in gaiconf script
+- add patches:
+  * iproute2-3.16.0-fix-bashisms.patch
+
 -------------------------------------------------------------------
 Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz
 
 - Update to new upstream release 3.17
 * ip: allow to set ipv6 address generation mode
-* nstat: 64-bit support on 32-bit architectures
+* nstat: 64bit support on 32bit architectures
-* ip: do not require "name" keyword when adding device
+* ip: don't require "name" keyword when adding device
   (3.16 regression)
 * ip: support of usec rtt in tcp_metrics
 * ip: allow to change slave options via type_slave

iproute2-doc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2-doc
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        3.17
+Version:        3.18
 Release:        0
-%define rversion 3.17.0
+%define rversion 3.18.0
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
@@ -27,6 +27,7 @@ Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking
 
 Source:         http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.xz
 Source2:        http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.sign
+Patch1:         iproute2-3.16.0-fix-bashisms.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
@@ -52,6 +53,7 @@ as well as examples and other outdated files.
 
 %prep
 %setup -qn iproute2-%rversion
+%patch1 -p1
 
 %build
 # build with -fPIC. For details see

iproute2.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jan  7 09:11:03 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 3.18
+* Human readable output for `ip -s link` (ip -s -h link)
+* Permit filtering `ip monitor` events by device per "dev NAME".
+* Permit filtering `ip link` output by device per "master NAME",
+  and by type per `type T` (e.g. type vlan).
+* Permit filtering `ip addr` output by flags like "tentative" and
+  "-tentative".
+
+-------------------------------------------------------------------
+Sun Dec 28 16:30:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in gaiconf script
+- add patches:
+  * iproute2-3.16.0-fix-bashisms.patch
+
 -------------------------------------------------------------------
 Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz
 

iproute2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
 
 
 Name:           iproute2
-Version:        3.17
+Version:        3.18
 Release:        0
-%define rversion 3.17.0
+%define rversion 3.18.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing