Fix minor bug in init script wrt bug #186700

Package-Manager: portage-2.1.3.5

5 files changed, 29 insertions, 23 deletions

diff --git a/net-analyzer/FlowScan/ChangeLog b/net-analyzer/FlowScan/ChangeLog
index 53fdb17d2838..a3cb1ce8e2fd 100644
--- a/net-analyzer/FlowScan/ChangeLog
+++ b/net-analyzer/FlowScan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/FlowScan
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/ChangeLog,v 1.11 2007/06/02 22:14:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/ChangeLog,v 1.12 2007/08/15 11:55:18 jokey Exp $
+
+*FlowScan-1.006-r3 (15 Aug 2007)
+
+  15 Aug 2007; Markus Ullmann <jokey@gentoo.org> files/flowscan.init,
+  -FlowScan-1.006-r2.ebuild, +FlowScan-1.006-r3.ebuild:
+  Fix minor bug in init script wrt bug #186700
 
   02 Jun 2007; Markus Ullmann <jokey@gentoo.org> FlowScan-1.006-r2.ebuild:
   Stable on x86
diff --git a/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild b/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild
index 0cbd1fbb3c01..4782e747df0b 100644
--- a/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild
+++ b/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild,v 1.6 2007/06/02 22:14:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild,v 1.1 2007/08/15 11:55:18 jokey Exp $
 
 inherit eutils
 
@@ -21,7 +21,6 @@ RDEPEND="|| ( app-shells/pdksh app-shells/ksh )
 	dev-perl/HTML-Table
 	dev-perl/Net-Patricia
 	dev-perl/Cflow"
-
 DEPEND="|| ( app-shells/pdksh app-shells/ksh )
 		<net-analyzer/rrdtool-1.2"
 
diff --git a/net-analyzer/FlowScan/Manifest b/net-analyzer/FlowScan/Manifest
index f6eb7b4408e7..db18b912e7ff 100644
--- a/net-analyzer/FlowScan/Manifest
+++ b/net-analyzer/FlowScan/Manifest
@@ -5,30 +5,30 @@ AUX FlowScan.pm 8696 RMD160 8020c6563ec170b10eb4d9d1e1fd6a93debe1a83 SHA1 5d4193
 MD5 18bb7b00290cbd79007468e897d000d9 files/FlowScan.pm 8696
 RMD160 8020c6563ec170b10eb4d9d1e1fd6a93debe1a83 files/FlowScan.pm 8696
 SHA256 234472ce9b49fb61d3e2c4cd0e83db31969a988670724621a75982ac93509f3c files/FlowScan.pm 8696
-AUX flowscan.init 458 RMD160 b01b654ae01c0a900ac2b2eebfa10f442900747d SHA1 0077c0072ca9554471864c1c47b13a6558930153 SHA256 b7f70317a87ab25dd8a512b31b0ca7b761848e17504565bb2cce8c0fc4d70418
-MD5 aae73bd9ba06b4ce266f50b27f8e82e2 files/flowscan.init 458
-RMD160 b01b654ae01c0a900ac2b2eebfa10f442900747d files/flowscan.init 458
-SHA256 b7f70317a87ab25dd8a512b31b0ca7b761848e17504565bb2cce8c0fc4d70418 files/flowscan.init 458
+AUX flowscan.init 462 RMD160 ab9845189c2d2e8d5c08fc165710ad085d4fc9d8 SHA1 44360db75470f6637102faa99bcb83625e01a2b3 SHA256 ea9641ef2bd56980636df2e9105c7ecd449328b2e0d5b63baa8ee7c3cd4e3ff2
+MD5 158fc8867cade2eb7eef7998b0ec95ae files/flowscan.init 462
+RMD160 ab9845189c2d2e8d5c08fc165710ad085d4fc9d8 files/flowscan.init 462
+SHA256 ea9641ef2bd56980636df2e9105c7ecd449328b2e0d5b63baa8ee7c3cd4e3ff2 files/flowscan.init 462
 DIST FlowScan-1.006.tar.gz 149514 RMD160 01108351273b81295d724d009921ccbec44ddc0a SHA1 ff2e2767cdc1f42298c297bd27a55fc256f4bb94 SHA256 279562cef77ae0b51f49d115309277f360516d15eae6802cd2182cee17154e44
