commit: e037557258dfb9b46cc2c279bb4aba08d0bf7a3d
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 17:45:03 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 17:45:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0375572
net-analyzer/flow-tools: import initd fix from infra.
Package-Manager: portage-2.2.28
net-analyzer/flow-tools/files/flowcapture.initd | 2 +-
.../flow-tools/flow-tools-0.68.5.1-r7.ebuild | 75 ----------------------
.../flow-tools/flow-tools-0.68.5.1-r8.ebuild | 75 ----------------------
...5.1-r6.ebuild => flow-tools-0.68.5.1-r9.ebuild} | 0
4 files changed, 1 insertion(+), 151 deletions(-)
diff --git a/net-analyzer/flow-tools/files/flowcapture.initd
b/net-analyzer/flow-tools/files/flowcapture.initd
index a31ed5e..c6fc347 100644
--- a/net-analyzer/flow-tools/files/flowcapture.initd
+++ b/net-analyzer/flow-tools/files/flowcapture.initd
@@ -7,7 +7,7 @@ PORT=${PORT:=2055}
# It may have multiple children by original design, but this is not recommended
# for Gentoo at this time.
PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid}
-PIDFILE=${PIDFILE:=${PIDFILE}.${PORT}}
+PIDFILE=${PIDFILE:=${PIDFILE_BASE}.${PORT}}
depend() {
use net
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild
b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild
deleted file mode 100644
index 087e3c9..0000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/";
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2";
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
- sys-libs/zlib
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-run.patch
- epatch "${FILESDIR}"/${P}-syslog.patch
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(usex mysql --with-mysql '') \
- $(usex postgres --with-postgresql=yes --with-postgresql=no) \
- $(usex ssl --with-openssl '') \
- --sysconfdir=/etc/flow-tools
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- exeinto /var/lib/flows/bin
- doexe "${FILESDIR}"/linkme
-
- keepdir /var/lib/flows/ft
-
- newinitd "${FILESDIR}/flowcapture.initd" flowcapture
- newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
- fowners flows:flows /var/lib/flows
- fowners flows:flows /var/lib/flows/bin
- fowners flows:flows /var/lib/flows/ft
-
- fperms 0755 /var/lib/flows
- fperms 0755 /var/lib/flows/bin
-}
-
-pkg_preinst() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
deleted file mode 100644
index 087e3c9..0000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/";
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2";
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
- sys-libs/zlib
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-run.patch
- epatch "${FILESDIR}"/${P}-syslog.patch
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(usex mysql --with-mysql '') \
- $(usex postgres --with-postgresql=yes --with-postgresql=no) \
- $(usex ssl --with-openssl '') \
- --sysconfdir=/etc/flow-tools
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- exeinto /var/lib/flows/bin
- doexe "${FILESDIR}"/linkme
-
- keepdir /var/lib/flows/ft
-
- newinitd "${FILESDIR}/flowcapture.initd" flowcapture
- newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
- fowners flows:flows /var/lib/flows
- fowners flows:flows /var/lib/flows/bin
- fowners flows:flows /var/lib/flows/ft
-
- fperms 0755 /var/lib/flows
- fperms 0755 /var/lib/flows/bin
-}
-
-pkg_preinst() {
- enewgroup flows
- enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild
b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
similarity index 100%
rename from net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild
rename to net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
