Only patch the mysql connection code, not the pgsql stuff too thanks to Mike Nerone (bug #213788 again).

(Portage version: 2.2_rc62/cvs/Linux i686)

3 files changed, 11 insertions, 13 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 1a607a4285d8..1e73bdab139b 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/flow-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.37 2009/05/26 01:26:21 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.38 2010/02/08 12:27:19 jer Exp $
+
+*flow-tools-0.68-r7 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> -flow-tools-0.68-r6.ebuild,
+  +flow-tools-0.68-r7.ebuild, files/flow-tools-0.68-db_tmp.patch:
+  Only patch the mysql connection code, not the pgsql stuff too thanks to
+  Mike Nerone (bug #213788 again).
 
 *flow-tools-0.68-r6 (26 May 2009)
 
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-db_tmp.patch b/net-analyzer/flow-tools/files/flow-tools-0.68-db_tmp.patch
index 01289ab6a865..a965418f2c7d 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.68-db_tmp.patch
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-db_tmp.patch
@@ -11,12 +11,3 @@ Patch by Rusnan R. Shaimardanov to fix bug #213788.
        fterr_warnx("Missing field in dbaseURI, expecting user:pwd:host:port:name:table.");
        return -1;
      }
-@@ -892,7 +892,7 @@
-     db_name = strsep(&tmp, ":");
-     db_table = strsep(&tmp, ":");
- 
--    if (!db_user || !db_pwd || !db_host || !db_tmp || !db_name || !db_table) {
-+    if (!db_user || !db_pwd || !db_host || !db_port || !db_name || !db_table) {
-       fterr_warnx("Missing field in dbaseURI, expecting user:pwd:host:port:name:table.");
-       return -1;
-     }
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild
index 7731ea66f49a..86dce41856e0 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.68-r6.ebuild,v 1.1 2009/05/26 01:26:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild,v 1.1 2010/02/08 12:27:19 jer Exp $
 
 WANT_AUTOMAKE="1.6"
 WANT_AUTOCONF="latest"