zerochaos 14/04/25 16:48:54 Modified: metasploit-9999.ebuild ChangeLog Log: updates for 9999, partial fixes for tests, fix for bug 508490 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.22 net-analyzer/metasploit/metasploit-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?r1=1.21&r2=1.22 Index: metasploit-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- metasploit-9999.ebuild 21 Apr 2014 18:57:45 -0000 1.21 +++ metasploit-9999.ebuild 25 Apr 2014 16:48:54 -0000 1.22 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.21 2014/04/21 18:57:45 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.22 2014/04/25 16:48:54 zerochaos Exp $ EAPI="5" @@ -71,7 +71,7 @@ net-analyzer/nmap" DEPEND+=" ${COMMON_DEPEND}" RDEPEND+=" ${COMMON_DEPEND} - >=app-admin/eselect-metasploit-0.10" + >=app-admin/eselect-metasploit-0.13" RESTRICT="strip" @@ -125,6 +125,7 @@ all_ruby_prepare() { # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs #epatch "${FILESDIR}/agix_psexec_pull-2657.patch" + epatch "${FILESDIR}/bug-8792.patch" epatch_user #unbundle johntheripper, at least it now defaults to running the system version @@ -143,12 +144,11 @@ #The Gemfile contains real known deps #add our dep on upstream rb-readline instead of bundled one sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die + sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die #remove the bundled readline #https://github.com/rapid7/metasploit-framework/pull/3105 + #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux rm lib/rbreadline.rb - #fix for bug #507816 while waiting on upstream to actually set their own deps right - sed -i "s#gem 'activesupport', '>= 3.0.0'#gem 'activesupport', '~> 3.2'#" Gemfile || die - sed -i "s#gem 'activerecord'#gem 'activerecord', '~> 3.2'#" Gemfile || die #now we edit the Gemfile based on use flags #even if we pass --without=blah bundler still calculates the deps and messes us up if ! use pcap; then @@ -204,13 +204,16 @@ } each_ruby_test() { - #rake --trace spec || die + #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox + # https://dev.metasploit.com/redmine/issues/8425 ${RUBY} -S rake db:create || die ${RUBY} -S rake db:migrate || die #we bogart msfupdate so no point in trying to test it rm spec/msfupdate_spec.rb || die + #we don't really want to be uploading to virustotal during the tests + rm spec/tools/virustotal_spec.rb RAILS_ENV=test MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S rake spec || die su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" @@ -218,8 +221,9 @@ each_ruby_install() { #Tests have already been run, we don't need this stuff - rm -rf spec - rm -rf test + rm -r spec + rm -r test + rm Gemfile.lock #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. # should be as simple as copying everything into the target... 1.91 net-analyzer/metasploit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.91&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.91&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?r1=1.90&r2=1.91 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- ChangeLog 21 Apr 2014 19:20:05 -0000 1.90 +++ ChangeLog 25 Apr 2014 16:48:54 -0000 1.91 @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/metasploit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.90 2014/04/21 19:20:05 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.91 2014/04/25 16:48:54 zerochaos Exp $ + + 25 Apr 2014; Rick Farina <[email protected]> +files/bug-8792.patch, + metasploit-9999.ebuild: + updates for 9999, partial fixes for tests, fix for bug 508490 *metasploit-4.9.2-r2 (21 Apr 2014)
