[arch-commits] Commit in iproute2/repos (10 files)

Ronald van Haren ronald at archlinux.org
Thu May 21 12:12:04 UTC 2015


    Date: Thursday, May 21, 2015 @ 14:12:04
  Author: ronald
Revision: 239609

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  iproute2/repos/testing-i686/
  iproute2/repos/testing-i686/PKGBUILD
    (from rev 239608, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-i686/iproute2-fhs.patch
    (from rev 239608, iproute2/trunk/iproute2-fhs.patch)
  iproute2/repos/testing-i686/tc.patch
    (from rev 239608, iproute2/trunk/tc.patch)
  iproute2/repos/testing-i686/unwanted-link-help.patch
    (from rev 239608, iproute2/trunk/unwanted-link-help.patch)
  iproute2/repos/testing-x86_64/
  iproute2/repos/testing-x86_64/PKGBUILD
    (from rev 239608, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-x86_64/iproute2-fhs.patch
    (from rev 239608, iproute2/trunk/iproute2-fhs.patch)
  iproute2/repos/testing-x86_64/tc.patch
    (from rev 239608, iproute2/trunk/tc.patch)
  iproute2/repos/testing-x86_64/unwanted-link-help.patch
    (from rev 239608, iproute2/trunk/unwanted-link-help.patch)

-----------------------------------------+
 testing-i686/PKGBUILD                   |   69 +++++++++++++++++++++++++++
 testing-i686/iproute2-fhs.patch         |   75 ++++++++++++++++++++++++++++++
 testing-i686/tc.patch                   |   58 +++++++++++++++++++++++
 testing-i686/unwanted-link-help.patch   |   17 ++++++
 testing-x86_64/PKGBUILD                 |   69 +++++++++++++++++++++++++++
 testing-x86_64/iproute2-fhs.patch       |   75 ++++++++++++++++++++++++++++++
 testing-x86_64/tc.patch                 |   58 +++++++++++++++++++++++
 testing-x86_64/unwanted-link-help.patch |   17 ++++++
 8 files changed, 438 insertions(+)

Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 239608, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=iproute2
+pkgver=4.0.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('staticlibs' '!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
+        iproute2-fhs.patch
+        unwanted-link-help.patch
+	tc.patch)
+sha1sums=('d24385ae619966d1bd71e146322d6035d60aaa1a'
+          'SKIP'
+          '35b8cf2dc94b73eccad427235c07596146cd6f6c'
+          '3b1335f4025f657f388fbf4e5a740871e3129c2a'
+          '81124e20802ff06bad616debab827b03a3c75679')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # set correct fhs structure
+  patch -Np1 -i "${srcdir}/iproute2-fhs.patch"
+
+  # allow operations on links called "h", "he", "hel", "help"
+  patch -Np1 -i "${srcdir}/unwanted-link-help.patch"
+
+  # upstream patch for FS#45031: tc qdisc show broken
+  patch -Np1 -i "${srcdir}/tc.patch"
+
+  # do not treat warnings as errors
+  sed -i 's/-Werror//' Makefile
+
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+
+  # usrmove
+  cd "${pkgdir}"
+  mv usr/sbin usr/bin
+}

Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 239608, iproute2/trunk/iproute2-fhs.patch)
===================================================================
--- testing-i686/iproute2-fhs.patch	                        (rev 0)
+++ testing-i686/iproute2-fhs.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/Makefile	2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/netem/Makefile	2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/tc/Makefile	2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ 	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ 	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
++	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ 	done
+-	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+-	if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+-	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+-		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+-	fi; \
+-	fi
+ 
+ clean:
+ 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
+diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c
+--- iproute2-3.4.0/tc/tc_util.c	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/tc/tc_util.c	2012-06-18 10:23:53.893426840 +0200
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+ 
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+ 
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+ 
+ 	lib_dir = getenv("TC_LIB_DIR");
+ 	if (!lib_dir)
+-		lib_dir = LIBDIR "/tc/";
++		lib_dir = SHAREDIR "/tc/";
+ 
+ 	return lib_dir;
+ }

