[arch-commits] Commit in iproute2/trunk (3 files)

[Ionut Biru]

    Date: Tuesday, March 20, 2012 @ 16:18:04
  Author: ibiru
Revision: 153933

update to 3.3.0

Modified:
  iproute2/trunk/PKGBUILD
Deleted:
  iproute2/trunk/fix-ip-l.patch
  iproute2/trunk/remove-libnl-headers.patch

----------------------------+
 PKGBUILD                   |   20 ++++++--------------
 fix-ip-l.patch             |   27 ---------------------------
 remove-libnl-headers.patch |   31 -------------------------------
 3 files changed, 6 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-20 20:07:55 UTC (rev 153932)
+++ PKGBUILD	2012-03-20 20:18:04 UTC (rev 153933)
@@ -3,13 +3,13 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'libnl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -19,13 +19,9 @@
 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
-        fix-ip-l.patch
-        remove-libnl-headers.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-          '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '2ec5513c44f89046438d65e2cda1a014010e3b73'
-          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
+         iproute2-fhs.patch)
+sha1sums=('25307c2418b9d4c6433d61a296f50b886da84b8c'
+          '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,10 +29,6 @@
   # set correct fhs structure
   patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
-  #upstream fixes
-  patch -Np1 -i "$srcdir/fix-ip-l.patch"
-  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
-
   ./configure
 
   make

Deleted: fix-ip-l.patch
===================================================================
--- fix-ip-l.patch	2012-03-20 20:07:55 UTC (rev 153932)
+++ fix-ip-l.patch	2012-03-20 20:18:04 UTC (rev 153933)
@@ -1,27 +0,0 @@
-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
-

Deleted: remove-libnl-headers.patch
===================================================================
--- remove-libnl-headers.patch	2012-03-20 20:07:55 UTC (rev 153932)
+++ remove-libnl-headers.patch	2012-03-20 20:18:04 UTC (rev 153933)
@@ -1,31 +0,0 @@
-From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger at vyatta.com>
-Date: Tue, 10 Jan 2012 08:50:49 -0800
-Subject: [PATCH] iplt2p: remove unused libnl headers
-
-Leftover from change to original code.
----
- ip/ipl2tp.c |    7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
-index 042ddb4..97f98b6 100644
---- a/ip/ipl2tp.c
-+++ b/ip/ipl2tp.c
-@@ -23,13 +23,6 @@
- #include <linux/if_arp.h>
- #include <linux/ip.h>
- 
--#include <netlink/netlink.h>
--#include <netlink/genl/genl.h>
--#include <netlink/genl/family.h>
--#include <netlink/genl/mngt.h>
--#include <netlink/genl/ctrl.h>
--#include <netlink/utils.h>
--
- #include <linux/genetlink.h>
- #include <linux/l2tp.h>
- 
--- 
-1.7.6.5
-