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

[Ronald van Haren]

    Date: Thursday, August 12, 2010 @ 10:14:49
  Author: ronald
Revision: 87341

upgpkg: iproute2 2.6.35-3
update fix from upstream commits

Modified:
  iproute2/trunk/PKGBUILD
  iproute2/trunk/iproutegetfix.patch

---------------------+
 PKGBUILD            |    6 +++---
 iproutegetfix.patch |   20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-12 12:53:27 UTC (rev 87340)
+++ PKGBUILD	2010-08-12 14:14:49 UTC (rev 87341)
@@ -4,7 +4,7 @@
 
 pkgname=iproute2
 pkgver=2.6.35
-pkgrel=2
+pkgrel=3
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -20,7 +20,7 @@
 	'iproute2-fhs.patch' 'iproutegetfix.patch')
 sha1sums=('862b86ac73ea696867675765d119654553a22aeb'
           '2416b11252364d7a6c742eabb4a6924a75637a46'
-          '5d8aa3c01642ef3d7893ae03457c6891e3c14f1a')
+          'cd8c969800a9bd1d4ebba0e1eae69d0892786d60')
 
 build() {
   cd $srcdir/iproute2-${pkgver}
@@ -29,7 +29,7 @@
   patch -Np1 -i ${srcdir}/iproute2-fhs.patch
 
   # fix ip route get breakage
-  patch -Np1 -i ${srcdir}/iproutegetfix.patch
+  patch -Np0 -i ${srcdir}/iproutegetfix.patch
 
   ./configure
 

Modified: iproutegetfix.patch
===================================================================
--- iproutegetfix.patch	2010-08-12 12:53:27 UTC (rev 87340)
+++ iproutegetfix.patch	2010-08-12 14:14:49 UTC (rev 87341)
@@ -1,14 +1,10 @@
-diff --git a/ip/iproute.c b/ip/iproute.c
-index 711576e..86c7ab7 100644
---- a/ip/iproute.c
-+++ b/ip/iproute.c
-@@ -160,7 +160,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
- 	if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
- 		ip6_multiple_tables = 1;
+--- ip/iproute.c.orig	2010-08-12 13:50:37.510000024 +0200
++++ ip/iproute.c	2010-08-12 13:51:05.100000024 +0200
+@@ -1286,6 +1286,7 @@
+ 	memset(&req, 0, sizeof(req));
  
--	if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
-+	if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED))
- 		return 0;
+ 	iproute_reset_filter();
++	filter.cloned = 2;
  
- 	if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {
-
+ 	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+ 	req.n.nlmsg_flags = NLM_F_REQUEST;