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

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 14 insertions, 16 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/Manifest b/net-analyzer/flow-tools/Manifest
index 817ad4dba665..7af03b4ba978 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,7 +1,7 @@
 AUX flow-tools-0.67-memleak.patch 465 RMD160 6e04608d9ce2cd9da945451a668be1e2426eb88a SHA1 68e777246680b23861504aabe7132dc04e2667f7 SHA256 185b1751d4b9208be73917f8dfd90662f61e7fedc617a0dad15cf4141bc473bd
 AUX flow-tools-0.67-nodebug.patch 933 RMD160 fe974a8a69f168783d7c77ca6aaf302010ffcacb SHA1 38ab0c45bb08f327f9efce843691e07eedbc7d9d SHA256 e862d823543f422319c31e305149b25a0d74ffbc9d0ee98ec756a90fc053b373
 AUX flow-tools-0.68-another-amd64-casting-fixes.patch 2070 RMD160 a46a9eb144c5ca130b3af1351194af212b0fd8c3 SHA1 95d0e154e064cbc67fafab9729b37ef1da3e3bb7 SHA256 ff5a14e7c3999888325c3bee057e40410c3bb600bfb8c15f931094b164799c98
-AUX flow-tools-0.68-db_tmp.patch 937 RMD160 dc5fc7fa5fd28c8f8f8c26c09f2f5342bfef9f8e SHA1 3bd6e611a705fb3713639a90cfeb8bd88b60d1de SHA256 22f371ce27a0faa310eb7d11ffee955d6a83c8cfd5de682185d2fff3c956c260
+AUX flow-tools-0.68-db_tmp.patch 569 RMD160 234e410edaff2d9162a67dfcc976578be54f6979 SHA1 51a5285897cdd2e9c611f66b1deab39fe31d2f1a SHA256 f3d1a9cfbe569fcfb0daa825b405a1b6d16db003d7ece9aabac9de8daccd23b8
 AUX flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404 RMD160 81535106be145c56a6a201125ad1cd137ec25378 SHA1 fad3da5429d8d3edef5ea9af09cac11484c4b159 SHA256 03991fe055eae71b58d7ac1b7cb1b4cdfe33566e9ee8c0cd99144b583bb2affe
 AUX flow-tools-0.68-fix-configure.diff 4311 RMD160 fd14ccfd4def9c5f5ca77f368c512abaf8ac4a04 SHA1 8ba5adac524978f3662020976bd40b28e3296d57 SHA256 bc0877413e4eb8548219065b4b48dd9104972fa31031735f9c63b203dfb5ab9e
 AUX flowcapture.confd 1590 RMD160 8c1fc976191bde42950e0b9e7eed98838abd51ad SHA1 34079f52426add558bb117fef62ebff68b36d9bd SHA256 5d5640ff055d555d527c261ada54e044519c8197413719435e6a965a42147fa4
@@ -9,6 +9,6 @@ AUX flowcapture.initd 488 RMD160 a0e5688cd49ce9623a3f11bae0fa2d58cc47c609 SHA1 d
 AUX linkme 283 RMD160 663284e66edca80e03d88db3078cd93d6faca452 SHA1 ebf19e1a1b0b7d74ada82e13d87f95cd61651958 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da
 DIST flow-tools-0.68.tar.gz 987151 RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 SHA1 6259263ac4fbf8a9394224e4053393fa756473c7 SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df
 EBUILD flow-tools-0.68-r5.ebuild 2707 RMD160 66ef3a8e556b19049847809666ac8274a5936b93 SHA1 be8fe34273496c7b593cc838386cfcee1c8770cf SHA256 130bf4b17d1d1a90f0f24597338acde4ce3242f7f13a6b996630767589ca51ff
-EBUILD flow-tools-0.68-r6.ebuild 2746 RMD160 4002f08c5d1261c0f438574d5a0d9cb43b2c7f98 SHA1 686ca962b98b4d1cf6283a17907ceec78437e08f SHA256 c35e545d0e0d8188c6824fb65349389b634fcd5a8a02beee3b36d95e003c914f
-MISC ChangeLog 7236 RMD160 77c4d8dc65aeb29d073618fadf53b56cbda438a1 SHA1 f27b95b23744489f82f0b94302719b30e7512fa7 SHA256 1bce4fe13fc1cd1bcfe19a19aa9d96ad6682a94be457af4267f75ebe11a2ede7
+EBUILD flow-tools-0.68-r7.ebuild 2746 RMD160 0c52536fcfe91ae253b958192b2f6b2f36291988 SHA1 1becb2086ee0fb654733d326f5672105917b6d92 SHA256 7999c0505eeda28f9b56cb414e047b79c95fbe39e3cd8ec80e6464c5ab450372
+MISC ChangeLog 7522 RMD160 0fa1523b7e0a5f0af4c9ba6889dfd36b11bd3fe7 SHA1 bf9b2fcec5f49398c5f6d1517b651f7da4a0ca5c SHA256 54c000b0df11ea90a88c81cd70a514cec6bc690cf1901dc53f17a681ff9e9740
 MISC metadata.xml 706 RMD160 48d179b230fd01a49853e73fc46f534373bb8488 SHA1 44ba0dd063806d48e8d6aa341c0bc28ea2d932b3 SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf
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"