Revbump to fix init script.

Package-Manager: portage-2.2.14-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x10FB016B

4 files changed, 98 insertions, 9 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index ba16c8054bbd..3e943dcb344b 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/flow-tools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.74 2014/12/28 16:03:48 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.75 2015/01/04 21:12:56 redlizard Exp $
+
+*flow-tools-0.68.5.1-r6 (04 Jan 2015)
+
+  04 Jan 2015; redlizard <redlizard@gentoo.org> +flow-tools-0.68.5.1-r6.ebuild,
+  files/flowcapture.initd:
+  Revbump to fix init script.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
   flow-tools-0.68.5.1-r2.ebuild, flow-tools-0.68.5.1-r4.ebuild,
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index fc94a8586ce4..b2d204f5687c 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -4,18 +4,29 @@ Hash: SHA256
 AUX flow-tools-0.68.5.1-run.patch 493 SHA256 8879df3fb76ed6459a7932a471a7360adb195d26fa88f3797b1a25ccdc4a81e5 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d WHIRLPOOL d58315e44f7886fcc3b944c2c6595d94b15ba7bb46a09ff1608d9876e3db46ce99c3a063b06ad80b470fc01e6caedd8e71137ca1000c11c2e032abbeed5c0417
 AUX flow-tools-0.68.5.1-syslog.patch 979 SHA256 15eab977271205917b303f79b2caf69e48f5a1a575be704ffbdbdf07e812d525 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537 WHIRLPOOL 31d185f356f842103c3e7f10652c1438132f3f49fbcb9c2ee37ab76adaf60386d74865292d11b22708cbb59bdca903096ace198d864c20e04397dddf80be75b0
 AUX flowcapture.confd 1677 SHA256 b9398472e08fc93f4bffb542312bd494a90047177be29c8082fbdf2297c0c4bc SHA512 60285943879e48416b00e176de0ab2054623ecf83d49feb5bd88b5e68afea187013cbf889e7be3f26e8d2bdd96a2f19c482dab2815d14f4ab0e9d454aa27e3c1 WHIRLPOOL 2c3668088fc1d18c4ff7ba5229d2beb5bc3fbd20a4ffc6aae8cde5d193aff6fb3747844e426900ad8a23ad82c17b868dcf935f983e058dd22f00fe5f306578e4
-AUX flowcapture.initd 560 SHA256 3546fccdf465d9221c65479d3c009ea6c1f13b51dbef456d3bf1221c3d28954a SHA512 d26bf43929b3eba5eb6b324811f8e08303556b74c1a15d40cda2142e61142fc46121d6e3224316b78d7aebbdb71d84518345e2538ffb49bb813a3f7d599d23a0 WHIRLPOOL 5ec09ae44b4f592c5b73fe10893bd054a68a84b5bbf78d44c52c13df4e5f0bd12a9a586ae53b7628edb0930410fb0ae733f205e475908f38c41aa4d6d52d6059
+AUX flowcapture.initd 557 SHA256 5cdba3b2e3ed48c8700eb6ce66ae617fd009d3080435144376a35db3f0983ae2 SHA512 bb0eeb12a9fb34f0c452b5ef1575f2f7fe325d2d59fb4ac6f49bc1f698c767eeaa1c7c6af10c3c7163137dddbe309a68a538f906e8dab6192cfcee648e618e1c WHIRLPOOL 0b85da05786bb1b7f8b8e820c9e86930b792bba51ac142ecea8473be15d367384569b486e0ff624187bd7b32ff84f813805ee3e164090251625cdda8dc5615a7
 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 1817 SHA256 cce852b50b630ddac3bd2e90f03a75efbf3b15e1df6f5c9fc55f95f775d6d1b7 SHA512 1eb6785b8bec45ed496e55eb80d90012efc31bf61406eef80e768d95de96e58a40af634a44e19da1fda52ce123af383d6e4db2fd6eede6c7d7cd6a5768e2a920 WHIRLPOOL 2f949a93b702253d567205ec46bb82908e214e720df9f92f518c251042aaf8290ee2bb11dbd660dcdcd7d14c06e8a4cf8ba7b5c4f4496b591b80254f8418b1c6
 EBUILD flow-tools-0.68.5.1-r4.ebuild 1708 SHA256 bad0a66b675ed72b4acccb5d0c75b0048119988953ed9343eb392eeb0953bf23 SHA512 303eee50ec963859010a884aebd2dec7d02eec8159586526e1289629e1e363c37a64dd756b8825dbd076f696cb27ceb605289b184c5b8c0782edeba7688b6418 WHIRLPOOL 98237ac4cb03598a193505c3695936b4aa8e86678752e20634683eb62de3cc518895b9f88d8aed94f56fff10d1389fee6bf58fa08797f65c278aef29518b2bed
 EBUILD flow-tools-0.68.5.1-r5.ebuild 1708 SHA256 1d54b64d54a1a0253786e0129b5bcfb000544df36a56804b9821fbcb7d608ab0 SHA512 ae4ce77f0abc43def66825125f06b816cbefb9c53f2199c7c56ca2c7ab52d37f4b915fced64ad05b35dd3d0edee8e2aaf3f1c590af0194b807ed0301ff80f2e2 WHIRLPOOL 65b231342b2115e7dc147f25006ce9f1016f523643ba9b8350e439beb269dfee835d715af50f5ec6ab08d1b5eeb8065c55d54bf0adfeecdf6c1be15cc418b1a4
