Version bump with new slot for bug #142778

Package-Manager: portage-2.1.2.12

7 files changed, 236 insertions, 5 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index acd5ab8952d8..68f5eeacc33b 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.22 2007/02/07 20:44:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.23 2007/09/09 11:56:20 cedk Exp $
+
+*metasploit-3.0 (09 Sep 2007)
+
+  09 Sep 2007; Cédric Krier <cedk@gentoo.org> +files/msfweb3.confd,
+  +files/metasploit-3.0.patch, +files/msfweb3.initd, +metasploit-3.0.ebuild:
+  Version bump with new slot for bug #142778
 
   07 Feb 2007; Simon Stelling <blubb@gentoo.org> metasploit-2.7.ebuild:
   stable on amd64; bug 164246
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 4695eb9db3f4..8377c9a74f99 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,7 @@
+AUX metasploit-3.0.patch 4135 RMD160 e8c529da32014b15c6ce670a4437d93fcacdb4e9 SHA1 3776fd1eac5521b21f73a09eea679d49e9ca0148 SHA256 2c784d202cc3786cdd18c3704de267f9573a0a353f7111e99310f6b0e75b3452
+MD5 e870e20a9ae5ba7a2315ce8d55a40435 files/metasploit-3.0.patch 4135
+RMD160 e8c529da32014b15c6ce670a4437d93fcacdb4e9 files/metasploit-3.0.patch 4135
+SHA256 2c784d202cc3786cdd18c3704de267f9573a0a353f7111e99310f6b0e75b3452 files/metasploit-3.0.patch 4135
 AUX msfweb.confd 273 RMD160 35c10406c74e431aa592c7af6d14f813ad18b984 SHA1 66cff0fe0423baa89ffdd3745b7195ae0f0bf273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460
 MD5 60ed26ce3c2cba88b12d53ffe7b7d4c8 files/msfweb.confd 273
 RMD160 35c10406c74e431aa592c7af6d14f813ad18b984 files/msfweb.confd 273
@@ -6,8 +10,17 @@ AUX msfweb.initd 533 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 SHA1 9b62d7
 MD5 1a330a1e8f1a334d3178ae71a68f0a35 files/msfweb.initd 533
 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 files/msfweb.initd 533
 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c files/msfweb.initd 533
+AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
+MD5 b4f2f555f44045100a153920b1a0f4d0 files/msfweb3.confd 234
+RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 files/msfweb3.confd 234
+SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f files/msfweb3.confd 234
+AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec10c2c82925e6e731c46f8b0fcfa607b9502 SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066
+MD5 5dbb0bec918dbc34296f8593be453288 files/msfweb3.initd 578
+RMD160 47baabd2beb338fd8a067694830400801a028c1a files/msfweb3.initd 578
+SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066 files/msfweb3.initd 578
 DIST framework-2.6.tar.gz 2782676 RMD160 4f66bbe759d5ffa2c193a69c2bc0f27291b84b68 SHA1 f7dd2dc9384d5e681d837f85bf86f0c02a78c82b SHA256 4096fcc8828e35b33d3bbf5ee48213a79dae9cc7c96745443229d41940649449
 DIST framework-2.7.tar.gz 5800216 RMD160 cfdf2705522c845bb4405413207a7df0f3873b94 SHA1 da5d41dfa13e549aacd4fbf2994877cbe80ceed9 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f
+DIST framework-3.0.tar.gz 5519218 RMD160 849305ffcf0ccbdf16d3dac8d7ab20ac745fbcd8 SHA1 e6636cb5849f2403c8b6a8812205f4a249d63df3 SHA256 cb27df6dafe7b2d1c2d2174000afd07965cdc09e759e8cda5147cfc58e445251
 EBUILD metasploit-2.6.ebuild 1235 RMD160 cff14f7c0cf04fe2fa5ef59cb6f6d8ed78fca75f SHA1 2143757b2be46e0b83ec74681f0501c0654d9429 SHA256 74715bbfcc80d25532006f027efe1e1fa419f6b102307e407462c1ecb69c4179
 MD5 55398d587545850c539c158cd86ef4b6 metasploit-2.6.ebuild 1235
 RMD160 cff14f7c0cf04fe2fa5ef59cb6f6d8ed78fca75f metasploit-2.6.ebuild 1235
@@ -16,10 +29,14 @@ EBUILD metasploit-2.7.ebuild 1472 RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e9
 MD5 e88b4a7f5a9dce15275846cd57ee6d26 metasploit-2.7.ebuild 1472
 RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e91 metasploit-2.7.ebuild 1472
 SHA256 ff1a5e1e9961f7417452269912c8ef1415ed586130912fa20057d7161ccec79c metasploit-2.7.ebuild 1472
