metasploit: fixed depend on java for gui, added msfrpcd init script and config, added s/3// symlinks as requested by ZC for armitage

net-analyzer/metasploit/Manifest

@@ -1,5 +1,3 @@
-AUX msfweb.confd 273 RMD160 35c10406c74e431aa592c7af6d14f813ad18b984 SHA1 66cff0fe0423baa89ffdd3745b7195ae0f0bf273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460
-AUX msfweb.initd 533 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 SHA1 9b62d7d85af34430dda55a192460caae258ba978 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c
-AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
-AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec10c2c82925e6e731c46f8b0fcfa607b9502 SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066
-EBUILD metasploit-9999.ebuild 3402 RMD160 dce5c15e72aada76360f8619347c5e2c252e855e SHA1 13c46daba0e8f49b6f995c4e0e9ca4b474d8f987 SHA256 5828c7fb31e74a9fd1ec8ccece8045f05b27b60fe93eff407c5ad6285071dfc4
+AUX msfrpcd3.confd 440 RMD160 67e569204d77592e8b0e19d34d87c0c75a722687 SHA1 ff1eea41295270d0b5117ee233b5f5fe44a84834 SHA256 f1148f3f4fe24b2689d6a8f3d8510031f493100a5b48823c0a5bc2085a6439b4
+AUX msfrpcd3.initd 582 RMD160 61c44db9ef58ddae9fa3fd9fb8478cabd249fbbe SHA1 7e704bdfcc839e4348f6c7a16a364832d227e716 SHA256 1f47a6982fe6bed2f19e6e2bb0eb84cde0cb7ac7485c4344dcc152f0f19f4d25
+EBUILD metasploit-9999.ebuild 3341 RMD160 4c4cf3ca8227fc862c6d44be0a8fe19ee6289151 SHA1 b127bc3c5ab4a44cba86e571a6dc70579811ced7 SHA256 15a0f313d2fc7c26320319f314b8b217ede99ba427f8ac4076e3677570b7e1e1

net-analyzer/metasploit/files/msfrpcd3.confd

@@ -0,0 +1,19 @@
+# Config file for /etc/init.d/metasploit
+
+# 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=55553
+
+# Use the following username instead of msf
+USER="msf"
+
+# Use the following password instead of msf
+PASS="msf"
+
+# Change the server type to "Web" instead of "Basic"
+TYPE="Basic"
+
+# All options
+MSF_OPTS="-a $IPADDR -p $PORT -U $USER -P $PASS -t $TYPE"

net-analyzer/metasploit/files/msfrpcd3.initd

@@ -6,14 +6,14 @@
 PIDFILE=/var/run/msfweb3.pid
 
 start() {
-	ebegin "Starting msfweb3"
-	start-stop-daemon --start --quiet --background --startas /usr/bin/msfweb3 --exec /usr/bin/ruby \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
+	ebegin "Starting msfrcpd3"
+	start-stop-daemon --start --quiet --background --startas /usr/bin/msfrpcd3 --exec /usr/bin/ruby \
+		--pidfile ${PIDFILE} --make-pidfile -- -f ${MSF_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping msfweb"
+	ebegin "Stopping msfrpcd3"
 	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
 	eend $?
 }

net-analyzer/metasploit/files/msfweb.confd

@@ -1,13 +0,0 @@
-# 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"

net-analyzer/metasploit/files/msfweb.initd

@@ -1,18 +0,0 @@
-#!/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.3 2006/11/03 12:08:57 pva Exp $
-
-start() {
-	ebegin "Starting msfweb"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}

net-analyzer/metasploit/files/msfweb3.confd

@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# 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"

net-analyzer/metasploit/metasploit-9999.ebuild

@@ -19,13 +19,13 @@ HOMEPAGE="http://www.metasploit.org/"
 LICENSE="MSF-1.2"
 SLOT="3"
 KEYWORDS="amd64 arm ppc ~sparc x86"
-IUSE="gtk sqlite postgres"
+IUSE="X sqlite postgres"
 
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
 RDEPEND="dev-lang/ruby
 	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
+	X? ( virtual/jre )
 	sqlite? ( dev-ruby/sqlite3-ruby
 		dev-ruby/activerecord )
 	postgres? ( dev-ruby/ruby-postgres
@@ -35,9 +35,6 @@ DEPEND=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
 
 	# should be as simple as copying everything into the target...
 	dodir /usr/lib/${PN}${SLOT}
@@ -52,13 +49,14 @@ src_install() {
 	dodir /usr/bin/
 	for file in `ls msf*`; do
 		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
+		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}
 	done
 
 	chown -R root:0 "${D}"
 
-	newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
+	newinitd "${FILESDIR}"/msfrpcd${SLOT}.initd msfrpcd${SLOT} \
 		|| die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
+	newconfd "${FILESDIR}"/msfrpcd${SLOT}.confd msfrpcd${SLOT} \
 		|| die "newconfd failed"
 }