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

[Ronald van Haren]

    Date: Monday, August 9, 2010 @ 03:49:29
  Author: ronald
Revision: 87024

upgpkg: iproute2 2.6.35-2
add proposed ip route get fix

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

---------------------+
 PKGBUILD            |   12 +++++++++---
 iproutegetfix.patch |   14 ++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-09 04:08:32 UTC (rev 87023)
+++ PKGBUILD	2010-08-09 07:49:29 UTC (rev 87024)
@@ -4,7 +4,7 @@
 
 pkgname=iproute2
 pkgver=2.6.35
-pkgrel=1
+pkgrel=2
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,16 +17,22 @@
 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://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
-	'iproute2-fhs.patch')
+	'iproute2-fhs.patch' 'iproutegetfix.patch')
 sha1sums=('862b86ac73ea696867675765d119654553a22aeb'
-          '2416b11252364d7a6c742eabb4a6924a75637a46')
+          '2416b11252364d7a6c742eabb4a6924a75637a46'
+          '5d8aa3c01642ef3d7893ae03457c6891e3c14f1a')
 
 build() {
   cd $srcdir/iproute2-${pkgver}
   
   # set correct fhs structure
   patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+
+  # fix ip route get breakage
+  patch -Np1 -i ${srcdir}/iproutegetfix.patch
+
   ./configure
+
   make
 }
 

Added: iproutegetfix.patch
===================================================================
--- iproutegetfix.patch	                        (rev 0)
+++ iproutegetfix.patch	2010-08-09 07:49:29 UTC (rev 87024)
@@ -0,0 +1,14 @@
+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;
+ 
+-	if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
++	if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED))
+ 		return 0;
+ 
+ 	if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {
+