Fix timestamp output thanks to Mirek Kratochvil and Oleg Gawriloff (bug #249449).

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

4 files changed, 123 insertions, 2 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 6f29ecf06938..a958280bc44c 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.39 2010/02/08 12:46:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.40 2010/02/12 15:43:28 jer Exp $
+
+*flow-tools-0.68-r8 (12 Feb 2010)
+
+  12 Feb 2010; Jeroen Roovers <jer@gentoo.org> +flow-tools-0.68-r8.ebuild,
+  +files/flow-tools-0.68-249449-amd64.patch:
+  Fix timestamp output thanks to Mirek Kratochvil and Oleg Gawriloff (bug
+  #249449).
 
 *flow-tools-0.68-r7 (08 Feb 2010)
 
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 3eb8c9149154..c2a50e4c4584 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,5 +1,6 @@
 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-249449-amd64.patch 274 RMD160 8312c57502e4e3c96fcbcc568983bdcd453201f7 SHA1 b9c3f1d2e7d16c9b9445846a2a5e090df2ddd43e SHA256 59b0df2866339c1f0dda8f66b360f5d3d3b532f0a9a0c948403e41b5f94b6e35
 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 574 RMD160 7cecb1da86c762a41c05c1ad2443e16eb825cb40 SHA1 dc489ec81e21ba1578feb4eb60a51c6a29677852 SHA256 f3653d15368356b4b2b64a13ba0eb6d893ec120c43e7bf29f73f05dd5ec57026
 AUX flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404 RMD160 81535106be145c56a6a201125ad1cd137ec25378 SHA1 fad3da5429d8d3edef5ea9af09cac11484c4b159 SHA256 03991fe055eae71b58d7ac1b7cb1b4cdfe33566e9ee8c0cd99144b583bb2affe
@@ -10,5 +11,6 @@ AUX linkme 283 RMD160 663284e66edca80e03d88db3078cd93d6faca452 SHA1 ebf19e1a1b0b
 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-r7.ebuild 2746 RMD160 0c52536fcfe91ae253b958192b2f6b2f36291988 SHA1 1becb2086ee0fb654733d326f5672105917b6d92 SHA256 7999c0505eeda28f9b56cb414e047b79c95fbe39e3cd8ec80e6464c5ab450372
-MISC ChangeLog 7527 RMD160 da55480fa96df57b9d02ebfd0f83944da349e5df SHA1 759215b0a3730736a0eb14cdca310accae9269c5 SHA256 120be8514ad459e0184cea7b597ea4aca9effce0b0fab8c43fca3eca0c930228
+EBUILD flow-tools-0.68-r8.ebuild 2792 RMD160 0f2280544f1da11fb204b28e9aea17e0db2c4303 SHA1 969d36e094d3eb9c8edd9f3f1f94c4175c24685d SHA256 fdc5a98e7eaa3b4371ab96d5bc7fd80a266b1eed2166b0764541c8101d13c561
+MISC ChangeLog 7769 RMD160 77f6bdd0e5781e1c93da3a3dc86e01ffdd5e389c SHA1 5a56f8318afc377b19a0ba7edd28be937d2bbfe2 SHA256 0e07568148155cee354e32c928a92592fe08e720c11c037b16fc8eeaacc00740
 MISC metadata.xml 706 RMD160 48d179b230fd01a49853e73fc46f534373bb8488 SHA1 44ba0dd063806d48e8d6aa341c0bc28ea2d932b3 SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-249449-amd64.patch b/net-analyzer/flow-tools/files/flow-tools-0.68-249449-amd64.patch
new file mode 100644
index 000000000000..a1336d278466
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-249449-amd64.patch
@@ -0,0 +1,13 @@
+--- flow-tools-0.68/lib/ftlib.h.orig	2005-05-10 18:51:33.000000000 +0300
++++ flow-tools-0.68/lib/ftlib.h	2009-09-21 17:36:37.000000000 +0300
+@@ -416,8 +416,8 @@
+ };
+ 
+ struct fttime {
+-  u_int32 secs;
+-  u_int32 msecs;
++  time_t secs;
++  time_t msecs;
+ };
+ 
+ struct ftver {
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r8.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r8.ebuild
new file mode 100644
index 000000000000..6c8f8538e3ee
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r8.ebuild
@@ -0,0 +1,99 @@
+# 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-r8.ebuild,v 1.1 2010/02/12 15:43:28 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
+	epatch "${FILESDIR}"/${P}-249449-amd64.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
+}