Version bump.

Package-Manager: portage-2.1.4_rc14

8 files changed, 110 insertions, 76 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index ead5e2c1feb4..fe4dcfdcf869 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.24 2007/10/13 18:14:55 cedk Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.25 2008/01/30 15:39:59 pva Exp $
+
+*metasploit-3.1 (30 Jan 2008)
+
+  30 Jan 2008; <pva@gentoo.org> -metasploit-2.6.ebuild,
+  metasploit-2.7.ebuild, metasploit-3.0-r1.ebuild, +metasploit-3.1.ebuild:
+  Version bump.
 
 *metasploit-3.0-r1 (13 Oct 2007)
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 67fb470d1f5d..c9d1e69fdfd8 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -18,35 +18,35 @@ AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec
 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
-SHA256 74715bbfcc80d25532006f027efe1e1fa419f6b102307e407462c1ecb69c4179 metasploit-2.6.ebuild 1235
-EBUILD metasploit-2.7.ebuild 1472 RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e91 SHA1 3a254470f6a0a1df49ebe70aee64758e1f44fffb SHA256 ff1a5e1e9961f7417452269912c8ef1415ed586130912fa20057d7161ccec79c
-MD5 e88b4a7f5a9dce15275846cd57ee6d26 metasploit-2.7.ebuild 1472
-RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e91 metasploit-2.7.ebuild 1472
-SHA256 ff1a5e1e9961f7417452269912c8ef1415ed586130912fa20057d7161ccec79c metasploit-2.7.ebuild 1472
-EBUILD metasploit-3.0-r1.ebuild 2041 RMD160 66063da60e5371a93fc40c95ba7e63282f7c40cc SHA1 6d994852fe53f8d432960a0d7afb0aff21eca1cd SHA256 a6945d112d0daf660081f6dd08f72e022d2774565501f77718b7df19d09f08c2
-MD5 36564bbf4a77049cd6c793ece5a26523 metasploit-3.0-r1.ebuild 2041
-RMD160 66063da60e5371a93fc40c95ba7e63282f7c40cc metasploit-3.0-r1.ebuild 2041
-SHA256 a6945d112d0daf660081f6dd08f72e022d2774565501f77718b7df19d09f08c2 metasploit-3.0-r1.ebuild 2041
-MISC ChangeLog 3891 RMD160 2864907134a7c56920444eed4d6f8529931d3f9f SHA1 6607b9d45b15df2cb8d6cd3940204fcf01931268 SHA256 aef402839ec0382da210e802a956a79b59df6fc99c57a7ccb67ac56c86da2eef
-MD5 c1deb447b79dc8e7cbaa26640d5afd93 ChangeLog 3891
-RMD160 2864907134a7c56920444eed4d6f8529931d3f9f ChangeLog 3891
-SHA256 aef402839ec0382da210e802a956a79b59df6fc99c57a7ccb67ac56c86da2eef ChangeLog 3891
+DIST framework-3.1.tar.gz 10076364 RMD160 19259b5a0e682ab4d92f19acc1cb4173d8eeca94 SHA1 af0036e53cffc1c82891a590bd8c0c22a06e3cc8 SHA256 dda9009180f2f6c72446afb6c8e1a755810698fee39e22d94bd033d712b69f84
+EBUILD metasploit-2.7.ebuild 1482 RMD160 457346969510a112badf03e25804eb7d46cec4fe SHA1 d8849660c1c8f4de4d6fcd482d2c0b2a00e7a0f3 SHA256 87a6a95dbb30921e3e45ea59625c2b80927e8ce3e66e2090989e6a0d903421a9
+MD5 2c0a9a86a6b049c6d5c48f933b483625 metasploit-2.7.ebuild 1482
+RMD160 457346969510a112badf03e25804eb7d46cec4fe metasploit-2.7.ebuild 1482
+SHA256 87a6a95dbb30921e3e45ea59625c2b80927e8ce3e66e2090989e6a0d903421a9 metasploit-2.7.ebuild 1482
+EBUILD metasploit-3.0-r1.ebuild 2041 RMD160 b72eaa1897d2bb87c662469d472f9a0a38071fe1 SHA1 dcf73d7cc73247888366f3b09f730aa30a2de4ca SHA256 6d602f7067d0219eb1231c1231a154e6bb664879920935c73b5902833a79a919
+MD5 12789d921a33196f6910d4db3b88d845 metasploit-3.0-r1.ebuild 2041
+RMD160 b72eaa1897d2bb87c662469d472f9a0a38071fe1 metasploit-3.0-r1.ebuild 2041
+SHA256 6d602f7067d0219eb1231c1231a154e6bb664879920935c73b5902833a79a919 metasploit-3.0-r1.ebuild 2041
+EBUILD metasploit-3.1.ebuild 2092 RMD160 fe2a1d610d775c4c711de05de2825a152ed0dc28 SHA1 bcf5d96315b8b90234da60bb847fc12f06e0b559 SHA256 d50c88a097f974814dc1d2f8e1efb2674834e6da6b63bb1fd1341d33068decce
+MD5 1b517bba7d188a36eeebcd6b9ccac6af metasploit-3.1.ebuild 2092
+RMD160 fe2a1d610d775c4c711de05de2825a152ed0dc28 metasploit-3.1.ebuild 2092
+SHA256 d50c88a097f974814dc1d2f8e1efb2674834e6da6b63bb1fd1341d33068decce metasploit-3.1.ebuild 2092
+MISC ChangeLog 4069 RMD160 d024607d5849f80c67bc3f99a82de887cb4c978e SHA1 ef2c299286d7f741aa8e2ef66ea36264dd2544cd SHA256 b89b4b3e82513f10bd0b28a88e445039ca876abb12d50bedb8c6a9ada5a83fa7
+MD5 69e8fc14f32f5a8dd8bea0a84aa972b9 ChangeLog 4069
+RMD160 d024607d5849f80c67bc3f99a82de887cb4c978e ChangeLog 4069
+SHA256 b89b4b3e82513f10bd0b28a88e445039ca876abb12d50bedb8c6a9ada5a83fa7 ChangeLog 4069
 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff
 MD5 32fd2dcb7d7b4a24b516c147baa8fad1 metadata.xml 863
 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae metadata.xml 863
 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff metadata.xml 863