Copied: iproute2/repos/testing-i686/tc.patch (from rev 239608, iproute2/trunk/tc.patch)
===================================================================
--- testing-i686/tc.patch	                        (rev 0)
+++ testing-i686/tc.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,58 @@
+From 46679bbbe89699016d31486de7599590d02a5054 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan <vadim4j at gmail.com>
+Date: Mon, 20 Apr 2015 08:33:32 +0300
+Subject: tc util: Fix possible buffer overflow when print class id
+
+Use correct handle buffer length.
+
+Signed-off-by: Vadim Kochan <vadim4j at gmail.com>
+
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index 1d3153d..dc2b70f 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -128,30 +128,31 @@ ok:
+ 	return 0;
+ }
+ 
+-int print_tc_classid(char *buf, int len, __u32 h)
++int print_tc_classid(char *buf, int blen, __u32 h)
+ {
+-	char handle[40] = {};
++	SPRINT_BUF(handle) = {};
++	int hlen = SPRINT_BSIZE - 1;
+ 
+ 	if (h == TC_H_ROOT)
+ 		sprintf(handle, "root");
+ 	else if (h == TC_H_UNSPEC)
+-		snprintf(handle, len, "none");
++		snprintf(handle, hlen, "none");
+ 	else if (TC_H_MAJ(h) == 0)
+-		snprintf(handle, len, ":%x", TC_H_MIN(h));
++		snprintf(handle, hlen, ":%x", TC_H_MIN(h));
+ 	else if (TC_H_MIN(h) == 0)
+-		snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16);
++		snprintf(handle, hlen, "%x:", TC_H_MAJ(h) >> 16);
+ 	else
+-		snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
++		snprintf(handle, hlen, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
+ 
+ 	if (use_names) {
+ 		char clname[IDNAME_MAX] = {};
+ 
+ 		if (id_to_name(cls_names, h, clname))
+-			snprintf(buf, len, "%s#%s", clname, handle);
++			snprintf(buf, blen, "%s#%s", clname, handle);
+ 		else
+-			snprintf(buf, len, "%s", handle);
++			snprintf(buf, blen, "%s", handle);
+ 	} else {
+-		snprintf(buf, len, "%s", handle);
++		snprintf(buf, blen, "%s", handle);
+ 	}
+ 
+ 	return 0;
+-- 
+cgit v0.10.2
+
+

Copied: iproute2/repos/testing-i686/unwanted-link-help.patch (from rev 239608, iproute2/trunk/unwanted-link-help.patch)
===================================================================
--- testing-i686/unwanted-link-help.patch	                        (rev 0)
+++ testing-i686/unwanted-link-help.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,17 @@
+diff -ru iproute2-3.10.0.orig/ip/iplink.c iproute2-3.10.0/ip/iplink.c
+--- iproute2-3.10.0.orig/ip/iplink.c	2013-08-08 13:53:33.000000000 -0700
++++ iproute2-3.10.0/ip/iplink.c	2013-08-08 13:55:03.179865309 -0700
+@@ -467,11 +467,11 @@
+ 			addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+ 				  &numrxqueues, 4);
+ 		} else {
++			if (matches(*argv, "help") == 0)
++				usage();
+ 			if (strcmp(*argv, "dev") == 0) {
+ 				NEXT_ARG();
+ 			}
+-			if (matches(*argv, "help") == 0)
+-				usage();
+ 			if (*dev)
+ 				duparg2("dev", *argv);
+ 			*dev = *argv;

Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 239608, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=iproute2
+pkgver=4.0.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('staticlibs' '!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
+        iproute2-fhs.patch
+        unwanted-link-help.patch
+	tc.patch)
+sha1sums=('d24385ae619966d1bd71e146322d6035d60aaa1a'
+          'SKIP'
+          '35b8cf2dc94b73eccad427235c07596146cd6f6c'
+          '3b1335f4025f657f388fbf4e5a740871e3129c2a'
+          '81124e20802ff06bad616debab827b03a3c75679')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # set correct fhs structure
+  patch -Np1 -i "${srcdir}/iproute2-fhs.patch"
+
+  # allow operations on links called "h", "he", "hel", "help"
+  patch -Np1 -i "${srcdir}/unwanted-link-help.patch"
+
+  # upstream patch for FS#45031: tc qdisc show broken
+  patch -Np1 -i "${srcdir}/tc.patch"
+
+  # do not treat warnings as errors
+  sed -i 's/-Werror//' Makefile
+
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+
+  # usrmove
+  cd "${pkgdir}"
+  mv usr/sbin usr/bin
+}

Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 239608, iproute2/trunk/iproute2-fhs.patch)
===================================================================
--- testing-x86_64/iproute2-fhs.patch	                        (rev 0)
+++ testing-x86_64/iproute2-fhs.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/Makefile	2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/netem/Makefile	2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ 	done
+ 
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/tc/Makefile	2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ 	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ 	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
++	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ 	done
+-	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+-	if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+-	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+-		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+-	fi; \
+-	fi
+ 
+ clean:
+ 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
+diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c
+--- iproute2-3.4.0/tc/tc_util.c	2012-05-21 23:12:19.000000000 +0200
++++ iproute2-3.4.0.new/tc/tc_util.c	2012-06-18 10:23:53.893426840 +0200
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+ 
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+ 
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+ 
+ 	lib_dir = getenv("TC_LIB_DIR");
+ 	if (!lib_dir)
+-		lib_dir = LIBDIR "/tc/";
++		lib_dir = SHAREDIR "/tc/";
+ 
+ 	return lib_dir;
+ }

