[arch-commits] Commit in iproute2/trunk (PKGBUILD fix-ip-l.patch)

Ionut Biru ibiru at archlinux.org
Sat Jan 21 22:45:41 UTC 2012


    Date: Saturday, January 21, 2012 @ 17:45:41
  Author: ibiru
Revision: 147097

fix ip l

Added:
  iproute2/trunk/fix-ip-l.patch
Modified:
  iproute2/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 ++++++++----
 fix-ip-l.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-21 21:55:38 UTC (rev 147096)
+++ PKGBUILD	2012-01-21 22:45:41 UTC (rev 147097)
@@ -4,7 +4,7 @@
 
 pkgname=iproute2
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -19,17 +19,21 @@
 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)
+	iproute2-fhs.patch
+        fix-ip-l.patch)
 sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46')
+          '2416b11252364d7a6c742eabb4a6924a75637a46'
+          '2ec5513c44f89046438d65e2cda1a014010e3b73')
 
-
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # set correct fhs structure
   patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
+  #upstream fixes
+  patch -Np1 -i "$srcdir/fix-ip-l.patch"
+
   ./configure
 
   make

Added: fix-ip-l.patch
===================================================================
--- fix-ip-l.patch	                        (rev 0)
+++ fix-ip-l.patch	2012-01-21 22:45:41 UTC (rev 147097)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at vyatta.com>
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] ip: make 'ip l' be 'ip link'
+
+Restore compatiablity for those lazy typists.
+---
+ ip/ip.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ip/ip.c b/ip/ip.c
+index 7b4bacb..20dc3b5 100644
+--- a/ip/ip.c
++++ b/ip/ip.c
+@@ -72,8 +72,8 @@ static const struct cmd {
+ 	{ "neighbour",	do_ipneigh },
+ 	{ "ntable",	do_ipntable },
+ 	{ "ntbl",	do_ipntable },
+-	{ "l2tp",	do_ipl2tp },
+ 	{ "link",	do_iplink },
++	{ "l2tp",	do_ipl2tp },
+ 	{ "tunnel",	do_iptunnel },
+ 	{ "tunl",	do_iptunnel },
+ 	{ "tuntap",	do_iptuntap },
+-- 
+1.7.6.5
+




More information about the arch-commits mailing list