-MISC ChangeLog 3498 RMD160 74ef83e18caea5beeb88e9e31eaf79b1652efe10 SHA1 b3bab188eb39259f97b78e2e13cab52a6eb71b6a SHA256 0f89e7814596b43fb9a35a4aaeae484e528cf2936b8fea1a88d36f5e53948c32
-MD5 c2add0ee2e0a47abdbd11f2b2328a661 ChangeLog 3498
-RMD160 74ef83e18caea5beeb88e9e31eaf79b1652efe10 ChangeLog 3498
-SHA256 0f89e7814596b43fb9a35a4aaeae484e528cf2936b8fea1a88d36f5e53948c32 ChangeLog 3498
+EBUILD metasploit-3.0.ebuild 1907 RMD160 b26772520af783399f47a37b918a56b7196a8a9d SHA1 cc46e255ff3da4edc22211b9f6f630c158d2d5c6 SHA256 342bcda5c41654e825f40c556b123a29233afcc310a82fe1e4664ff61a128790
+MD5 b15743628151797102aaba276951adac metasploit-3.0.ebuild 1907
+RMD160 b26772520af783399f47a37b918a56b7196a8a9d metasploit-3.0.ebuild 1907
+SHA256 342bcda5c41654e825f40c556b123a29233afcc310a82fe1e4664ff61a128790 metasploit-3.0.ebuild 1907
+MISC ChangeLog 3720 RMD160 bf55da4bf7d2d91fcdd36709cc8d9044bc38c606 SHA1 b4121a3520f304e5fbd46f3cb2e4689ef737dbcd SHA256 4632ecee6c5008feb8ae09e2ecf3038d76008c6ae359731e6dbc25c8c06dffcf
+MD5 172225c327245b7e92d4b2f40d015b7f ChangeLog 3720
+RMD160 bf55da4bf7d2d91fcdd36709cc8d9044bc38c606 ChangeLog 3720
+SHA256 4632ecee6c5008feb8ae09e2ecf3038d76008c6ae359731e6dbc25c8c06dffcf ChangeLog 3720
 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff
 MD5 32fd2dcb7d7b4a24b516c147baa8fad1 metadata.xml 863
 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae metadata.xml 863
@@ -30,3 +47,6 @@ SHA256 16ca70ef91db1a0bb04dcc7a51c94e10462b6b83d766525e3db4d4b5dfc04a40 files/di
 MD5 5d9bacc28567b0a9ac4f1a823a26c5cc files/digest-metasploit-2.7 244
 RMD160 7e814aa610bd7730639f47ad8e0ef13309206765 files/digest-metasploit-2.7 244
 SHA256 85db40abb4b52be5718d20333bbb4f77e80be41b7ab1549634c3cd2ddc8fb627 files/digest-metasploit-2.7 244
