diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-02-26 15:41:32 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-02-26 15:41:32 +0000 |
| commit | 33a1fc56df0b4325f023c22f5fa89a2bd649e4c0 (patch) | |
| tree | 1275a6707212aef050d285cccedacc926b167d74 /net-analyzer/flow-tools | |
| parent | Enable multilib. (diff) | |
| download | historical-33a1fc56df0b4325f023c22f5fa89a2bd649e4c0.tar.gz historical-33a1fc56df0b4325f023c22f5fa89a2bd649e4c0.tar.bz2 historical-33a1fc56df0b4325f023c22f5fa89a2bd649e4c0.zip | |
Fix default pidfile path. Replace chown withth fowners and chmod with fperms, replace /var/run with /run (bug #458944 by Reuben Farrelly).
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer/flow-tools')
| -rw-r--r-- | net-analyzer/flow-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/Manifest | 10 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild | 27 |
3 files changed, 27 insertions, 16 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/Manifest b/net-analyzer/flow-tools/Manifest index f828e9a25de7..ec0bd2a96c9d 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -5,13 +5,13 @@ AUX flowcapture.confd 1695 SHA256 53fe6ecc1d6994681d322a4f39da02fa9bc9f0dcdb20ea AUX flowcapture.initd 492 SHA256 c5c1bfd825165299f39556654dc71f16f7c13a07e9591edb2e0faccfc9d1c1f9 SHA512 45b5570553d084a67ab04af2d41453cf8557da09539ad4b9e1f4735a9f646af642dcb177bee0fe3a592ae9a1f946acdc7a4efb6c48dff2dc8534f12c516239a9 WHIRLPOOL f2ce9c4dc05fa153f603dce99a4e6534293c2c99728f0c1aeebeeabbb30d0f981236fa72973930f3364762ba002bde9f5f3b7615c6154964846970d72554293d AUX linkme 283 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 WHIRLPOOL 94af50de39a8350d194917c129fdd5cdb542e07834340db0453a897185ccd4f4da6fd6584ecf144b79c5f8981c3dbfdd7e87894fa66bc230c530d2985828dba7 DIST flow-tools-0.68.5.1.tar.bz2 914062 SHA256 80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 WHIRLPOOL 2e7b98abab82ec07639356c07c89bb480276fec945c48ef86188a70a28ff54ab5dd1f1c7b69945d7b4e2687aafee06bef81dceea655b15aa735c50455723be83 -EBUILD flow-tools-0.68.5.1-r2.ebuild 1726 SHA256 45a7f3b19059f61ce174d64d58e283e35c9ab2d75810f7b612776c3fa4c7edcb SHA512 973799ea58caa56d7834a1256e8f57b736ed9ab9bb5d9577a48b66bf4e20018678747c3ce07ef0b9b0dfc8f6c841651ea90b6b6d46aa2e4c617ed703dd27bb18 WHIRLPOOL fea57d6122bf462c027f0b745b10dba5e50e889bac5240eb6584bd0cc0e5810ec81665b24f2896d5cd0f002f12173ae5a6f02f620afd0b7e4adbb98d2dbaf56b -MISC ChangeLog 11801 SHA256 bdb3352e1b0398e264f6fdfe2cecd259b7c70b94368ac89dcab78837664dfca6 SHA512 3844ee3fe91395e3c94e244621a487de0d28eb8abf701696e533fb5b84f3b0bcd2f54b7550d6f0940a6dca2d6592f1de3390ae61ded0ba43015fbbac68f0198a WHIRLPOOL 102fd627554624d70df8e0b6ffbda441e4f6d32727e2ded8af4f62fd06f5989facb62a39b14c9a2b4f4c053126ce7ad96c2bd2cd996e7f095dfae2b335f5a341 +EBUILD flow-tools-0.68.5.1-r2.ebuild 1840 SHA256 475a9d3780c476e21a5d629ec5b8101d914d86b08f6f1a5682ce5f036a702d05 SHA512 957d6b5ad16a2bbfe3425fa5dd31abd05a29b53af38de3bcdbbb3db5e4ca42a1ae8eddf3dc534594d92aefc2b4a55c011834b92c21f9593dcce80ec5d361a2c4 WHIRLPOOL 2321d1f3b1d3d465875c0032f9a21e9634c60ceec041d0f67d23a9c41452f02f1745a67455ca10996682052945c21945b10ef0f296f5c0421e9a158047e6d90c +MISC ChangeLog 12023 SHA256 c3c02b2d99c16c7381178f5e1cd740e3b8f51423bec0e28032a3177947da40f4 SHA512 d5223005a22b53b73d0c09760121818c6d7809fccd8cdbc9ab4a56ff1521b175997f7931eff92517183d2c20cc67fc9b0ca8d4b8670f593b4216479f5fc3b4a7 WHIRLPOOL 493af43867a0921068a429efca1eb3eb4f7d485786dc54ed31f784767391e619a18d923678c1d8a029eb76f35773687fe52024d76b896d24b2e6750f0b7f2139 MISC metadata.xml 782 SHA256 96523568d0fc94af99564596f973f8207ca051a02fc4f2c248b4f416002aa50b SHA512 957f1c76b9439f5c72542691886eb728febe2fdd8bc0c524654987e84a3a007d9918d9d50aededd26f98ea00380947f8e6dd0b1da339c5235fa30d13ebd6163a WHIRLPOOL a52ba37b3f7f69a39ac39bc00ff8cba08b8bb67a533d567b441ebc647ae7acffadcbcb41e8ab271c477ddc59b3253096459e133b95309c1989e333e5251e14ac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEs01kACgkQVWmRsqeSphPu9wCfXhxW4rbv6SBAuCcmXAUYFSHN -BfYAn25FuowgS4HNOcli7yogo6arypbm -=J9/N +iEYEAREIAAYFAlEs16wACgkQVWmRsqeSphPvbACfQdM62YnGOSSxJmVO5gGCRV82 +YHEAnRbKlZdw1e4X6FACZnuBnqF87diD +=b8Oa -----END PGP SIGNATURE----- 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 } |