Fixed other typos in postinstall, thank Anton Bolshakov for report in bug #214380. Removed unused versions from 3.0 branch.

(Portage version: 2.1.4.4)

6 files changed, 10 insertions, 383 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 45c87aeb2d97..84479c597e9b 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2008/03/24 16:08:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.34 2008/03/26 10:32:49 pva Exp $
+
+  26 Mar 2008; Peter Volkov <pva@gentoo.org> -files/metasploit-3.0.patch,
+  -metasploit-3.1.ebuild, -metasploit-3.1_p5422.ebuild,
+  -metasploit-3.1_p5435.ebuild, metasploit-3.1_p5456.ebuild:
+  Fixed other typos in postinstall, thank Anton Bolshakov for report in bug
+  #214380. Removed unused versions from 3.0 branch.
 
   24 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   metasploit-3.1_p5456.ebuild:
diff --git a/net-analyzer/metasploit/files/metasploit-3.0.patch b/net-analyzer/metasploit/files/metasploit-3.0.patch
deleted file mode 100644
index 916c46d5a50d..000000000000
--- a/net-analyzer/metasploit/files/metasploit-3.0.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-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/metasploit-3.1.ebuild b/net-analyzer/metasploit/metasploit-3.1.ebuild
deleted file mode 100644
index 6538c8f183c2..000000000000
--- a/net-analyzer/metasploit/metasploit-3.1.ebuild
+++ /dev/null
@@ -1,68 +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.1.ebuild,v 1.4 2008/03/01 17:00:00 pva Exp $
-
-MY_P=${PN/metasploit/framework}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Advanced open-source framework 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/framework/downloader/?id=${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}"/usr/lib/metasploit${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/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_p5422.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5422.ebuild
deleted file mode 100644
index 043824d99978..000000000000
--- a/net-analyzer/metasploit/metasploit-3.1_p5422.ebuild
+++ /dev/null
@@ -1,102 +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.1_p5422.ebuild,v 1.2 2008/03/01 17:34:45 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 ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir /etc/portage/env/${CATEGORY}"
-		elog ' # echo "ESVN_REVISION=HEAD" >> /etc/portage/env/${CATEGORY}/${PN}'
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	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
-}
diff --git a/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild
deleted file mode 100644
index bc395e0cee61..000000000000
--- a/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild
+++ /dev/null
@@ -1,102 +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.1_p5435.ebuild,v 1.1 2008/03/07 12:44:15 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 ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir /etc/portage/env/${CATEGORY}"
-		elog ' # echo "ESVN_REVISION=HEAD" >> /etc/portage/env/${CATEGORY}/${PN}'
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	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
-}
diff --git a/net-analyzer/metasploit/metasploit-3.1_p5456.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5456.ebuild
index 34a581d70780..d8067cc38ae3 100644
--- a/net-analyzer/metasploit/metasploit-3.1_p5456.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1_p5456.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_p5456.ebuild,v 1.2 2008/03/24 16:08:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5456.ebuild,v 1.3 2008/03/26 10:32:49 pva Exp $
 
 MY_P=${PN/metasploit/framework}-${PV}
 
@@ -89,8 +89,8 @@ pkg_postinst() {
 		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
 		elog "content. Then each time you run emerge ${PN} you'll have said"
 		elog "<rev> installed. For example, if you run"
-		elog " # mkdir /etc/portage/env/${CATEGORY}"
-		elog ' # echo "ESVN_REVISION=HEAD" >> /etc/portage/env/${CATEGORY}/${PN}'
+		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
+		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
 		elog "each time you reemerge ${PN} it'll be updated to get all possible"
 		elog "updates for framework-${PV%_p*} branch."
 		elog "You can do similar things in paludis using /etc/paludis/bashrc."