+MD5 d07a8d060f6423ce8932456303686d50 files/digest-metasploit-3.0 244
+RMD160 dbb337ceeeea5f7f9c8ac912bb517d55bf176494 files/digest-metasploit-3.0 244
+SHA256 4a67cccb133701a8c146e6bc40c3f3e33b3fc18878d9ec3855e782eeeb721187 files/digest-metasploit-3.0 244
diff --git a/net-analyzer/metasploit/files/digest-metasploit-3.0 b/net-analyzer/metasploit/files/digest-metasploit-3.0
new file mode 100644
index 000000000000..2a55a2bd25a4
--- /dev/null
+++ b/net-analyzer/metasploit/files/digest-metasploit-3.0
@@ -0,0 +1,3 @@
+MD5 ab98f0a09b371f9638c7f49f1b83f5c4 framework-3.0.tar.gz 5519218
+RMD160 849305ffcf0ccbdf16d3dac8d7ab20ac745fbcd8 framework-3.0.tar.gz 5519218
+SHA256 cb27df6dafe7b2d1c2d2174000afd07965cdc09e759e8cda5147cfc58e445251 framework-3.0.tar.gz 5519218
diff --git a/net-analyzer/metasploit/files/metasploit-3.0.patch b/net-analyzer/metasploit/files/metasploit-3.0.patch
new file mode 100644
index 000000000000..916c46d5a50d
--- /dev/null
+++ b/net-analyzer/metasploit/files/metasploit-3.0.patch
@@ -0,0 +1,107 @@
+diff -u orig/msfcli ./msfcli
+--- orig/msfcli	2007-03-29 14:06:12.000000000 +0530
++++ ./msfcli	2007-03-29 14:08:23.000000000 +0530
+@@ -5,7 +5,7 @@
+ # or web-based interface.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex'
+diff -u orig/msfconsole ./msfconsole
+--- orig/msfconsole	2007-03-29 14:06:07.000000000 +0530
++++ ./msfconsole	2007-03-29 14:08:42.000000000 +0530
+@@ -4,7 +4,7 @@
+ # framework.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex'
+diff -u orig/msfd ./msfd
+--- orig/msfd	2007-03-29 14:06:01.000000000 +0530
++++ ./msfd	2007-03-29 14:08:55.000000000 +0530
+@@ -6,8 +6,8 @@
+ # possible for sessions to to be shared from a single vantage point.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+-$:.unshift(File.join(File.dirname(msfbase), 'lib'))
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
++$:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'msf/base'
+ require 'msf/ui'
+diff -u orig/msfencode ./msfencode
+--- orig/msfencode	2007-03-29 14:05:56.000000000 +0530
++++ ./msfencode	2007-03-29 14:09:16.000000000 +0530
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex'
+diff -u orig/msfgui ./msfgui
+--- orig/msfgui	2007-03-29 14:05:51.000000000 +0530
++++ ./msfgui	2007-03-29 14:09:28.000000000 +0530
+@@ -3,7 +3,7 @@
+ # This is a basic user interface using the Gtk2 GUI library
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ 
+diff -u orig/msfopcode ./msfopcode
+--- orig/msfopcode	2007-03-29 14:05:43.000000000 +0530
++++ ./msfopcode	2007-03-29 14:09:39.000000000 +0530
+@@ -5,7 +5,7 @@
+ # and to display information about modules.
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex'
+diff -u orig/msfpayload ./msfpayload
+--- orig/msfpayload	2007-03-29 14:05:37.000000000 +0530
++++ ./msfpayload	2007-03-29 14:09:53.000000000 +0530
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex'
+diff -u orig/msfpescan ./msfpescan
+--- orig/msfpescan	2007-03-29 14:05:26.000000000 +0530
++++ ./msfpescan	2007-03-29 14:10:02.000000000 +0530
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ require 'rex/peparsey'
+diff -u orig/msfweb ./msfweb
+--- orig/msfweb	2007-03-29 14:05:20.000000000 +0530
++++ ./msfweb	2007-03-29 14:10:13.000000000 +0530
+@@ -3,7 +3,7 @@
+ # This user interface provides users with a web-based interface to the framework
+ #
+ 
+-msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
++msfbase = File.symlink?(__FILE__) ? File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__)) : __FILE__
+ $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+ 
+ 
diff --git a/net-analyzer/metasploit/files/msfweb3.confd b/net-analyzer/metasploit/files/msfweb3.confd
new file mode 100644
index 000000000000..b0cf87e6dfaf
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfweb3.confd
@@ -0,0 +1,10 @@
+# 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"
diff --git a/net-analyzer/metasploit/files/msfweb3.initd b/net-analyzer/metasploit/files/msfweb3.initd
new file mode 100644
index 000000000000..67cba7696014
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfweb3.initd
@@ -0,0 +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/msfweb3.initd,v 1.1 2007/09/09 11:56:21 cedk Exp $
+
+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}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping msfweb"
+	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/metasploit/metasploit-3.0.ebuild b/net-analyzer/metasploit/metasploit-3.0.ebuild
new file mode 100644
index 000000000000..2b9a8fc627a6
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-3.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0.ebuild,v 1.1 2007/09/09 11:56:20 cedk Exp $
+
+inherit eutils
+
+MY_P="${PN/metasploit/framework}-${PV}"
+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/"
+SRC_URI="${MY_P}.tar.gz"
+
+LICENSE="MSF-1.2"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="fetch"
+IUSE="gtk sqlite sqlite3 postgres httpd"
+
+RDEPEND="dev-lang/ruby
+	gtk? ( dev-ruby/ruby-libglade2 )
+	httpd? ( =dev-ruby/rails-1.2.2* )
+	sqlite? ( dev-ruby/sqlite-ruby
+		dev-ruby/activerecord )
+	sqlite3? ( dev-ruby/sqlite3-ruby
+		 dev-ruby/activerecord )
+	postgres? ( dev-ruby/ruby-postgres
+		dev-ruby/activerecord )"
+DEPEND=""
+
+pkg_nofetch() {
+	# Fetch restricted due to license acceptation
+	einfo "Please download the framework from:"
+	einfo "http://metasploit.com/projects/Framework/msf3/download.html?Release=${MY_P}.tar.gz"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_compile() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_install() {
+	dodir /usr/lib/
+	dodir /usr/bin/
+
+	# remove the subversion directories
+	find ${S} -type d -name ".svn" | xargs rm -R
+
+	# should be as simple as copying everything into the target...
+	dodir /usr/lib/metasploit${SLOT}
+	cp -R "${S}"/* "${D}"/usr/lib/metasploit${SLOT} || die "Copy files failed"
+	rm -Rf "${D}"/usr/lib/metasploit${SLOT}/documentation "${D}"/README
+
+	for file in `ls msf*`; do
+		dosym /usr/lib/metasploit${SLOT}/${file} /usr/bin/${file}${SLOT}
+	done
+
+	chown -R root:root ${D}
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
+			|| die "newinitd failed"
+		newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
+			|| die "newconfd failed"
+	fi
+}