Copied: iproute2/repos/testing-x86_64/tc.patch (from rev 239608, iproute2/trunk/tc.patch)
===================================================================
--- testing-x86_64/tc.patch	                        (rev 0)
+++ testing-x86_64/tc.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,58 @@
+From 46679bbbe89699016d31486de7599590d02a5054 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan <vadim4j at gmail.com>
+Date: Mon, 20 Apr 2015 08:33:32 +0300
+Subject: tc util: Fix possible buffer overflow when print class id
+
+Use correct handle buffer length.
+
+Signed-off-by: Vadim Kochan <vadim4j at gmail.com>
+
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index 1d3153d..dc2b70f 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -128,30 +128,31 @@ ok:
+ 	return 0;
+ }
+ 
+-int print_tc_classid(char *buf, int len, __u32 h)
++int print_tc_classid(char *buf, int blen, __u32 h)
+ {
+-	char handle[40] = {};
++	SPRINT_BUF(handle) = {};
++	int hlen = SPRINT_BSIZE - 1;
+ 
+ 	if (h == TC_H_ROOT)
+ 		sprintf(handle, "root");
+ 	else if (h == TC_H_UNSPEC)
+-		snprintf(handle, len, "none");
++		snprintf(handle, hlen, "none");
+ 	else if (TC_H_MAJ(h) == 0)
+-		snprintf(handle, len, ":%x", TC_H_MIN(h));
++		snprintf(handle, hlen, ":%x", TC_H_MIN(h));
+ 	else if (TC_H_MIN(h) == 0)
+-		snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16);
++		snprintf(handle, hlen, "%x:", TC_H_MAJ(h) >> 16);
+ 	else
+-		snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
++		snprintf(handle, hlen, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
+ 
+ 	if (use_names) {
+ 		char clname[IDNAME_MAX] = {};
+ 
+ 		if (id_to_name(cls_names, h, clname))
+-			snprintf(buf, len, "%s#%s", clname, handle);
++			snprintf(buf, blen, "%s#%s", clname, handle);
+ 		else
+-			snprintf(buf, len, "%s", handle);
++			snprintf(buf, blen, "%s", handle);
+ 	} else {
+-		snprintf(buf, len, "%s", handle);
++		snprintf(buf, blen, "%s", handle);
+ 	}
+ 
+ 	return 0;
+-- 
+cgit v0.10.2
+
+

Copied: iproute2/repos/testing-x86_64/unwanted-link-help.patch (from rev 239608, iproute2/trunk/unwanted-link-help.patch)
===================================================================
--- testing-x86_64/unwanted-link-help.patch	                        (rev 0)
+++ testing-x86_64/unwanted-link-help.patch	2015-05-21 12:12:04 UTC (rev 239609)
@@ -0,0 +1,17 @@
+diff -ru iproute2-3.10.0.orig/ip/iplink.c iproute2-3.10.0/ip/iplink.c
+--- iproute2-3.10.0.orig/ip/iplink.c	2013-08-08 13:53:33.000000000 -0700
++++ iproute2-3.10.0/ip/iplink.c	2013-08-08 13:55:03.179865309 -0700
+@@ -467,11 +467,11 @@
+ 			addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+ 				  &numrxqueues, 4);
+ 		} else {
++			if (matches(*argv, "help") == 0)
++				usage();
+ 			if (strcmp(*argv, "dev") == 0) {
+ 				NEXT_ARG();
+ 			}
+-			if (matches(*argv, "help") == 0)
+-				usage();
+ 			if (*dev)
+ 				duparg2("dev", *argv);
+ 			*dev = *argv;



More information about the arch-commits mailing list