Bump to include security fixes in code which uses WEBrick, although ruby should be...

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index f9ded72c8d8bdd5c9dda0e31bd923bdfa0fabc3a..7c88b4573546bbceffa0bf3478dd9fa383f1d9da 100644 (file)
--- 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.29 2008/03/01 17:34:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.30 2008/03/07 12:44:15 pva Exp $
+
+*metasploit-3.1_p5435 (07 Mar 2008)
+
+  07 Mar 2008; <pva@gentoo.org> +metasploit-3.1_p5435.ebuild:
+  Bump to include security fixes in code which uses WEBrick, although ruby
+  should be already fixed in our tree ;).
 
   01 Mar 2008; <pva@gentoo.org> metasploit-3.1_p5422.ebuild:
   Added even more details how to keep metasploit up to date.

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 7cf70798ccfa7388deb99dc6c15afe8f06736713..5cb39e03713efdacfbb7cb9b82cd9f6dfd12ba0c 100644 (file)
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -8,5 +8,6 @@ DIST framework-3.1.tar.gz 10076364 RMD160 19259b5a0e682ab4d92f19acc1cb4173d8eeca
 EBUILD metasploit-2.7.ebuild 1451 RMD160 c378a9ff30e8d0901435b59e9bed85dae4d2fd21 SHA1 0edca81de4db57c822d43995ea505c609d73060d SHA256 7de09416135243c72b6c0b13e898aa4ff3d163b4190920062cfe65c7e39cda36
 EBUILD metasploit-3.1.ebuild 2066 RMD160 ab256eefdec3d5b8e8c00dd4f123b70cd947de94 SHA1 f0e9c7e9b965f2fb3af779974c4b905b6d3770e3 SHA256 7b0cd59fccb0bfacac006b727347706f86c785b88136c87db08ee75d0df63e55
 EBUILD metasploit-3.1_p5422.ebuild 3655 RMD160 3c6627151e96ee0d8d1eef00202bcdc27e2f36db SHA1 2459d45a40a2017a9bbd382be2479df086a8d6ab SHA256 e71b1896649289578dd2a51d74ac1a7dc455e18b4b092a423c051a1e85b9b0c1
-MISC ChangeLog 4932 RMD160 2451ca96f3833b40b72411707f81f1ba7ba74f68 SHA1 e8726c34f4e96560a9b7c11d6cc968cc8601ef11 SHA256 c4b278e5c0e049d34aaedf8d899c1c869902dc079edff2a4e46aa99d76b57823
+EBUILD metasploit-3.1_p5435.ebuild 3655 RMD160 03fb08385f464e9486a897715cfc2ea45465cc61 SHA1 29836caf04f2c34e549eccc510dbcfade41abc92 SHA256 ab00bc5be5fefabc5710d2626befacd027de5ec320cfb5b7503826db6b141956
+MISC ChangeLog 5149 RMD160 95e9b5f9672a0fb3940448219bb4322a6739ce9a SHA1 c7cbb97229cb7fb426ff6f49a5ff2903c630b7c8 SHA256 5c1bc3ca266eca4218a02f092591533ff1fed1c327e9f3d12c02cc0e44933873
 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff

diff --git a/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild
new file mode 100644 (file)
index 0000000..bc395e0
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-3.1_p5435.ebuild
@@ -0,0 +1,102 @@
+# 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
+}