Date: Monday, September 12, 2011 @ 16:47:26 Author: bluewind Revision: 137940
archrelease: copy trunk to testing-i686, testing-x86_64 Added: ntrack/repos/testing-i686/ ntrack/repos/testing-i686/PKGBUILD (from rev 137939, ntrack/trunk/PKGBUILD) ntrack/repos/testing-i686/dead-loop-fix.patch (from rev 137939, ntrack/trunk/dead-loop-fix.patch) ntrack/repos/testing-i686/ntrack_libnl_link.diff (from rev 137939, ntrack/trunk/ntrack_libnl_link.diff) ntrack/repos/testing-x86_64/ ntrack/repos/testing-x86_64/PKGBUILD (from rev 137939, ntrack/trunk/PKGBUILD) ntrack/repos/testing-x86_64/dead-loop-fix.patch (from rev 137939, ntrack/trunk/dead-loop-fix.patch) ntrack/repos/testing-x86_64/ntrack_libnl_link.diff (from rev 137939, ntrack/trunk/ntrack_libnl_link.diff) ---------------------------------------+ testing-i686/PKGBUILD | 37 ++++++++++++++++++++++++++++++++ testing-i686/dead-loop-fix.patch | 14 ++++++++++++ testing-i686/ntrack_libnl_link.diff | 34 +++++++++++++++++++++++++++++ testing-x86_64/PKGBUILD | 37 ++++++++++++++++++++++++++++++++ testing-x86_64/dead-loop-fix.patch | 14 ++++++++++++ testing-x86_64/ntrack_libnl_link.diff | 34 +++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+) Copied: ntrack/repos/testing-i686/PKGBUILD (from rev 137939, ntrack/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-09-12 20:47:26 UTC (rev 137940) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgname=ntrack +pkgver=14 +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') +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') + +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 + make +} + +package() { + cd "${srcdir}/${pkgname}-0${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: ntrack/repos/testing-i686/dead-loop-fix.patch (from rev 137939, ntrack/trunk/dead-loop-fix.patch) =================================================================== --- testing-i686/dead-loop-fix.patch (rev 0) +++ testing-i686/dead-loop-fix.patch 2011-09-12 20:47:26 UTC (rev 137940) @@ -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; + } + Copied: ntrack/repos/testing-i686/ntrack_libnl_link.diff (from rev 137939, ntrack/trunk/ntrack_libnl_link.diff) =================================================================== --- testing-i686/ntrack_libnl_link.diff (rev 0) +++ testing-i686/ntrack_libnl_link.diff 2011-09-12 20:47:26 UTC (rev 137940) @@ -0,0 +1,34 @@ +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 + Copied: ntrack/repos/testing-x86_64/PKGBUILD (from rev 137939, ntrack/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-09-12 20:47:26 UTC (rev 137940) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgname=ntrack +pkgver=14 +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') +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') + +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 + make +} + +package() { + cd "${srcdir}/${pkgname}-0${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: ntrack/repos/testing-x86_64/dead-loop-fix.patch (from rev 137939, ntrack/trunk/dead-loop-fix.patch) =================================================================== --- testing-x86_64/dead-loop-fix.patch (rev 0) +++ testing-x86_64/dead-loop-fix.patch 2011-09-12 20:47:26 UTC (rev 137940) @@ -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; + } + Copied: ntrack/repos/testing-x86_64/ntrack_libnl_link.diff (from rev 137939, ntrack/trunk/ntrack_libnl_link.diff) =================================================================== --- testing-x86_64/ntrack_libnl_link.diff (rev 0) +++ testing-x86_64/ntrack_libnl_link.diff 2011-09-12 20:47:26 UTC (rev 137940) @@ -0,0 +1,34 @@ +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 +