public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.12.ebuild ChangeLog
@ 2014-06-27  3:14 Jeroen Roovers (jer)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2014-06-27  3:14 UTC (permalink / raw
  To: gentoo-commits

jer         14/06/27 03:14:26

  Modified:             ChangeLog
  Added:                nfdump-1.6.12.ebuild
  Log:
  Version bump. Replace shipped minilzo (bug #515278). Work around parallel make issue in src_test().
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.36                 net-analyzer/nfdump/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	14 Aug 2013 12:48:31 -0000	1.35
+++ ChangeLog	27 Jun 2014 03:14:26 -0000	1.36
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.35 2013/08/14 12:48:31 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.36 2014/06/27 03:14:26 jer Exp $
+
+*nfdump-1.6.12 (27 Jun 2014)
+
+  27 Jun 2014; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.12.ebuild:
+  Version bump. Replace shipped minilzo (bug #515278). Work around parallel
+  make issue in src_test().
 
 *nfdump-1.6.10_p1 (14 Aug 2013)
 



1.1                  net-analyzer/nfdump/nfdump-1.6.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.1&content-type=text/plain

Index: nfdump-1.6.12.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.1 2014/06/27 03:14:26 jer Exp $

EAPI=5
inherit autotools eutils

MY_P="${P/_/}"
DESCRIPTION="A set of tools to collect and process netflow data"
HOMEPAGE="http://nfdump.sourceforge.net/"
SRC_URI="
	mirror://sourceforge/nfdump/${MY_P}.tar.gz
	http://www.oberhumer.com/opensource/lzo/download/minilzo-2.07.tar.gz
"

LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"

CDEPEND="
	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
	nfprofile? ( net-analyzer/rrdtool )
	nftrack? ( net-analyzer/rrdtool )
	readpcap? ( net-libs/libpcap )
"
DEPEND="
	${CDEPEND}
	sys-devel/flex
	virtual/yacc
"
RDEPEND="
	${CDEPEND}
	dev-lang/perl
"

DOCS=( AUTHORS ChangeLog NEWS README )

S="${WORKDIR}/${MY_P}"

src_prepare() {
	# bug #515278
	cp "${WORKDIR}"/minilzo-2.07/*.{c,h} "${S}"/bin || die

	if use ftconv; then
		sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
		sed \
			-e 's:lib\(/ftlib.h\):include\1:' \
			-e 's:libft.a:libft.so:' \
			\-i configure.in || die
	fi
	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
	eautoreconf
}

src_configure() {
	# --without-ftconf is not handled well #322201
	econf \
		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
		$(use nfprofile && echo --enable-nfprofile) \
		$(use nftrack && echo --enable-nftrack) \
		$(use_enable compat15) \
		$(use_enable debug devel) \
		$(use_enable readpcap) \
		$(use_enable sflow)
}

src_test() {
	emake -j1 check
}





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.12.ebuild ChangeLog
@ 2014-06-27  3:25 Jeroen Roovers (jer)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2014-06-27  3:25 UTC (permalink / raw
  To: gentoo-commits

jer         14/06/27 03:25:08

  Modified:             nfdump-1.6.12.ebuild ChangeLog
  Log:
  Replace src_test() workaround with a proper test dependency.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  net-analyzer/nfdump/nfdump-1.6.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?r1=1.1&r2=1.2

Index: nfdump-1.6.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfdump-1.6.12.ebuild	27 Jun 2014 03:14:26 -0000	1.1
+++ nfdump-1.6.12.ebuild	27 Jun 2014 03:25:08 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.1 2014/06/27 03:14:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.2 2014/06/27 03:25:08 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -39,6 +39,8 @@
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-test-dep.patch
+
 	# bug #515278
 	cp "${WORKDIR}"/minilzo-2.07/*.{c,h} "${S}"/bin || die
 
@@ -64,7 +66,3 @@
 		$(use_enable readpcap) \
 		$(use_enable sflow)
 }
-
-src_test() {
-	emake -j1 check
-}



1.37                 net-analyzer/nfdump/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	27 Jun 2014 03:14:26 -0000	1.36
+++ ChangeLog	27 Jun 2014 03:25:08 -0000	1.37
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.36 2014/06/27 03:14:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.37 2014/06/27 03:25:08 jer Exp $
+
+  27 Jun 2014; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.12.ebuild,
+  +files/nfdump-1.6.12-test-dep.patch:
+  Replace src_test() workaround with a proper test dependency.
 
 *nfdump-1.6.12 (27 Jun 2014)
 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.12.ebuild ChangeLog
@ 2014-07-04 19:32 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2014-07-04 19:32 UTC (permalink / raw
  To: gentoo-commits

ago         14/07/04 19:32:23

  Modified:             nfdump-1.6.12.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #515278
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.3                  net-analyzer/nfdump/nfdump-1.6.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?r1=1.2&r2=1.3

Index: nfdump-1.6.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfdump-1.6.12.ebuild	27 Jun 2014 03:25:08 -0000	1.2
+++ nfdump-1.6.12.ebuild	4 Jul 2014 19:32:23 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.2 2014/06/27 03:25:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.3 2014/07/04 19:32:23 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
 
 CDEPEND="



1.38                 net-analyzer/nfdump/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	27 Jun 2014 03:25:08 -0000	1.37
+++ ChangeLog	4 Jul 2014 19:32:23 -0000	1.38
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.37 2014/06/27 03:25:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.38 2014/07/04 19:32:23 ago Exp $
+
+  04 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
+  Stable for amd64, wrt bug #515278
 
   27 Jun 2014; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.12.ebuild,
   +files/nfdump-1.6.12-test-dep.patch:





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.12.ebuild ChangeLog
@ 2014-07-05 10:51 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2014-07-05 10:51 UTC (permalink / raw
  To: gentoo-commits

ago         14/07/05 10:51:40

  Modified:             nfdump-1.6.12.ebuild ChangeLog
  Log:
  Stable for x86, wrt bug #515278
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.4                  net-analyzer/nfdump/nfdump-1.6.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild?r1=1.3&r2=1.4

Index: nfdump-1.6.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nfdump-1.6.12.ebuild	4 Jul 2014 19:32:23 -0000	1.3
+++ nfdump-1.6.12.ebuild	5 Jul 2014 10:51:40 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.3 2014/07/04 19:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.12.ebuild,v 1.4 2014/07/05 10:51:40 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
 
 CDEPEND="



1.39                 net-analyzer/nfdump/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	4 Jul 2014 19:32:23 -0000	1.38
+++ ChangeLog	5 Jul 2014 10:51:40 -0000	1.39
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.38 2014/07/04 19:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.39 2014/07/05 10:51:40 ago Exp $
+
+  05 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
+  Stable for x86, wrt bug #515278
 
   04 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
   Stable for amd64, wrt bug #515278





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-07-05 10:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-27  3:25 [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.12.ebuild ChangeLog Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-05 10:51 Agostino Sarubbo (ago)
2014-07-04 19:32 Agostino Sarubbo (ago)
2014-06-27  3:14 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox