zerochaos 14/03/19 21:04:57 Modified: metasploit-9999.ebuild ChangeLog Log: remove bundled rb-readline due to multiple bugs, use upstream version instead (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.13 net-analyzer/metasploit/metasploit-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild?r1=1.12&r2=1.13 Index: metasploit-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metasploit-9999.ebuild 6 Mar 2014 15:44:07 -0000 1.12 +++ metasploit-9999.ebuild 19 Mar 2014 21:04:57 -0000 1.13 @@ -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.12 2014/03/06 15:44:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.13 2014/03/19 21:04:57 zerochaos Exp $ EAPI="5" @@ -41,6 +41,7 @@ dev-ruby/builder:3 >=dev-ruby/pg-0.11 =dev-ruby/packetfu-1.1.9 + dev-ruby/rb-readline dev-ruby/robots dev-ruby/kissfft java? ( dev-ruby/rjb ) @@ -137,6 +138,11 @@ #we regen this file in each_ruby_prepare rm Gemfile.lock #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 + #remove the bundled readline + #https://github.com/rapid7/metasploit-framework/pull/3105 + rm lib/rbreadline.rb #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 1.80 net-analyzer/metasploit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.80&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?rev=1.80&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/metasploit/ChangeLog?r1=1.79&r2=1.80 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- ChangeLog 6 Mar 2014 15:44:07 -0000 1.79 +++ ChangeLog 19 Mar 2014 21:04:57 -0000 1.80 @@ -1,6 +1,9 @@ # 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.79 2014/03/06 15:44:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.80 2014/03/19 21:04:57 zerochaos Exp $ + + 19 Mar 2014; Rick Farina <[email protected]> metasploit-9999.ebuild: + remove bundled rb-readline due to multiple bugs, use upstream version instead 06 Mar 2014; Rick Farina <[email protected]> metasploit-9999.ebuild: replace failing patch with epatch_user
