Revision bump; add conf.d file and init.d enhancements. Thanks once again to soulse in bug 90543. Tidy old ebuilds.

(Portage version: 2.0.51.20-r4)

4 files changed, 19 insertions, 6 deletions

diff --git a/net-analyzer/metasploit/files/digest-metasploit-2.3-r1 b/net-analyzer/metasploit/files/digest-metasploit-2.3-r1
deleted file mode 100644
index 05f71c026b5d..000000000000
--- a/net-analyzer/metasploit/files/digest-metasploit-2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96ea8b6a1592337daf924e2ae8e1e938 framework-2.3.tar.gz 2330788
diff --git a/net-analyzer/metasploit/files/digest-metasploit-2.3 b/net-analyzer/metasploit/files/digest-metasploit-2.3-r2
index 05f71c026b5d..05f71c026b5d 100644
--- a/net-analyzer/metasploit/files/digest-metasploit-2.3
+++ b/net-analyzer/metasploit/files/digest-metasploit-2.3-r2
diff --git a/net-analyzer/metasploit/files/msfweb.confd b/net-analyzer/metasploit/files/msfweb.confd
new file mode 100644
index 000000000000..3e9fa64d9a14
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfweb.confd
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/metasploit
+
+# Pidfile
+PIDFILE=/var/run/msfweb.pid
+
+# Bind to the following IP instead of the loopback address
+IPADDR=127.0.0.1
+
+# Bind to the following TCP port instead of default 55555
+PORT=55555
+
+# All options
+MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb.initd b/net-analyzer/metasploit/files/msfweb.initd
index 66e6cc633b1b..ca12debfe9f2 100644
--- a/net-analyzer/metasploit/files/msfweb.initd
+++ b/net-analyzer/metasploit/files/msfweb.initd
@@ -1,18 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb.initd,v 1.1 2005/02/25 11:09:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb.initd,v 1.2 2005/04/27 12:01:41 ka0ttic Exp $
 
 start() {
 	ebegin "Starting msfweb"
-	start-stop-daemon --start --quiet --exec /usr/bin/msfweb >/dev/null 2>&1 &
-	echo $! > /var/run/msfweb.pid
+	start-stop-daemon --start --quiet --exec /usr/bin/msfweb \
+		-- ${MSF_OPTS} >/dev/null 2>&1 &
+	echo $! > ${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet --pidfile /var/run/msfweb.pid
-	rm -f /var/run/msfweb.pid
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
 	eend $?
 }