Bump to 3.3.3, fixes #277405 #282501 #296157

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

5 files changed, 51 insertions, 28 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index cef98e32a40e..44a1c9f352b9 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/metasploit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.48 2009/09/26 23:05:40 a3li Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.49 2010/03/01 12:52:52 patrick Exp $
+
+*metasploit-3.3.3 (01 Mar 2010)
+
+  01 Mar 2010; Patrick Lauer <patrick@gentoo.org> +files/msfweb3.3.confd,
+  -metasploit-3.2_p6750.ebuild, +files/msfweb3.3.initd,
+  +metasploit-3.3.3.ebuild:
+  Bump to 3.3.3, fixes #277405 #282501 #296157
 
   26 Sep 2009; Alex Legler <a3li@gentoo.org>
   -metasploit-3.1_p5699-r1.ebuild:
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 0702663c421d..fe9d7fc5e41f 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -2,10 +2,13 @@ AUX msfweb.confd 273 RMD160 35c10406c74e431aa592c7af6d14f813ad18b984 SHA1 66cff0
 AUX msfweb.initd 533 RMD160 44f94381ae9488fb2e3c6f700458798b692971d7 SHA1 9b62d7d85af34430dda55a192460caae258ba978 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c
 AUX msfweb3.2.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
 AUX msfweb3.2.initd 669 RMD160 5ea0c279431c025124c3510312cc93bac721bd89 SHA1 5eef0caeef14076e49898d9ba653d27a4a79bb8d SHA256 8b1fe3211fc7e53da546cc58114f02968e54d4565d6c661e8b6651a1efe66db6
+AUX msfweb3.3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
+AUX msfweb3.3.initd 673 RMD160 b50f2ae6759f51b39d90431045b8a99459aa5ce9 SHA1 e910a022e658c6077474f9c8c2c8f9b6210511cc SHA256 a2d063bbcea8d5e4b5a1a5f62f57696d8ad8c62d1608cbc02a8585c1cd15e19c
 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.3.3.tar.bz2 23438382 RMD160 7af61daff176cbbe6455abecefe8323acf561238 SHA1 6c6e257f21ad55328e45fbc04020c3c2a9ca9b78 SHA256 a650778f7946a7f113acd716023978fd94f01325e9a4cf6342fb00ba3f6a2c0b
 EBUILD metasploit-2.7.ebuild 1451 RMD160 86b02866587de2829a1905ab274cbe4abdd41991 SHA1 e7cc8fb826d55a9be1125dd63ea16798dea1c393 SHA256 fc61998068bf093cf4a68f1563130bed0c1c05c6db7fee51669e49de9460cc96
-EBUILD metasploit-3.2_p6750.ebuild 3594 RMD160 50b82b99a608897317ae8b9284f080758e6939ca SHA1 ce5d9ff0ba668d1834e3c9df34e870cf7b73cb59 SHA256 d51a6c1707fff23a5a39f8e120fd2e6486ebf084abd64e32e8aee468818d36ef
-MISC ChangeLog 8305 RMD160 5eeba591cba9075e5441624fcf4a7cbaa4613457 SHA1 f1a2e2c11b3676008b0a5e237d7d993f40529ce8 SHA256 6b8e9a889084f8ec027eac255bd02121e8bf67f1279122f2dd2b6d7fc0af3d61
+EBUILD metasploit-3.3.3.ebuild 2919 RMD160 69d867f0c6e7448da1953fe157a28d57718e8235 SHA1 a7344a0baa68cd6a8717b94ef998066f90158e17 SHA256 d65d28b77e8326f9fde85225bef7f7a37e2327fd3f69075653bd13b440e3711b
+MISC ChangeLog 8547 RMD160 b74a10e60cef48c674ae0149e95074e43e385b2c SHA1 cb4bcd044f3ca8b69eb3565b398139ec6fa13559 SHA256 8a88fe3e88b218efa3a687374a6b7f878ae19729ecb70e28ccf9d2e2d4a718c8
 MISC metadata.xml 864 RMD160 0843a578171a49e091f29d1b1c700bf45df48961 SHA1 024eeb7d6cf06fac61952e51af1e17f091e26e46 SHA256 8af2db5b683a4de1f16cf076ba1baa9ffc1c04897ca5c0f8c9e47ad64e85f0f7
diff --git a/net-analyzer/metasploit/files/msfweb3.3.confd b/net-analyzer/metasploit/files/msfweb3.3.confd
new file mode 100644
index 000000000000..b0cf87e6dfaf
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfweb3.3.confd
@@ -0,0 +1,10 @@
+# Config file for /etc/init.d/metasploit
+
+# Bind to the following IP instead of the loopback address
+IPADDR=127.0.0.1
+
+# Bind to the following TCP port instead of default 55555
+PORT=55555
+
+# All options
+MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.3.initd b/net-analyzer/metasploit/files/msfweb3.3.initd
new file mode 100644
index 000000000000..430fc65ba7c1
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfweb3.3.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.3.initd,v 1.1 2010/03/01 12:52:51 patrick Exp $
+
+PIDFILE=/var/run/msfweb3.3.pid
+
+start() {
+	ebegin "Starting msfweb3.3"
+	start-stop-daemon --start --quiet --background --startas msfweb3.3 --exec /usr/lib/metasploit3.3/msfweb \
+		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
+	eend $?
+	einfo "Note: msfweb3.3 is started but needs some before it serves clients."
+}
+
+stop() {
+	ebegin "Stopping msfweb"
+	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/metasploit/metasploit-3.2_p6750.ebuild b/net-analyzer/metasploit/metasploit-3.3.3.ebuild
index 0d30625f787e..d3c6c44e79e6 100644
--- a/net-analyzer/metasploit/metasploit-3.2_p6750.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.3.3.ebuild
@@ -1,28 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.2_p6750.ebuild,v 1.4 2009/09/26 22:56:04 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.3.3.ebuild,v 1.1 2010/03/01 12:52:52 patrick 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
+SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
 
 DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 
 LICENSE="BSD"
-SLOT="3.2"
-KEYWORDS="amd64 ppc ~sparc x86"
+SLOT="3.3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gtk sqlite postgres"
 
 # Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
@@ -36,7 +23,7 @@ RDEPEND="dev-lang/ruby
 		dev-ruby/activerecord )"
 DEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/msf3
 
 src_install() {
 	if [[ "${SRC_URI}" != "" ]] ; then
@@ -55,7 +42,7 @@ src_install() {
 	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
 
 	dodir /usr/bin/
-	use gtk || rm msfgui3.2
+	use gtk || rm msfgui
 	for file in msf*; do
 		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
 	done
@@ -89,9 +76,5 @@ pkg_postinst() {
 		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
 }