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)

8 files changed, 37 insertions, 67 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 2f7caf5a517d..3b10975f966f 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.5 2005/03/13 10:44:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.6 2005/04/27 12:01:41 ka0ttic Exp $
+
+*metasploit-2.3-r2 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +files/msfweb.confd,
+  files/msfweb.initd, -metasploit-2.3.ebuild, -metasploit-2.3-r1.ebuild,
+  +metasploit-2.3-r2.ebuild:
+  Revision bump; add conf.d file and init.d enhancements. Thanks once again to
+  soulse in bug 90543. Tidy old ebuilds.
 
   13 Mar 2005; Luca Barbato <lu_zero@gentoo.org> :
   Fixed ChangeLog as requersted by reporter in bug #75532
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 73b5b42e27d1..4dff45080a5a 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,7 +1,6 @@
+MD5 8cb5f887619f325756b16ecea222685e metasploit-2.3-r2.ebuild 1238
+MD5 2d353fa1a44c65661252be815bc02733 ChangeLog 1179
 MD5 5c7feb9f12264fd99f3f435216e82f26 metadata.xml 926
-MD5 f6641446118c7c081b6f76998351818a metasploit-2.3-r1.ebuild 1197
-MD5 9868774960efd638b80d3f1652ac1a1e ChangeLog 852
-MD5 58b2cffebded62e81c672f465dd51a2f metasploit-2.3.ebuild 1194
-MD5 f9cb96949abbc8b02b5bebe78aedf53e files/msfweb.initd 536
-MD5 38b31ffed97d630a113365424ecd9655 files/digest-metasploit-2.3 66
-MD5 38b31ffed97d630a113365424ecd9655 files/digest-metasploit-2.3-r1 66
+MD5 38b31ffed97d630a113365424ecd9655 files/digest-metasploit-2.3-r2 66
+MD5 60ed26ce3c2cba88b12d53ffe7b7d4c8 files/msfweb.confd 273
+MD5 80894a7c7ccf780057e70cd6a2aaf2eb files/msfweb.initd 528
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 $?
 }
diff --git a/net-analyzer/metasploit/metasploit-2.3-r1.ebuild b/net-analyzer/metasploit/metasploit-2.3-r2.ebuild
index 951e67950688..16f28dae7f17 100644
--- a/net-analyzer/metasploit/metasploit-2.3-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-2.3-r2.ebuild
@@ -1,19 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.3-r1.ebuild,v 1.1 2005/02/25 11:09:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.3-r2.ebuild,v 1.1 2005/04/27 12:01:41 ka0ttic Exp $
 
+MY_P="${P/metasploit/framework}"
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="The Metasploit Framework is an advanced open-source platform for developing, testing, and using vulnerability exploit code."
 HOMEPAGE="http://www.metasploit.org/"
-
-# Need to change the name
-MY_P=${P/metasploit/framework}
-
 SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
 
-S=${WORKDIR}/${MY_P}
-
 LICENSE="GPL-2 Artistic"
-
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
@@ -36,6 +31,7 @@ src_install() {
 	chown -R root:root ${D}
 
 	newinitd ${FILESDIR}/msfweb.initd msfweb || die "newinitd failed"
+	newconfd ${FILESDIR}/msfweb.confd msfweb || die "newconfd failed"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/metasploit/metasploit-2.3.ebuild b/net-analyzer/metasploit/metasploit-2.3.ebuild
deleted file mode 100644
index cf8bba07a6d5..000000000000
--- a/net-analyzer/metasploit/metasploit-2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.3.ebuild,v 1.2 2005/02/15 14:49:51 ka0ttic Exp $
-
-DESCRIPTION="The Metasploit Framework is an advanced open-source platform for developing, testing, and using vulnerability exploit code."
-HOMEPAGE="http://www.metasploit.org/"
-
-# Need to change the name
-MY_P=${P/metasploit/framework}
-
-SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2 Artistic"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	 dev-perl/Net-SSLeay
-	 dev-perl/Term-ReadLine-Perl
-	 dev-perl/TermReadKey"
-
-src_compile() {
-	einfo "Nothing to build, jumping to install..."
-}
-
-src_install() {
-	dodir /usr/lib/
-	dodir /usr/bin/
-
-	# should be as simple as copying everything into the target...
-	cp -a ${S} ${D}usr/lib/metasploit || die
-
-	# and creating symlinks in the /usr/bin dir
-	cd ${D}/usr/bin
-	ln -s ../lib/metasploit/msf* ./ || die
-	chown -R root:root ${D}
-}
-
-pkg_postinst() {
-	ewarn "You may wish to perform a metasploit update to get"
-	ewarn "the latest modules (e.g. run 'msfupdate -u')"
-}