From 55d789c9901f8dd52522b501cd383c6272db9f97 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 8 Feb 2010 12:27:19 +0000 Subject: 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) --- net-analyzer/flow-tools/ChangeLog | 11 ++- .../flow-tools/files/flow-tools-0.68-db_tmp.patch | 9 -- net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild | 98 ---------------------- net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild | 98 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 109 deletions(-) delete mode 100644 net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild create mode 100644 net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild (limited to 'net-analyzer') 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 -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-r6.ebuild deleted file mode 100644 index 7731ea66f49a..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68-r6.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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 -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild new file mode 100644 index 000000000000..86dce41856e0 --- /dev/null +++ b/net-analyzer/flow-tools/flow-tools-0.68-r7.ebuild @@ -0,0 +1,98 @@ +# 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-r7.ebuild,v 1.1 2010/02/08 12:27:19 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 +} -- cgit v1.2.3-65-gdbad