Date: Sunday, February 5, 2012 @ 08:11:15 Author: andrea Revision: 148999
upgpkg: ntrack 1:16-1 Upstream release Modified: ntrack/trunk/PKGBUILD Deleted: ntrack/trunk/dead-loop-fix.patch ntrack/trunk/ntrack_libnl_link.diff ------------------------+ PKGBUILD | 15 ++++----------- dead-loop-fix.patch | 14 -------------- ntrack_libnl_link.diff | 34 ---------------------------------- 3 files changed, 4 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-02-05 12:58:31 UTC (rev 148998) +++ PKGBUILD 2012-02-05 13:11:15 UTC (rev 148999) @@ -2,29 +2,22 @@ # Maintainer: Andrea Scarpino <[email protected]> pkgname=ntrack -pkgver=14 +pkgver=16 pkgrel=1 epoch=1 pkgdesc="A network connectivity tracking library" arch=('i686' 'x86_64') url="http://launchpad.net/ntrack/"; license=('LGPL') -depends=('qt' 'libnl' 'gcc-libs') +depends=('qt' 'libnl') makedepends=('python2') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"; - 'dead-loop-fix.patch' "ntrack_libnl_link.diff") -md5sums=('d8af7c0f77c030d089bfa5ce0dd1057b' - '02bda6ae15ef04b6a7d9273c37752681' - 'f5a0fbdb1f1a5e6355119dfc0d9c555b') options=('!libtool' '!emptydirs') +source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz";) +md5sums=('21691dac43460a6791cba3decbc68242') build() { cd "${srcdir}/${pkgname}-0${pkgver}" - patch -p0 -i "${srcdir}"/dead-loop-fix.patch - - sed -i 's/libnl-3.0/libnl-3.1/g' configure - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var Deleted: dead-loop-fix.patch =================================================================== --- dead-loop-fix.patch 2012-02-05 12:58:31 UTC (rev 148998) +++ dead-loop-fix.patch 2012-02-05 13:11:15 UTC (rev 148999) @@ -1,14 +0,0 @@ -=== 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; - } - Deleted: ntrack_libnl_link.diff =================================================================== --- ntrack_libnl_link.diff 2012-02-05 12:58:31 UTC (rev 148998) +++ ntrack_libnl_link.diff 2012-02-05 13:11:15 UTC (rev 148999) @@ -1,34 +0,0 @@ -upstream bug https://bugs.launchpad.net/ubuntu/+source/ntrack/+bug/750554 ---- ntrack-014+bzr312.orig/modules/Makefile.am -+++ ntrack-014+bzr312/modules/Makefile.am -@@ -49,26 +49,27 @@ - ntrack-libnl.c \ - $(top_srcdir)/common/ntrackarchapi.h - ntrack_libnl_cflags = $(AM_CFLAGS) $(LIBNL_DEF) -+ntrack_libnl_libadd = ../common/libntrack.la - ntrack_libnl_ldflags = -module -avoid-version - - if HAVE_LIBNL1 - ntrack_libnl1_la_SOURCES = $(ntrack_libnl_sources) - ntrack_libnl1_la_CFLAGS = $(LIBNL1_CFLAGS) $(ntrack_libnl_cflags) --ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS) -+ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS) $(ntrack_libnl_libadd) - ntrack_libnl1_la_LDFLAGS = $(ntrack_libnl_ldflags) - endif - - if HAVE_LIBNL2 - ntrack_libnl2_la_SOURCES = $(ntrack_libnl_sources) - ntrack_libnl2_la_CFLAGS = $(LIBNL2_CFLAGS) $(ntrack_libnl_cflags) --ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS) -+ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS) $(ntrack_libnl_libadd) - ntrack_libnl2_la_LDFLAGS = $(ntrack_libnl_ldflags) - endif - - if HAVE_LIBNL3 - ntrack_libnl3_la_SOURCES = $(ntrack_libnl_sources) - ntrack_libnl3_la_CFLAGS = $(LIBNL3_CFLAGS) $(ntrack_libnl_cflags) --ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) -+ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) $(ntrack_libnl_libadd) - ntrack_libnl3_la_LDFLAGS = $(ntrack_libnl_ldflags) - endif -
