diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-30 10:38:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-30 10:38:12 -0300 |
| commit | 2c94bd2955b56b177726687b71d4b443a8e1a9f3 (patch) | |
| tree | 67bacd5fb46f35200c13f195a97641698b2c17cd /extra/ntrack | |
| parent | c38ea439c0779806288a1fa5bc6801c350623c6a (diff) | |
| parent | c399070d50c89903ec1dea55aa4aa5147a367565 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/projectm/PKGBUILD
core/udev/PKGBUILD
extra/libdmapsharing/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/ntrack')
| -rw-r--r-- | extra/ntrack/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/ntrack/dead-loop-fix.patch | 14 |
2 files changed, 24 insertions, 6 deletions
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD index 1d7d537dd..5211c17d2 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' 'mips64el') @@ -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; + } + |