Date: Monday, October 14, 2013 @ 20:57:27 Author: ronald Revision: 196528
upgpkg: iproute2 3.11.0-1 update to 3.11.0; FS#36464 - [iproute2] cannot manipulate links whose names are prefixes of 'help' Added: iproute2/trunk/unwanted-link-help.patch Modified: iproute2/trunk/PKGBUILD --------------------------+ PKGBUILD | 15 ++++++++++----- unwanted-link-help.patch | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-14 18:17:47 UTC (rev 196527) +++ PKGBUILD 2013-10-14 18:57:27 UTC (rev 196528) @@ -3,8 +3,8 @@ # Contributor: Judd Vinet <[email protected]> pkgname=iproute2 -pkgver=3.10.0 -pkgrel=2 +pkgver=3.11.0 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -20,9 +20,11 @@ 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') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz - iproute2-fhs.patch) -sha1sums=('e94b5dc9dc586006b272f67134ec07f6fbc81bd7' - '35b8cf2dc94b73eccad427235c07596146cd6f6c') + iproute2-fhs.patch + unwanted-link-help.patch) +sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f' + '35b8cf2dc94b73eccad427235c07596146cd6f6c' + '3b1335f4025f657f388fbf4e5a740871e3129c2a') prepare() { cd $srcdir/$pkgname-$pkgver @@ -30,6 +32,9 @@ # 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" + # do not treat warnings as errors sed -i 's/-Werror//' Makefile } Added: unwanted-link-help.patch =================================================================== --- unwanted-link-help.patch (rev 0) +++ unwanted-link-help.patch 2013-10-14 18:57:27 UTC (rev 196528) @@ -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;