-MD5 21567e109cbe18abffee13913643bd51 files/digest-metasploit-2.6 244
-RMD160 b156c2233872fea0a61d66c69203770d40e86d0f files/digest-metasploit-2.6 244
-SHA256 16ca70ef91db1a0bb04dcc7a51c94e10462b6b83d766525e3db4d4b5dfc04a40 files/digest-metasploit-2.6 244
 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-r1 244
 RMD160 dbb337ceeeea5f7f9c8ac912bb517d55bf176494 files/digest-metasploit-3.0-r1 244
 SHA256 4a67cccb133701a8c146e6bc40c3f3e33b3fc18878d9ec3855e782eeeb721187 files/digest-metasploit-3.0-r1 244
+MD5 31c1aab6045e057cce08021daccae97d files/digest-metasploit-3.1 247
+RMD160 f564d5b0e37c5fa5227db37fc1b31871e984445d files/digest-metasploit-3.1 247
+SHA256 8589ba221867889c8a5480e35dc2b25274b20307a8d971f3a6d6e79aa5c54ec7 files/digest-metasploit-3.1 247
diff --git a/net-analyzer/metasploit/files/digest-metasploit-2.6 b/net-analyzer/metasploit/files/digest-metasploit-2.6
deleted file mode 100644
index 7f81e79c6d21..000000000000
--- a/net-analyzer/metasploit/files/digest-metasploit-2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fea4047b477c1a9c9fb1ad4acda65610 framework-2.6.tar.gz 2782676
-RMD160 4f66bbe759d5ffa2c193a69c2bc0f27291b84b68 framework-2.6.tar.gz 2782676
-SHA256 4096fcc8828e35b33d3bbf5ee48213a79dae9cc7c96745443229d41940649449 framework-2.6.tar.gz 2782676
diff --git a/net-analyzer/metasploit/files/digest-metasploit-3.1 b/net-analyzer/metasploit/files/digest-metasploit-3.1
new file mode 100644
index 000000000000..7065bd843acd
--- /dev/null
+++ b/net-analyzer/metasploit/files/digest-metasploit-3.1
@@ -0,0 +1,3 @@
+MD5 5858d5af28933dcc22a0e22831c2f511 framework-3.1.tar.gz 10076364
+RMD160 19259b5a0e682ab4d92f19acc1cb4173d8eeca94 framework-3.1.tar.gz 10076364
+SHA256 dda9009180f2f6c72446afb6c8e1a755810698fee39e22d94bd033d712b69f84 framework-3.1.tar.gz 10076364
diff --git a/net-analyzer/metasploit/metasploit-2.6.ebuild b/net-analyzer/metasploit/metasploit-2.6.ebuild
deleted file mode 100644
index 7eee29795f00..000000000000
--- a/net-analyzer/metasploit/metasploit-2.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.6.ebuild,v 1.4 2006/11/11 17:30:16 malc 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/"
-SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	 dev-perl/Net-SSLeay
-	 dev-perl/Term-ReadLine-Perl
-	 dev-perl/TermReadKey"
-
-src_install() {
-	dodir /usr/lib/
-	dodir /usr/bin/
-
-	# should be as simple as copying everything into the target...
-	cp -pPR ${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:0 ${D}
-
-	newinitd ${FILESDIR}/msfweb.initd msfweb || die "newinitd failed"
-	newconfd ${FILESDIR}/msfweb.confd msfweb || die "newconfd failed"
-}
-
-pkg_postinst() {
-	ewarn "You may wish to perform a metasploit update to get"
-	ewarn "the latest modules (e.g. run 'msfupdate -u')"
-}
diff --git a/net-analyzer/metasploit/metasploit-2.7.ebuild b/net-analyzer/metasploit/metasploit-2.7.ebuild
index 67b475c96f8a..e916ad36b8e7 100644
--- a/net-analyzer/metasploit/metasploit-2.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.7.ebuild,v 1.5 2007/02/07 20:44:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.7.ebuild,v 1.6 2008/01/30 15:39:59 pva Exp $
 
 MY_P="${P/metasploit/framework}"
 S="${WORKDIR}/${MY_P}"
@@ -23,15 +23,15 @@ src_install() {
 	dodir /usr/bin/
 
 	# should be as simple as copying everything into the target...
-	cp -pPR ${S} ${D}usr/lib/metasploit || die
+	cp -pPR "${S}" "${D}"usr/lib/metasploit || die
 
 	# and creating symlinks in the /usr/bin dir
-	cd ${D}/usr/bin
+	cd "${D}"/usr/bin
 	ln -s ../lib/metasploit/msf* ./ || die
-	chown -R root:0 ${D}
+	chown -R root:0 "${D}"
 
-	newinitd ${FILESDIR}/msfweb.initd msfweb || die "newinitd failed"
-	newconfd ${FILESDIR}/msfweb.confd msfweb || die "newconfd failed"
+	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-3.0-r1.ebuild b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
index e1869a45aa5d..22a4125d73be 100644
--- a/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0-r1.ebuild,v 1.1 2007/10/13 18:14:55 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0-r1.ebuild,v 1.2 2008/01/30 15:39:59 pva Exp $
 
 inherit eutils
 
@@ -48,7 +48,7 @@ src_install() {
 	dodir /usr/bin/
 
 	# remove the subversion directories
-	find ${S} -type d -name ".svn" | xargs rm -R
+	find "${S}" -type d -name ".svn" | xargs rm -R
 
 	# should be as simple as copying everything into the target...
 	dodir /usr/lib/metasploit${SLOT}
@@ -59,7 +59,7 @@ src_install() {
 		dosym /usr/lib/metasploit${SLOT}/${file} /usr/bin/${file}${SLOT}
 	done
 
-	chown -R root:root ${D}
+	chown -R root:0 "${D}"
 
 	if use httpd; then
 		newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
diff --git a/net-analyzer/metasploit/metasploit-3.1.ebuild b/net-analyzer/metasploit/metasploit-3.1.ebuild
new file mode 100644
index 000000000000..afdcf2e239aa
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1.ebuild,v 1.1 2008/01/30 15:39:59 pva Exp $
+
+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* )
+	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() {
+	sed -i \
+		-e "s/RAILS_GEM_VERSION = '1.2.2'/RAILS_GEM_VERSION = '1.2'/" \
+		data/msfweb/config/environment.rb || die "sed failed"
+}
+
+src_install() {
+	# 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
+
+	rm "${S}"/documentation/LICENSE
+	dodir /usr/share/doc/${PF}
+	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
+
+	dodir /usr/bin/
+	for file in `ls msf*`; do
+		dosym /usr/lib/metasploit${SLOT}/${file} /usr/bin/${file}${SLOT}
+	done
+
+	chown -R root:0 "${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
+}