From c399070d50c89903ec1dea55aa4aa5147a367565 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 29 May 2011 22:47:27 +0000
Subject: Sun May 29 22:47:27 UTC 2011

---
 extra/ntrack/PKGBUILD            | 16 ++++++++++------
 extra/ntrack/dead-loop-fix.patch | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 extra/ntrack/dead-loop-fix.patch

(limited to 'extra/ntrack')

diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 3f4c5ff17..6140cb6dc 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118407 2011-04-06 16:43:17Z andrea $
+# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
 pkgver=13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64')
@@ -11,13 +11,17 @@ url="http://launchpad.net/ntrack/"
 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
diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch
new file mode 100644
index 000000000..133bb4ace
--- /dev/null
+++ b/extra/ntrack/dead-loop-fix.patch
@@ -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;
+ }
+
-- 
cgit v1.2.3-54-g00ecf