bug 86664

Package-Manager: portage-2.0.51.19

3 files changed, 28 insertions, 25 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 1d672fce7cba..42ea807c209e 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.62 2005/03/31 10:07:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.63 2005/04/01 00:58:21 vanquirius Exp $
+
+  31 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> files/nessusd-r6:
+  Init script fix, bug 86664. Thanks to Eric Brown <bigwhitecow@hotmail.com> and
+  Marco Morales <soulse@gmail.com>.
 
   31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   nessus-core-2.2.0.ebuild:
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index 004b855f4c67..3ce6e6540db7 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,28 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 e01eaf0d45c4f625035aa75db3488f5e nessus-core-2.3.0.ebuild 1334
 MD5 f9a4e7716ebdb74b854c8455ee8ddec9 nessus-core-2.2.4.ebuild 1260
-MD5 c6b343a132e20866fa266319988018dd nessus-core-2.0.12.ebuild 1747
-MD5 1ec4ef32df69aa2e575e92ae428429cd nessus-core-2.2.0.ebuild 1755
 MD5 808fa7dfade1c7a47ffe122719946abb nessus-core-2.2.2a.ebuild 1262
-MD5 e1904a90a219b2cb11690ced7b037de4 ChangeLog 9931
-MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
-MD5 e01eaf0d45c4f625035aa75db3488f5e nessus-core-2.3.0.ebuild 1334
 MD5 6f1e3f004c4b37d9db9e6e9989989b60 nessus-core-2.2.3.ebuild 1261
-MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
-MD5 b803eff9067d1d87598fc480ce7c0b3c files/digest-nessus-core-2.2.2a 70
-MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
+MD5 1ec4ef32df69aa2e575e92ae428429cd nessus-core-2.2.0.ebuild 1755
+MD5 c6b343a132e20866fa266319988018dd nessus-core-2.0.12.ebuild 1747
+MD5 448f1be60cb3941bed4f57d3372e5d64 ChangeLog 10123
+MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
 MD5 16d08afb09cfc5710977cd1d01174398 files/digest-nessus-core-2.0.12 139
-MD5 a78c42d997f9da52402e8a7e47294051 files/digest-nessus-core-2.2.3 69
-MD5 9a0fe4028467fdee9187dbcc20107278 files/nessusd-r6 486
-MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
-MD5 73b4eee37b18923b3b50cf550974c9a7 files/digest-nessus-core-2.3.0 70
+MD5 b803eff9067d1d87598fc480ce7c0b3c files/digest-nessus-core-2.2.2a 70
 MD5 d523fcb11205cb895b8d8c1272c07d33 files/digest-nessus-core-2.2.0 138
+MD5 a78c42d997f9da52402e8a7e47294051 files/digest-nessus-core-2.2.3 69
 MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCS8vyKf2g/qXtneoRAuErAKDABxPJ9TVn8+Mtsp4JzfGJwRRtyQCgtx5n
-lG3/dkhtYj98t6KmOWFLS7k=
-=d7UG
------END PGP SIGNATURE-----
+MD5 73b4eee37b18923b3b50cf550974c9a7 files/digest-nessus-core-2.3.0 70
+MD5 61f74be9ca310ac7e5fe540db2c61beb files/nessusd-r6 644
+MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
+MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
+MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
diff --git a/net-analyzer/nessus-core/files/nessusd-r6 b/net-analyzer/nessus-core/files/nessusd-r6
index f801c2b49d0f..ca61af54c563 100644
--- a/net-analyzer/nessus-core/files/nessusd-r6
+++ b/net-analyzer/nessus-core/files/nessusd-r6
@@ -1,13 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r6,v 1.4 2004/07/14 23:05:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r6,v 1.5 2005/04/01 00:58:21 vanquirius Exp $
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if ! `grep -q "cert_file=[^ ]" /etc/nessus/nessusd.conf`
+	then
+		eerror "No certificate found."
+		return 1
+	fi
+}
+
 start() {
+	checkconfig || return 1
 	ebegin "Starting nessusd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
 	eend $?