diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-02-26 15:41:31 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-02-26 15:41:31 +0000 |
| commit | d3a86be55c0523781ad16869d55d664b7f2c3db8 (patch) | |
| tree | 1f754ea2ff9576e4285e7fc3ee6af13c072c6567 /net-analyzer/flow-tools | |
| parent | Enable multilib. (diff) | |
| download | gentoo-2-d3a86be55c0523781ad16869d55d664b7f2c3db8.tar.gz gentoo-2-d3a86be55c0523781ad16869d55d664b7f2c3db8.tar.bz2 gentoo-2-d3a86be55c0523781ad16869d55d664b7f2c3db8.zip | |
Fix default pidfile path. Replace chown withth fowners and chmod with fperms, replace /var/run with /run (bug #458944 by Reuben Farrelly).
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/flow-tools')
| -rw-r--r-- | net-analyzer/flow-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild | 27 |
2 files changed, 22 insertions, 11 deletions
diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog index b70f5cca72c1..121cbc121e80 100644 --- a/net-analyzer/flow-tools/ChangeLog +++ b/net-analyzer/flow-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/flow-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.65 2013/02/26 15:23:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.66 2013/02/26 15:41:31 jer Exp $ + + 26 Feb 2013; Jeroen Roovers <jer@gentoo.org> flow-tools-0.68.5.1-r2.ebuild: + Fix default pidfile path. Replace chown withth fowners and chmod with fperms, + replace /var/run with /run (bug #458944 by Reuben Farrelly). 26 Feb 2013; Jeroen Roovers <jer@gentoo.org> -flow-tools-0.68.5.1-r1.ebuild, files/flowcapture.initd: diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild index 077d5dea797d..a27711203784 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.5.1-r2.ebuild,v 1.4 2013/01/31 23:11:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild,v 1.5 2013/02/26 15:41:31 jer Exp $ EAPI=4 inherit user @@ -31,6 +31,14 @@ pkg_setup() { enewuser flows -1 -1 /var/lib/flows flows } +src_prepare() { + sed -i \ + -e 's|/var/run/|/run/|g' \ + src/flow-capture.c \ + src/flow-fanout.c \ + || die +} + src_configure() { local myconf="--sysconfdir=/etc/flow-tools" use mysql && myconf="${myconf} --with-mysql" @@ -46,9 +54,10 @@ src_configure() { src_install() { default + exeinto /var/lib/flows/bin + keepdir /run/flows keepdir /var/lib/flows keepdir /var/lib/flows/bin - exeinto /var/lib/flows/bin doexe "${FILESDIR}"/linkme newinitd "${FILESDIR}/flowcapture.initd" flowcapture @@ -57,13 +66,11 @@ src_install() { if ! use static-libs; then rm -f "${D}"/usr/lib*/libft.la || die fi -} -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 + fowners flows:flows /run/flows + fowners flows:flows /var/lib/flows + fowners flows:flows /var/lib/flows/bin + fperms 0755 /run/flows + fperms 0755 /var/lib/flows + fperms 0755 /var/lib/flows/bin } |