From: Peter Volkov Date: Sat, 1 Mar 2008 17:00:00 +0000 (+0000) Subject: Hopefully fixed update problem, bug #195924. Now we use subversion eclass with it... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1152ff21b62991769d7160f2e683c98d4bd77915;p=gentoo.git 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. Package-Manager: portage-2.1.4.4 --- 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; 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; -metasploit-3.0-r1.ebuild, metasploit-3.1.ebuild: diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index daec87d4d0b2..4dbc098553b2 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -5,7 +5,8 @@ AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac 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.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.1.ebuild 2097 RMD160 bae8465b2c2fbd07371b1e44b60e5a5e1e47189b SHA1 eceed9c6398c3d7a02dc108ddce442320237dbcd SHA256 3708d0ab1c93de5df4bb4a0a454b27314a00fb6c37fecf0a1913ff018cd5b7cc -MISC ChangeLog 4347 RMD160 bb430accff2e213c2daf773ca824e6c5646d9c51 SHA1 df214a65909ea9a34a829c95e93a7d8d3fc187b1 SHA256 1d1cd60f869a1e2cd8f2a4463dfa73bcb20a2a18e78553b6bef752fecb37f506 +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 3071 RMD160 0066cef9ffd2f4a1bb18b37c60db0ca4833517f8 SHA1 aa6c8cc8c6505a85f477fd66f6f8b12cc14d3278 SHA256 57562afaf1966b296d0e6572b4132a9159b7a3ad1a853cbbe81d1da7505b91a5 +MISC ChangeLog 4809 RMD160 81503406a565acb8dfb1641f2bf2bbc79b33c312 SHA1 c109979813c364f534cf4140a0eb8fd2bc817120 SHA256 7b9174b0524aade1e2c07d4ac385fd27bfcd61d4033164ab0662b13afabae993 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff 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 inside $PV to install updated up +# to revision 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= emerge =${PF}" + elog + elog "where 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 +}