From e0275893a17afcd51a775202df2089e89a171068 Mon Sep 17 00:00:00 2001
From: Markus Ullmann <jokey@gentoo.org>
Date: Wed, 15 Aug 2007 11:55:18 +0000
Subject: Fix minor bug in init script wrt bug #186700 (Portage version:
 2.1.3.5)

---
 net-analyzer/FlowScan/ChangeLog                    |  8 ++-
 net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild     | 66 ----------------------
 net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild     | 65 +++++++++++++++++++++
 .../FlowScan/files/digest-FlowScan-1.006-r2        |  3 -
 .../FlowScan/files/digest-FlowScan-1.006-r3        |  3 +
 net-analyzer/FlowScan/files/flowscan.init          |  3 +-
 6 files changed, 77 insertions(+), 71 deletions(-)
 delete mode 100644 net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild
 create mode 100644 net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild
 delete mode 100644 net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2
 create mode 100644 net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3

(limited to 'net-analyzer/FlowScan')

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-r2.ebuild
deleted file mode 100644
index 0cbd1fbb3c01..000000000000
--- a/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 $
-
-inherit eutils
-
-DESCRIPTION="Program to report and analyze flow files"
-HOMEPAGE="http://net.doit.wisc.edu/~plonka/FlowScan/"
-SRC_URI="http://net.doit.wisc.edu/~plonka/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-RDEPEND="|| ( app-shells/pdksh app-shells/ksh )
-	dev-lang/perl
-	<net-analyzer/rrdtool-1.2
-	dev-perl/ConfigReader
-	dev-perl/Boulder
-	dev-perl/HTML-Table
-	dev-perl/Net-Patricia
-	dev-perl/Cflow"
-
-DEPEND="|| ( app-shells/pdksh app-shells/ksh )
-		<net-analyzer/rrdtool-1.2"
-
-pkg_setup() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_compile() {
-	./configure --prefix="${D}"/var/lib/flows --bindir=/var/lib/flows/bin || die "configure failed"
-}
-
-src_install() {
-	make install || die "install failed"
-
-	newinitd "${FILESDIR}"/flowscan.init flowscan
-
-	dodoc Changes *README* TODO
-	newdoc INSTALL README.update
-
-	keepdir /var/lib/flows/ft
-	keepdir /var/lib/flows/rrds
-	keepdir /var/lib/flows/scoreboard
-
-	sed -i 's|FlowFileGlob flows.*:*\[0-9\]|FlowFileGlob /var/lib/flows/ft-v05.*|' ${S}/cf/flowscan.cf \
-		|| die "sed failed"
-
-	exeinto /var/lib/flows/bin
-	newexe "${FILESDIR}"/FlowScan.pm FlowScan.pm
-	insinto /var/lib/flows/bin
-	doins cf/flowscan.cf cf/CampusIO.cf
-}
-
-pkg_postinst() {
-	chown flows:flows /var/lib/flows/{ft,rrds,scoreboard}
-	chown flows:flows /var/lib/flows/bin/flowscan.cf
-	chown flows:flows /var/lib/flows/bin/FlowScan.pm
-	elog "Please note that while you can use the reporting modules that come"
-	elog "with FlowScan, it is recommended that you install either JKFlow or"
-	elog "for more simple implementations CUFlow. Both are available in"
-	elog "Portage."
-}
diff --git a/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild b/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild
new file mode 100644
index 000000000000..4782e747df0b
--- /dev/null
+++ b/net-analyzer/FlowScan/FlowScan-1.006-r3.ebuild
@@ -0,0 +1,65 @@
+# 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-r3.ebuild,v 1.1 2007/08/15 11:55:18 jokey Exp $
+
+inherit eutils
+
+DESCRIPTION="Program to report and analyze flow files"
+HOMEPAGE="http://net.doit.wisc.edu/~plonka/FlowScan/"
+SRC_URI="http://net.doit.wisc.edu/~plonka/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE=""
+
+RDEPEND="|| ( app-shells/pdksh app-shells/ksh )
+	dev-lang/perl
+	<net-analyzer/rrdtool-1.2
+	dev-perl/ConfigReader
+	dev-perl/Boulder
+	dev-perl/HTML-Table
+	dev-perl/Net-Patricia
+	dev-perl/Cflow"
+DEPEND="|| ( app-shells/pdksh app-shells/ksh )
+		<net-analyzer/rrdtool-1.2"
+
+pkg_setup() {
+	enewgroup flows
+	enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_compile() {
+	./configure --prefix="${D}"/var/lib/flows --bindir=/var/lib/flows/bin || die "configure failed"
+}
+
+src_install() {
+	make install || die "install failed"
+
+	newinitd "${FILESDIR}"/flowscan.init flowscan
+
+	dodoc Changes *README* TODO
+	newdoc INSTALL README.update
+
+	keepdir /var/lib/flows/ft
+	keepdir /var/lib/flows/rrds
+	keepdir /var/lib/flows/scoreboard
+
+	sed -i 's|FlowFileGlob flows.*:*\[0-9\]|FlowFileGlob /var/lib/flows/ft-v05.*|' ${S}/cf/flowscan.cf \
+		|| die "sed failed"
+
+	exeinto /var/lib/flows/bin
+	newexe "${FILESDIR}"/FlowScan.pm FlowScan.pm
+	insinto /var/lib/flows/bin
+	doins cf/flowscan.cf cf/CampusIO.cf
+}
+
+pkg_postinst() {
+	chown flows:flows /var/lib/flows/{ft,rrds,scoreboard}
+	chown flows:flows /var/lib/flows/bin/flowscan.cf
+	chown flows:flows /var/lib/flows/bin/FlowScan.pm
+	elog "Please note that while you can use the reporting modules that come"
+	elog "with FlowScan, it is recommended that you install either JKFlow or"
+	elog "for more simple implementations CUFlow. Both are available in"
+	elog "Portage."
+}
diff --git a/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2 b/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2
deleted file mode 100644
index 642e9fdc100f..000000000000
--- a/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3c687ae0ffab82dadeb4086f122bcee5 FlowScan-1.006.tar.gz 149514
-RMD160 01108351273b81295d724d009921ccbec44ddc0a FlowScan-1.006.tar.gz 149514
-SHA256 279562cef77ae0b51f49d115309277f360516d15eae6802cd2182cee17154e44 FlowScan-1.006.tar.gz 149514
diff --git a/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3 b/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3
new file mode 100644
index 000000000000..642e9fdc100f
--- /dev/null
+++ b/net-analyzer/FlowScan/files/digest-FlowScan-1.006-r3
@@ -0,0 +1,3 @@
+MD5 3c687ae0ffab82dadeb4086f122bcee5 FlowScan-1.006.tar.gz 149514
+RMD160 01108351273b81295d724d009921ccbec44ddc0a FlowScan-1.006.tar.gz 149514
+SHA256 279562cef77ae0b51f49d115309277f360516d15eae6802cd2182cee17154e44 FlowScan-1.006.tar.gz 149514
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() {
-- 
cgit v1.2.3-65-gdbad