From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7FAC1139694 for ; Tue, 9 May 2017 16:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D72EAE0D05; Tue, 9 May 2017 16:31:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD964E0D05 for ; Tue, 9 May 2017 16:31:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99DD134169C for ; Tue, 9 May 2017 16:31:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39B727454 for ; Tue, 9 May 2017 16:31:48 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1494347503.4e9948dc600301053bd1c092da2f858e44fb7d81.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/metasploit/metasploit-9999.ebuild X-VCS-Directories: net-analyzer/metasploit/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 4e9948dc600301053bd1c092da2f858e44fb7d81 X-VCS-Branch: master Date: Tue, 9 May 2017 16:31:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b51d8b3e-b755-4e92-a343-e6e2acc067f7 X-Archives-Hash: 5460379901facf3bf257f4f984cf8d44 commit: 4e9948dc600301053bd1c092da2f858e44fb7d81 Author: Zero_Chaos gentoo org> AuthorDate: Tue May 9 16:30:13 2017 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue May 9 16:31:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9948dc net-analyzer/metasploit: if I were paid for my work on metasploit I could retire Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-analyzer/metasploit/metasploit-9999.ebuild | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index 79fa2dc046e..0ebcb289020 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -73,6 +73,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/rex-struct2 dev-ruby/rex-text dev-ruby/rex-zip + dev-ruby/ruby_smb dev-ruby/sqlite3 >=dev-ruby/pg-0.11 dev-ruby/packetfu:1.1.13 @@ -82,6 +83,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/sshkey dev-ruby/tzinfo:* dev-ruby/windows_error + dev-ruby/xmlrpc java? ( dev-ruby/rjb ) oracle? ( dev-ruby/ruby-oci8 ) pcap? ( dev-ruby/pcaprub:* @@ -171,15 +173,8 @@ 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 - #and then they broke it... - #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 - #but now we have to go back to bundled readline because otherwise it's broken - #rm lib/rbreadline.rb + sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || 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