[arch-commits] Commit in ntrack/trunk (PKGBUILD dead-loop-fix.patch)

[Andrea Scarpino]

    Date: Saturday, May 28, 2011 @ 06:48:55
  Author: andrea
Revision: 125701

upgpkg: ntrack 13-2
fix infinite loop

Added:
  ntrack/trunk/dead-loop-fix.patch
Modified:
  ntrack/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   14 +++++++++-----
 dead-loop-fix.patch |   14 ++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-28 10:46:32 UTC (rev 125700)
+++ PKGBUILD	2011-05-28 10:48:55 UTC (rev 125701)
@@ -3,7 +3,7 @@
 
 pkgname=ntrack
 pkgver=13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64')
@@ -11,13 +11,17 @@
 license=('LGPL')
 depends=('qt' 'libnl' 'gcc-libs')
 makedepends=('python2')
-optdepends=('python2')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz")
-md5sums=('90596b924a108f8b4eea52239ba64369')
-options=('!libtool')
+source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
+        'dead-loop-fix.patch')
+md5sums=('90596b924a108f8b4eea52239ba64369'
+         '02bda6ae15ef04b6a7d9273c37752681')
+options=('!libtool' '!emptydirs')
 
 build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
+
+  patch -p0 -i "${srcdir}"/dead-loop-fix.patch
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var

Added: dead-loop-fix.patch
===================================================================
--- dead-loop-fix.patch	                        (rev 0)
+++ dead-loop-fix.patch	2011-05-28 10:48:55 UTC (rev 125701)
@@ -0,0 +1,14 @@
+=== modified file 'modules/ntrack-libnl.c'
+--- modules/ntrack-libnl.c	2011-04-25 16:28:19 +0000
++++ modules/ntrack-libnl.c	2011-04-25 17:25:24 +0000
+@@ -394,6 +394,9 @@
+ 		if (rtnl_link_get_ifindex(link) > iindex)
+ 			break;
+ 		i = i->next;
++
++		if (i == linklist)
++			break;
+ 	}
+ 	return result;
+ }
+