-MISC ChangeLog 13645 SHA256 24b60fe15bc349336de6e4f8082f48067d19ee3c803b25580902ac6dc80d9890 SHA512 670ee878ff60664f8c057397b6d6098ccdaba2a4a9dab14f8c7619ecc0c37611895b901082e12e27b1976d6fc6136f03c661bde8f49aa16232ec2f7cd129003f WHIRLPOOL 6f1d2367a30aec7197b5824046d1e720204a531baf33cb8c2a31773827bf79794aa7427c2afaa6616ce091f1cbea2c56146b4e60815cf1e7a38438eae8ca6976
+EBUILD flow-tools-0.68.5.1-r6.ebuild 1707 SHA256 4ded4a46f93885638ff6f6a899940c7125a1dc0bb65d521bfc2e7aece765eebc SHA512 961a673eb99de5e598dea5e3fd402514bfe5a209204ae429c85e26fc4fcd719d87256cbc5bdda593d86fdf4aa1775bbabedc0a858dbfab9aac76f45479e720e7 WHIRLPOOL c6c85833459ad6cb7188be356d73dd4511e6f257edd68e2069ff9a5e468edf204569d62d03d0737b2fcc2996c11a19b6f40c8d5791d15a81dcec871a7270d7f1
+MISC ChangeLog 13821 SHA256 6c2437fd0fae1ac63f09d3c52d2e6a21b20492146ac8e273e8f2656c8b49a6bc SHA512 16d8e6a2976c8978bdf382fca0014d23f7c86210a2a159c77b6f75f27636cb531ec201557f68c06a28580c99e45451541bde187a1e054f7925eb8c60fc236a32 WHIRLPOOL 5651bf53123f4f064ab3e8a25710023ca2e3b0a005a70cb0ffd11542b9f869398f31d6072bafa652b592a385414d395aee165c0653cfc7ae6a3128691aeaf821
 MISC metadata.xml 782 SHA256 96523568d0fc94af99564596f973f8207ca051a02fc4f2c248b4f416002aa50b SHA512 957f1c76b9439f5c72542691886eb728febe2fdd8bc0c524654987e84a3a007d9918d9d50aededd26f98ea00380947f8e6dd0b1da339c5235fa30d13ebd6163a WHIRLPOOL a52ba37b3f7f69a39ac39bc00ff8cba08b8bb67a533d567b441ebc647ae7acffadcbcb41e8ab271c477ddc59b3253096459e133b95309c1989e333e5251e14ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgKeUACgkQVxOqA9G7/aB4zAD7BCflG3Vas37UT2HnJ09yV8Rd
-fxLoTNzGus0AE+OszJYA/inujqDgoGhlIAmpxcF5nJC2iETDG8YXc00s1K5R6zhi
-=HM6p
+iQIcBAEBCAAGBQJUqazeAAoJEMcu9QQQ+wFrtUcP/2uAeO4ULZCHBllwF9pQdPsv
+Z9BK56/6+o8G3mmHl3kZbtzhWyq8hUhApIxT6mIA8tY4HqWTLE2iTS/H/mjVKuSU
+mQK/GBUIDNdwaXoEttyJw9AniDfvACMtuMkj+t0gHLP6n9Q0tcCiHCpYJ1OTZr6p
+LAeU2Ra+gvxNo6reyiCuafHbg7dq1+wIMUMPJ/u7mzaIP1sKeDXnkYHaIvwm094e
+0CSaXBGpSsFkOwg37XbtUiUAjMjcEJYgQmHJ7M3L0eeAxllPF1lwGq7ipaeE9U/2
+Za8ZmVts6dolmu+7CqZUkwVlPbBYdKfQLHxGbWtFIFmymou9xeNW31rDoIYTwSMl
+hjhGzZBd+ScLa6kKNsxds5FkrNTH5eo1oBp69192y83NKtuvyWmvJMY8FDZ0sMhH
+rj6Q17De7BCQyGwwwvv+eRnaq28rEdTphsxTWZw1AgTIju+uZvgvEbzXiyppxGAB
+KCxbm8xKZP8ovmPSK8eGHNk4GmmhfaW9zrVYHtpRz9JgRN+z10L0VBKDDLkohVG4
+geFnSlqec5TWbxmn8vUZ9ZKqslAkJ2MFu5kL90YjGwdWIgGFhTEgUVQntfqUnCYZ
+AZm1okv9moP7YzAfMBoxDH2YOMR+Xkvgf2em56GDcjko1QpHD7r/O9aVTnlj4diF
+o2IhKflgQQajs+Mkyj/P
+=GTq0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd
index 668a8e54fe37..dc01c67d3d69 100755
--- a/net-analyzer/flow-tools/files/flowcapture.initd
+++ b/net-analyzer/flow-tools/files/flowcapture.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -11,7 +11,7 @@ start() {
 	checkpath -d -o flows /run/flows
 	start-stop-daemon --start --user ${USER} --exec /usr/bin/flow-capture \
 		--pidfile /run/flows/flowcapture.pid.${PORT} \
-		-- -D ${FLOW_OPTS} >/dev/null 2>&1
+		-- ${FLOW_OPTS} >/dev/null 2>&1
 	eend $?
 }
 
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-r6.ebuild
new file mode 100644
index 000000000000..d133451bfb75
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 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-r6.ebuild,v 1.1 2015/01/04 21:12:56 redlizard Exp $
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data"
+HOMEPAGE="http://code.google.com/p/flow-tools/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug mysql postgres ssl static-libs"
+
+RDEPEND="sys-apps/tcp-wrappers
+	sys-libs/zlib
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ssl? ( dev-libs/openssl )"
+
+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
+}