Date: Monday, March 14, 2016 @ 12:03:59 Author: bpiotrowski Revision: 261435
upgpkg: iproute2 4.4.0-1 new upstream release Modified: iproute2/trunk/PKGBUILD Deleted: iproute2/trunk/unwanted-link-help.patch --------------------------+ PKGBUILD | 13 ++++--------- unwanted-link-help.patch | 17 ----------------- 2 files changed, 4 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-14 10:58:50 UTC (rev 261434) +++ PKGBUILD 2016-03-14 11:03:59 UTC (rev 261435) @@ -3,7 +3,7 @@ # Contributor: Judd Vinet <jvi...@zeroflux.org> pkgname=iproute2 -pkgver=4.1.1 +pkgver=4.4.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') @@ -21,12 +21,10 @@ '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) -sha1sums=('750c17e720b43041c23fed7b8cf0118c0e841036' + iproute2-fhs.patch) +sha1sums=('68372be70c5c0503196d03913f4b1e201956d1b6' 'SKIP' - '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935' - '3b1335f4025f657f388fbf4e5a740871e3129c2a') + '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,9 +32,6 @@ # 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 Deleted: unwanted-link-help.patch =================================================================== --- unwanted-link-help.patch 2016-03-14 10:58:50 UTC (rev 261434) +++ unwanted-link-help.patch 2016-03-14 11:03:59 UTC (rev 261435) @@ -1,17 +0,0 @@ -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;