Updated fetch URI, bug 211428. Thank Muelli for report. Removed unused.

Package-Manager: portage-2.1.4.4

4 files changed, 9 insertions, 77 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index f7711ec24494..c2b716d632d5 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2008/02/25 16:10:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.27 2008/02/25 20:13:58 pva Exp $
+
+  25 Feb 2008; <pva@gentoo.org> -metasploit-3.0-r1.ebuild,
+  metasploit-3.1.ebuild:
+  Updated fetch URI, bug 211428. Thank Muelli for report. Removed unused.
 
   25 Feb 2008; <pva@gentoo.org> metasploit-3.1.ebuild:
   Fixed typo, thank Anton Bolshakov for report in bug #142778.
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index ab46458f406a..daec87d4d0b2 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -4,10 +4,8 @@ AUX msfweb.initd 533 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 SHA1 9b62d7
 AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
 AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec10c2c82925e6e731c46f8b0fcfa607b9502 SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066
 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
 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
-EBUILD metasploit-3.0-r1.ebuild 2041 RMD160 b72eaa1897d2bb87c662469d472f9a0a38071fe1 SHA1 dcf73d7cc73247888366f3b09f730aa30a2de4ca SHA256 6d602f7067d0219eb1231c1231a154e6bb664879920935c73b5902833a79a919
-EBUILD metasploit-3.1.ebuild 2118 RMD160 c43d6ea99bc27e9440efcbd9023ae6269f3e2a3b SHA1 ca6e2dfacf4ee0d766b89cafcabfec455a08b954 SHA256 f354af7533d5ceed3ed8174a3c76c5c44bbdcda6630bbe0c2265d325b4af574f
-MISC ChangeLog 4188 RMD160 07744f3cba25dfd1265e461292c1d79ba613b775 SHA1 72040915348004e4c38a7532df6b6e42439e8862 SHA256 9eb0cd7fefba3abb0e5ad550ff0e1505a7337d41964ca64e73985cc2ad052e2c
+EBUILD metasploit-3.1.ebuild 2097 RMD160 bae8465b2c2fbd07371b1e44b60e5a5e1e47189b SHA1 eceed9c6398c3d7a02dc108ddce442320237dbcd SHA256 3708d0ab1c93de5df4bb4a0a454b27314a00fb6c37fecf0a1913ff018cd5b7cc
+MISC ChangeLog 4347 RMD160 bb430accff2e213c2daf773ca824e6c5646d9c51 SHA1 df214a65909ea9a34a829c95e93a7d8d3fc187b1 SHA256 1d1cd60f869a1e2cd8f2a4463dfa73bcb20a2a18e78553b6bef752fecb37f506
 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff
diff --git a/net-analyzer/metasploit/metasploit-3.0-r1.ebuild b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
deleted file mode 100644
index 22a4125d73be..000000000000
--- a/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.2 2008/01/30 15:39:59 pva 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* )
-	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
-
-	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() {
-	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: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
-}
diff --git a/net-analyzer/metasploit/metasploit-3.1.ebuild b/net-analyzer/metasploit/metasploit-3.1.ebuild
index 4c10925e89dc..e9e6b91df846 100644
--- a/net-analyzer/metasploit/metasploit-3.1.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/02/25 16:10:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1.ebuild,v 1.3 2008/02/25 20:13:58 pva Exp $
 
 MY_P=${PN/metasploit/framework}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ 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 "http://metasploit.com/framework/downloader/?id=${MY_P}.tar.gz"
 	einfo "and move it to ${DISTDIR}"
 }