[arch-commits] Commit in iproute2/trunk (PKGBUILD iftunnel.patch)

Ronald van Haren ronald at archlinux.org
Fri Jun 11 06:56:57 EDT 2010


    Date: Friday, June 11, 2010 @ 06:56:56
  Author: ronald
Revision: 82458

upgpkg: iproute2 2.6.34-1
update to latest version; remove build time patch; first build to include libnetlink headers

Modified:
  iproute2/trunk/PKGBUILD
Deleted:
  iproute2/trunk/iftunnel.patch

----------------+
 PKGBUILD       |   19 ++++++++++---------
 iftunnel.patch |   11 -----------
 2 files changed, 10 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-11 10:50:38 UTC (rev 82457)
+++ PKGBUILD	2010-06-11 10:56:56 UTC (rev 82458)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.33
+pkgver=2.6.34
 pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
@@ -19,10 +19,9 @@
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
 
 source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
-	'iftunnel.patch' 'iproute2-fhs.patch')
-md5sums=('b371fca3fcb5e436e69a7c2111d84a3c'
-         '8b3dab19a03d8d521c690be7bb7b5c2e'
-         '9013aa473d8b06b3bb2420b7ffe60261')
+	'iproute2-fhs.patch')
+sha1sums=('b57f98e284c68a464b9c3e132d29760de6331688'
+          'ae7c4529555e1dce389fcedcbb7e0df5c726741a')
 
 build() {
   cd $srcdir/iproute2-${pkgver}
@@ -30,15 +29,17 @@
   # set correct fhs structure
   patch -Np1 -i ${srcdir}/iproute2-fhs.patch || return 1
 
-  # fix missing #include
-  patch -Np0 -R -i ${srcdir}/iftunnel.patch || return 1
-
   ./configure || return 1
   make || return 1
+}
+
+package() {
+  cd $srcdir/iproute2-${pkgver}
+
   make DESTDIR=$pkgdir install || return 1
 
   # libnetlink isn't installed, install it FS#19385
   install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h || return 1
   install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a || return 1
+}
 
-}

Deleted: iftunnel.patch
===================================================================
--- iftunnel.patch	2010-06-11 10:50:38 UTC (rev 82457)
+++ iftunnel.patch	2010-06-11 10:56:56 UTC (rev 82458)
@@ -1,11 +0,0 @@
---- include/linux/if_tunnel.h	2009-08-16 21:17:23.145859979 +0200
-+++ include/linux/if_tunnel.h.old	2009-08-16 21:15:22.991902394 +0200
-@@ -2,7 +2,7 @@
- #define _IF_TUNNEL_H_
- 
- #include <linux/types.h>
--#include <linux/ip.h>
-+
- 
- #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
- #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)



More information about the arch-commits mailing list