[arch-commits] CVS update of core/support/iproute (PKGBUILD vpnc-routing.patch)

[Thomas Baechler]

    Date: Tuesday, February 26, 2008 @ 16:11:13
  Author: thomas
    Path: /home/cvs-core/core/support/iproute

Modified: PKGBUILD (1.19 -> 1.20)
 Removed: vpnc-routing.patch (1.1)

upgpkg: iproute 2.6.24_rc7-1


--------------------+
 PKGBUILD           |   18 ++++++++--------
 vpnc-routing.patch |   56 ---------------------------------------------------
 2 files changed, 9 insertions(+), 65 deletions(-)


Index: core/support/iproute/PKGBUILD
diff -u core/support/iproute/PKGBUILD:1.19 core/support/iproute/PKGBUILD:1.20
--- core/support/iproute/PKGBUILD:1.19	Fri Nov 16 00:53:16 2007
+++ core/support/iproute/PKGBUILD	Tue Feb 26 16:11:13 2008
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD,v 1.19 2007/11/15 23:53:16 daniel Exp $
+# $Id: PKGBUILD,v 1.20 2008/02/26 15:11:13 thomas Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=iproute
-pkgver=070710
-pkgrel=3
+_dlver=2.6.24-rc7
+pkgver=$(echo ${_dlver} | sed 's|-|_|g')
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=(i686 x86_64)
 license=('GPL')
-url="http://developer.osdl.org/dev/iproute2/"
+url="http://www.linux-foundation.org/en/Net:Iproute2"
 depends=('db>=4.6')
-source=(http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.22-$pkgver.tar.gz)
-md5sums=('20ef2767896a0f156b6fbabd47936f79')
+source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${_dlver}.tar.bz2)
+md5sums=('e4d8352451e61e94f3ee7e6c0cadba4c')
 
 build() {
-  cd $startdir/src/iproute-2.6.22-$pkgver
-  chmod 755 configure
+  cd $startdir/src/iproute2-${_dlver}
   sed -i 's|/usr/local/lib/iptables|/usr/lib/iptables|' include/iptables.h || return 1
   ./configure 
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$startdir/pkg install || return 1
   chmod 755 $startdir/pkg/usr/sbin/ifcfg
 }
Index: core/support/iproute/vpnc-routing.patch
diff -u core/support/iproute/vpnc-routing.patch:1.1 core/support/iproute/vpnc-routing.patch:removed
--- core/support/iproute/vpnc-routing.patch:1.1	Thu Oct 26 18:05:58 2006
+++ core/support/iproute/vpnc-routing.patch	Tue Feb 26 16:11:13 2008
@@ -1,56 +0,0 @@
-Subject: [PATCH] Route metrics decode bug.
-Array was not being offset correctly.
-
-See http://bugs.archlinux.org/task/5669
-
-Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
----
- ip/iproute.c |   10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/ip/iproute.c b/ip/iproute.c
-index 24e7a86..16c398a 100644
---- a/ip/iproute.c
-+++ b/ip/iproute.c
-@@ -142,7 +142,7 @@ int print_route(const struct sockaddr_nl
- 	static int ip6_multiple_tables;
- 	__u32 table;
- 	SPRINT_BUF(b1);
--	
-+	static int hz;
- 
- 	if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
- 		fprintf(stderr, "Not a route: %08x %08x %08x\n",
-@@ -446,7 +446,6 @@ #endif
- 			fprintf(fp, "%s%x> ", first ? "<" : "", flags);
- 		if (tb[RTA_CACHEINFO]) {
- 			struct rta_cacheinfo *ci = RTA_DATA(tb[RTA_CACHEINFO]);
--			static int hz;
- 			if (!hz)
- 				hz = get_user_hz();
- 			if (ci->rta_expires != 0)
-@@ -473,7 +472,6 @@ #endif
- 		if (tb[RTA_CACHEINFO])
- 			ci = RTA_DATA(tb[RTA_CACHEINFO]);
- 		if ((r->rtm_flags & RTM_F_CLONED) || (ci && ci->rta_expires)) {
--			static int hz;
- 			if (!hz)
- 				hz = get_user_hz();
- 			if (r->rtm_flags & RTM_F_CLONED)
-@@ -506,13 +504,13 @@ #endif
- 			mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]);
- 
- 		for (i=2; i<= RTAX_MAX; i++) {
--			static int hz;
- 			if (mxrta[i] == NULL)
- 				continue;
- 			if (!hz)
- 				hz = get_hz();
--			if (i-2 < sizeof(mx_names)/sizeof(char*))
--				fprintf(fp, " %s", mx_names[i-2]);
-+
-+			if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i])
-+				fprintf(fp, " %s", mx_names[i]);
- 			else
- 				fprintf(fp, " metric %d", i);
- 			if (mxlock & (1<<i))