Hopefully fixed update problem, bug #195924. Now we use subversion eclass with it's features to allow users upgrade metasploit even if new revision is not available in portage ATM. Thank Erwin Paternotte, Jakub Moc, Anton Bolshakov, H D Moore, and Doug Klima for their input and help in fixing this bug.

(Portage version: 2.1.4.4)

4 files changed, 107 insertions, 5 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index c2b716d632d5..0f2713dc1867 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.27 2008/02/25 20:13:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.28 2008/03/01 17:00:00 pva Exp $
+
+*metasploit-3.1_p5422 (01 Mar 2008)
+
+  01 Mar 2008; <pva@gentoo.org> metasploit-2.7.ebuild,
+  metasploit-3.1.ebuild, +metasploit-3.1_p5422.ebuild:
+  Hopefully fixed update problem, bug #195924. Now we use subversion eclass
+  with it's features to allow users upgrade metasploit even if new revision is
+  not available in portage ATM. Thank Erwin Paternotte, Jakub Moc, Anton
+  Bolshakov, H D Moore, and Doug Klima for their input and help in fixing this
+  bug.
 
   25 Feb 2008; <pva@gentoo.org> -metasploit-3.0-r1.ebuild,
   metasploit-3.1.ebuild:
diff --git a/net-analyzer/metasploit/metasploit-2.7.ebuild b/net-analyzer/metasploit/metasploit-2.7.ebuild
index e916ad36b8e7..d96c8e918464 100644
--- a/net-analyzer/metasploit/metasploit-2.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-2.7.ebuild
@@ -1,10 +1,10 @@
 # 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.6 2008/01/30 15:39:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.7.ebuild,v 1.7 2008/03/01 17:00:00 pva 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."
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
 
diff --git a/net-analyzer/metasploit/metasploit-3.1.ebuild b/net-analyzer/metasploit/metasploit-3.1.ebuild
index e9e6b91df846..6538c8f183c2 100644
--- a/net-analyzer/metasploit/metasploit-3.1.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1.ebuild
@@ -1,11 +1,11 @@
 # 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.3 2008/02/25 20:13:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1.ebuild,v 1.4 2008/03/01 17:00:00 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."
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 SRC_URI="${MY_P}.tar.gz"
 
diff --git a/net-analyzer/metasploit/metasploit-3.1_p5422.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5422.ebuild
new file mode 100644
index 000000000000..d120158fbbbc
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-3.1_p5422.ebuild
@@ -0,0 +1,92 @@
+# 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_p5422.ebuild,v 1.1 2008/03/01 17:00:00 pva Exp $
+
+MY_P=${PN/metasploit/framework}-${PV}
+
+# Metasploit uses subversion as a *normal* update mechanism for stable branches
+# of the package. This ebuild uses _p<number> inside $PV to install updated up
+# to revision <number> version of framework. For more information, take a look
+# at bug #195924.
+if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then
+	inherit subversion
+	SRC_URI=""
+	MTSLPT_REV=${BASH_REMATCH[2]}
+	ESVN_REPO_URI="https://metasploit.com/svn/framework3/branches/framework-${PV%_p*}/@${MTSLPT_REV}"
+else
+	SRC_URI="http://sugar.metasploit.com/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+
+LICENSE="MSF-1.2"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~x86"
+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=""
+
+S=${WORKDIR}/${MY_P}
+
+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() {
+	if [[ "${SRC_URI}" != "" ]] ; then
+		# remove the subversion directories
+		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}
+	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/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/${PN}${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
+}
+
+pkg_postinst() {
+	if [[ "${SRC_URI}" == "" ]] ; then
+		elog "If you wish to update ${PN} manually simply run:"
+		elog
+		elog "ESVN_REVISION=<rev> emerge =${PF}"
+		elog
+		elog "where <rev> is either HEAD (in case you wish to get all updates)"
+		elog "or specific revision number. But NOTE, this update will vanish"
+		elog "next time you reemerge ${PN}. To make update permanent either"
+		elog "create ebuild with specific revision number inside your overlay"
+		elog "or report revision bump bug at http://bugs.gentoo.org ."
+	else
+		ewarn "${PN} version you installed is for testing purposes only"
+		ewarn "as it's impossible to update it. For day by day work use"
+		ewarn "different version."
+	fi
+}