Version bump.

(Portage version: 2.1.4_rc14)

7 files changed, 90 insertions, 56 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/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
+}