diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2014-03-19 21:04:57 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2014-03-19 21:04:57 +0000 |
| commit | 1b84c9609d14903ebec7be913a29f7850db50891 (patch) | |
| tree | e33619639951b0617614b804fe66c15722b9c2ef /net-analyzer/metasploit | |
| parent | Version bump (diff) | |
| download | gentoo-2-1b84c9609d14903ebec7be913a29f7850db50891.tar.gz gentoo-2-1b84c9609d14903ebec7be913a29f7850db50891.tar.bz2 gentoo-2-1b84c9609d14903ebec7be913a29f7850db50891.zip | |
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)
Diffstat (limited to 'net-analyzer/metasploit')
| -rw-r--r-- | net-analyzer/metasploit/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/metasploit/metasploit-9999.ebuild | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog index a66b68a50b44..1f75a4cb3f1b 100644 --- a/net-analyzer/metasploit/ChangeLog +++ b/net-analyzer/metasploit/ChangeLog @@ -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 <zerochaos@gentoo.org> metasploit-9999.ebuild: + remove bundled rb-readline due to multiple bugs, use upstream version instead 06 Mar 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild: replace failing patch with epatch_user diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index d081535d53c7..c9581bb81da2 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -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 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl 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 @@ all_ruby_prepare() { #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 |