diff options
Diffstat (limited to 'net-analyzer/flow-tools')
| -rw-r--r-- | net-analyzer/flow-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/files/flow-tools-0.68-249449-amd64.patch | 13 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/flow-tools-0.68-r8.ebuild | 99 |
3 files changed, 120 insertions, 1 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/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 +} |