-EBUILD FlowScan-1.006-r2.ebuild 1865 RMD160 250628805c2a58a8b5b0d9e58e72f2d24deb01fc SHA1 c54934f2b5ad168553e950c9ded2d466b0c3a923 SHA256 3fbebdf0184accf1816f07718dcba3254e28fd336c876a7c0072df4fa51e08aa
-MD5 c9ba69acb0ce5782903071b69b87f038 FlowScan-1.006-r2.ebuild 1865
-RMD160 250628805c2a58a8b5b0d9e58e72f2d24deb01fc FlowScan-1.006-r2.ebuild 1865
-SHA256 3fbebdf0184accf1816f07718dcba3254e28fd336c876a7c0072df4fa51e08aa FlowScan-1.006-r2.ebuild 1865
-MISC ChangeLog 1558 RMD160 68305aff44209a9aaab6464c3d72ec44664abc37 SHA1 d9d4a6b2b0c2437a4a6feb2e69e5651ca25bd344 SHA256 f7dac292a3288645e533ff2f42aad85bd406bf37617fa47de4ed3a9e83a58292
-MD5 f234cfe1394ca51badaf97a2bdd6fe9a ChangeLog 1558
-RMD160 68305aff44209a9aaab6464c3d72ec44664abc37 ChangeLog 1558
-SHA256 f7dac292a3288645e533ff2f42aad85bd406bf37617fa47de4ed3a9e83a58292 ChangeLog 1558
+EBUILD FlowScan-1.006-r3.ebuild 1864 RMD160 f49bbb03eac98cada3dfa9932591bbcec3ee6ccd SHA1 36e95f1213c137e56a66c2a1eaa88483a45694d5 SHA256 8641e031de7a8eab9c9daada408748629cab086fe8bb88b77c8a0da8e12bb304
+MD5 214868ad8a6493de4d8f13969b6f5651 FlowScan-1.006-r3.ebuild 1864
+RMD160 f49bbb03eac98cada3dfa9932591bbcec3ee6ccd FlowScan-1.006-r3.ebuild 1864
+SHA256 8641e031de7a8eab9c9daada408748629cab086fe8bb88b77c8a0da8e12bb304 FlowScan-1.006-r3.ebuild 1864
+MISC ChangeLog 1766 RMD160 8c89eb5be66ba85bfe8e3fb5ed9030cb6e3999a1 SHA1 9a10b12872ea4373f9ba271bf6570de6900c82a8 SHA256 b68b555b9dbf326d6774e7c0808e3ecf8b1327a9c48c22f57d3d618ad981923f
+MD5 a8be8b8be967f2efb194f39a1fe34620 ChangeLog 1766
+RMD160 8c89eb5be66ba85bfe8e3fb5ed9030cb6e3999a1 ChangeLog 1766
+SHA256 b68b555b9dbf326d6774e7c0808e3ecf8b1327a9c48c22f57d3d618ad981923f ChangeLog 1766
 MISC metadata.xml 223 RMD160 4875e4f86bc0fd0f10a781b478c70fd21adb7eaa SHA1 fcb6d281952f130ccaf46c52a595f8ef3f25b15f SHA256 4d78d21a58ebede4bfdbced61656070166d1d88eacc4becc023287e6de8b5f9b
 MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
 RMD160 4875e4f86bc0fd0f10a781b478c70fd21adb7eaa metadata.xml 223
 SHA256 4d78d21a58ebede4bfdbced61656070166d1d88eacc4becc023287e6de8b5f9b metadata.xml 223
-MD5 86c03db8fdfb0806e30de66238cd5034 files/digest-FlowScan-1.006-r2 244
-RMD160 687598aae47c1c75550a23a0afaf61ca78946faa files/digest-FlowScan-1.006-r2 244
-SHA256 4e3f5ac72dab49a123d16a783ca7eaffeebb24643d0ab067048d36ade5c8f538 files/digest-FlowScan-1.006-r2 244
+MD5 86c03db8fdfb0806e30de66238cd5034 files/digest-FlowScan-1.006-r3 244
+RMD160 687598aae47c1c75550a23a0afaf61ca78946faa files/digest-FlowScan-1.006-r3 244
+SHA256 4e3f5ac72dab49a123d16a783ca7eaffeebb24643d0ab067048d36ade5c8f538 files/digest-FlowScan-1.006-r3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGYevXz974XjDVpbkRAhmVAJ0bgzinyNS04V97SHAy8uUOal6QuQCg3GTq
-X/6hL2NKSchHi4nal7OMDvQ=
-=e3TC
+iD8DBQFGwumyz974XjDVpbkRAi99AKDNtD/O31SYifIv7fqKd9PlvJIu8QCeLL64
+boeduX4VJFP8TRnGxL4vYeA=
+=CT9o
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2 b/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3
index 642e9fdc100f..642e9fdc100f 100644
--- a/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2
+++ b/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3
diff --git a/net-analyzer/FlowScan/files/flowscan.init b/net-analyzer/FlowScan/files/flowscan.init
index 42b7ccaf3d05..4488582ce1b9 100755
--- a/net-analyzer/FlowScan/files/flowscan.init
+++ b/net-analyzer/FlowScan/files/flowscan.init
@@ -8,8 +8,9 @@ depend() {
 
 start() {
 	ebegin "Starting flowscan processing"
-	cd /var/lib/flows ; start-stop-daemon --start --quiet -c flows:flows --exec bin/flowscan \
+	start-stop-daemon --start --quiet -c flows:flows --exec /var/lib/flows/bin/flowscan \
 	-p /var/run/flows/flowscan.pid -m -b >> /var/log/flowscan 2>&1 </dev/null & >/dev/null
+	eend $?
 }
 
 stop() {