Date: Monday, September 12, 2011 @ 16:46:12 Author: bluewind Revision: 137939
upstream update; new patch; libnl3.1 fix Added: ntrack/trunk/ntrack_libnl_link.diff Modified: ntrack/trunk/PKGBUILD ------------------------+ PKGBUILD | 13 ++++++++----- ntrack_libnl_link.diff | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-12 20:44:01 UTC (rev 137938) +++ PKGBUILD 2011-09-12 20:46:12 UTC (rev 137939) @@ -2,8 +2,8 @@ # Maintainer: Andrea Scarpino <[email protected]> pkgname=ntrack -pkgver=13 -pkgrel=2 +pkgver=14 +pkgrel=1 epoch=1 pkgdesc="A network connectivity tracking library" arch=('i686' 'x86_64') @@ -12,9 +12,10 @@ 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') -md5sums=('90596b924a108f8b4eea52239ba64369' - '02bda6ae15ef04b6a7d9273c37752681') + 'dead-loop-fix.patch' "ntrack_libnl_link.diff") +md5sums=('d8af7c0f77c030d089bfa5ce0dd1057b' + '02bda6ae15ef04b6a7d9273c37752681' + 'f5a0fbdb1f1a5e6355119dfc0d9c555b') options=('!libtool' '!emptydirs') build() { @@ -22,6 +23,8 @@ 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 Added: ntrack_libnl_link.diff =================================================================== --- ntrack_libnl_link.diff (rev 0) +++ ntrack_libnl_link.diff 2011-09-12 20:46:12 UTC (rev 137939) @@ -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 +
