Version bump. Closes bug #50926"

(Portage version: 2.0.51-r15)

7 files changed, 118 insertions, 16 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 9ffff64ccf92..929585dd7d97 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/flow-tools
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.6 2004/10/26 20:57:02 eldad Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.7 2005/01/26 19:51:06 angusyoung Exp $
+
+*flow-tools-0.67 (26 Jan 2005)
+
+  26 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org>
+  +files/flow-tools-0.67-memleak.patch, +files/flow-tools-0.67-nodebug.patch,
+  +flow-tools-0.67.ebuild:
+  Version bump. Thanks to Molchanov Alexander <xorader@mail.ru> and Vanquirius
+  <marcelogoes@gmail.com> for submitting the ebuild. This ebuild closes bug
+  #50926
 
   26 Oct 2004; Eldad Zack <eldad@gentoo.org> flow-tools-0.66.ebuild:
   Fixed ebuild to use tc-getCC from toolchain-funcs.eclass, as suggested by
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 9f64c83dca40..13d06bf249cc 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 60a81df5ad229675303f741677bc9380 flow-tools-0.66.ebuild 910
-MD5 adcb0dfc586e9cd52df09ad922f62918 ChangeLog 792
+MD5 1188bc7c158a3a1b54bfdbf2ea553334 flow-tools-0.67.ebuild 1046
+MD5 85648b8e7c343839620b7f1972cda5c6 flow-tools-0.66.ebuild 910
+MD5 a4fffd796f50af1c01a88d0daf54f4ee ChangeLog 1149
 MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
 MD5 4274d0fb58b88876a5767ab9d1c6204c files/digest-flow-tools-0.66 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBfrocT+MN7JbqCpMRAvQ2AJsHPxX0lPYmIhi8ZlL4EKM1/lsF5wCfV0SA
-CQJkRlVJA1GX4O9XSzp7Kjk=
-=vyav
------END PGP SIGNATURE-----
+MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
+MD5 0246cf03a41e5890d62fd2ca33533cf3 files/flow-tools-0.67-nodebug.patch 1098
+MD5 b1d3fcd9bdce901f4949ff63fd40d925 files/flow-tools-0.67-memleak.patch 444
diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.67 b/net-analyzer/flow-tools/files/digest-flow-tools-0.67
new file mode 100644
index 000000000000..34f12fdc230a
--- /dev/null
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.67
@@ -0,0 +1 @@
+MD5 0ee0a2830effa554d1925236aad6b4fe flow-tools-0.67.tar.gz 983667
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch
new file mode 100644
index 000000000000..6f1a0c482b7a
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch
@@ -0,0 +1,15 @@
+--- flow-export.c~	2004-05-20 10:12:36.000000000 +0400
++++ flow-export.c	2004-05-20 10:49:45.000000000 +0400
+@@ -948,10 +948,12 @@ int format5(struct ftio *ftio, struct op
+ 
+       res = PQexec(conn, query);
+       if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
+         PQclear(res);
+         fterr_errx(1,"PQexec(): %s\n", PQerrorMessage(conn));
++      } else if (res) {
++      	PQclear(res);
+       }
+ 
+     }
+ 
+     ++opt->records;
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch
new file mode 100644
index 000000000000..e3c2b9255481
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch
@@ -0,0 +1,34 @@
+--- flow-export.c.orig	2003-12-04 08:55:31.000000000 +0300
++++ flow-export.c	2004-05-13 13:00:09.000000000 +0400
+@@ -756,13 +756,14 @@ int format3(struct ftio *ftio, struct op
+       strcat (query, fields);
+       strcat (query, ") VALUES (");
+       strcat (query, values);
+       strcat (query, ")");
+ 
+-      if (debug)
++/*      if (debug)
+         fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
+           query);
++*/
+ 
+       if (mysql_real_query(&mysql, query, strlen(query)) != 0) 
+         fterr_warnx("mysql_real_query(): %s", mysql_error(&mysql));
+ 
+     }
+@@ -927,13 +928,14 @@ int format5(struct ftio *ftio, struct op
+       strcat (query, fields);
+       strcat (query, ") VALUES (");
+       strcat (query, values);
+       strcat (query, ")");
+ 
+-      if (debug)
++/*      if (debug)
+         fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
+           query);
++*/
+ 
+       res = PQexec(conn, query);
+       if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
+         PQclear(res);
+         fterr_errx(1,"PQexec(): %s\n", PQerrorMessage(conn));
diff --git a/net-analyzer/flow-tools/flow-tools-0.66.ebuild b/net-analyzer/flow-tools/flow-tools-0.66.ebuild
index 3f44816b3ccb..721d1851ed75 100644
--- a/net-analyzer/flow-tools/flow-tools-0.66.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.66.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.66.ebuild,v 1.5 2004/10/26 20:57:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.66.ebuild,v 1.6 2005/01/26 19:51:06 angusyoung Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/flow-tools/flow-tools-0.67.ebuild b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
new file mode 100644
index 000000000000..823d78013f9c
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.67.ebuild,v 1.1 2005/01/26 19:51:06 angusyoung Exp $
+
+inherit eutils
+
+DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data"
+HOMEPAGE="http://www.splintered.net/sw/flow-tools/"
+SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="mysql"
+
+DEPEND="virtual/libc
+	sys-apps/tcp-wrappers
+	sys-libs/zlib"
+
+pkg_setup() {
+	enewgroup flowtools
+	enewuser flowtools -1 /bin/false /var/lib/flow-tools flowtools
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-nodebug.patch
+	epatch ${FILESDIR}/${P}-memleak.patch
+}
+
+src_compile() {
+	econf \
+		`use_with mysql` || die "econf failed"
+
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR=${D} || die "emake install failed"
+	dodoc COPYING ChangeLog README INSTALL SECURITY TODO
+
+	keepdir /var/lib/flow-tools
+}
+
+pkg_postinst() {
+	chown flowtools:flowtools /var/lib/flow-tools
+	chmod 0750 /var/lib/flow-tools
+}