Apply patch to really use the right MySQL/PostgreSQL port, thanks to Rusnan R. Shaimardanov (bug #213788).

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

4 files changed, 132 insertions, 3 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index a56ebda798d3..1a607a4285d8 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/flow-tools
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.36 2008/05/21 18:49:07 dev-zero Exp $
+# 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 $
+
+*flow-tools-0.68-r6 (26 May 2009)
+
+  26 May 2009; Jeroen Roovers <jer@gentoo.org> +flow-tools-0.68-r6.ebuild,
+  +files/flow-tools-0.68-db_tmp.patch:
+  Apply patch to really use the right MySQL/PostgreSQL port, thanks to
+  Rusnan R. Shaimardanov (bug #213788).
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   flow-tools-0.68-r5.ebuild:
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 6e1abe257ac5..817ad4dba665 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,6 +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-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
@@ -8,5 +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
-MISC ChangeLog 6980 RMD160 d14b58a15e65b5b0dd79af524dec26f2efead770 SHA1 d81809af22cf3e3250e8ed6f55403c0ba80f316f SHA256 1a7f32c794eaefed45cc27e25b80e610a425c3dafd7144e3d49c98b3f7147f46
+EBUILD flow-tools-0.68-r6.ebuild 2746 RMD160 4002f08c5d1261c0f438574d5a0d9cb43b2c7f98 SHA1 686ca962b98b4d1cf6283a17907ceec78437e08f SHA256 c35e545d0e0d8188c6824fb65349389b634fcd5a8a02beee3b36d95e003c914f
+MISC ChangeLog 7236 RMD160 77c4d8dc65aeb29d073618fadf53b56cbda438a1 SHA1 f27b95b23744489f82f0b94302719b30e7512fa7 SHA256 1bce4fe13fc1cd1bcfe19a19aa9d96ad6682a94be457af4267f75ebe11a2ede7
 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
new file mode 100644
index 000000000000..01289ab6a865
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-db_tmp.patch
@@ -0,0 +1,22 @@
+Patch by Rusnan R. Shaimardanov to fix bug #213788.
+
+--- flow-tools-0.68/src/flow-export.c.orig	2009-05-26 02:41:15.000000000 +0200
++++ flow-tools-0.68/src/flow-export.c	2009-05-26 02:54:56.000000000 +0200
+@@ -716,7 +716,7 @@
+     db_table = strsep(&tmp, ":");
+     db_port = atoi(db_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;
+     }
+@@ -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-r6.ebuild
new file mode 100644
index 000000000000..7731ea66f49a
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 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 $
+
+WANT_AUTOMAKE="1.6"
+WANT_AUTOCONF="latest"
+inherit eutils flag-o-matic autotools
+
+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="~amd64 ~ia64 ~ppc ~x86"
+IUSE="mysql postgres debug ssl"
+
+RDEPEND="sys-apps/tcp-wrappers
+	sys-libs/zlib
+	sys-devel/flex
+	!postgres? ( mysql? ( virtual/mysql ) )
+	!mysql? ( postgres? ( virtual/postgresql-server ) )
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+pkg_setup() {
+	if use mysql && use postgres ; then
+		echo
+		eerror "The mysql and postgres USE flags are mutually exclusive."
+		eerror "Please choose either USE=mysql or USE=postgres, but not both."
+		die
+	fi
+
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-configure.diff
+	epatch "${FILESDIR}"/${P}-fix-a-zillion-warnings-updated.diff
+	epatch "${FILESDIR}"/${P}-another-amd64-casting-fixes.patch
+	use debug || epatch "${FILESDIR}"/${PN}-0.67-nodebug.patch
+	epatch "${FILESDIR}"/${PN}-0.67-memleak.patch
+	epatch "${FILESDIR}"/${P}-db_tmp.patch
+
+	sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \
+		configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed"
+
+	# bug 122842, we have /usr/bin/python and not /usr/local/bin/python
+	sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" \
+		"${S}"/bin/flow-{rptfmt,rpt2rrd,log2rrd}
+
+	AM_OPTS="-f -i"
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql"
+	use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres"
+
+	econf \
+		--localstatedir=/etc/flow-tools \
+		--enable-lfs \
+		$(use_with ssl openssl) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		|| die "econf failed"
+
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README SECURITY TODO
+
+	keepdir /var/lib/flows
+	keepdir /var/lib/flows/bin
+	exeinto /var/lib/flows/bin
+	doexe "${FILESDIR}"/linkme
+	keepdir /var/run/flows
+
+	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+}
+
+pkg_postinst() {
+	chown flows:flows /var/run/flows
+	chown flows:flows /var/lib/flows
+	chown flows:flows /var/lib/flows/bin
+	chmod 0755 /var/run/flows
+	chmod 0755 /var/lib/flows
+	chmod 0755 /var/lib/flows/bin
+}