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 52418139082 for ; Tue, 9 May 2017 03:09:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10D8B21C122; Tue, 9 May 2017 03:09:27 +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 CDD8B21C122 for ; Tue, 9 May 2017 03:09:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9F8E9341709 for ; Tue, 9 May 2017 03:09:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5B3F745F for ; Tue, 9 May 2017 03:09:12 +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: <1494299340.a921612a7ad8a93189319b1ddc0df6e950f89efa.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: a921612a7ad8a93189319b1ddc0df6e950f89efa X-VCS-Branch: master Date: Tue, 9 May 2017 03:09:12 +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: 0077c200-4f92-43e4-9f6c-b0784f2bbf79 X-Archives-Hash: 893f5cd981c3a03d65bd67e19a2f99f5 commit: a921612a7ad8a93189319b1ddc0df6e950f89efa Author: Zero_Chaos gentoo org> AuthorDate: Tue May 9 02:49:25 2017 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue May 9 03:09:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a921612a net-analyzer/metasploit: Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-analyzer/metasploit/metasploit-9999.ebuild | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index 93a14f462c0..f7f985d4863 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" #never ever ever have more than one ruby in here -USE_RUBY="ruby21" +USE_RUBY="ruby23" inherit eutils ruby-ng if [[ ${PV} == "9999" ]] ; then @@ -41,17 +41,17 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl >=dev-ruby/activerecord-4.2.6:4.2 dev-ruby/bcrypt-ruby dev-ruby/bit-struct - dev-ruby/builder:3 + >=dev-ruby/builder-3.0 dev-ruby/bundler dev-ruby/filesize - dev-ruby/jsobfu:0.3.0 + >=dev-ruby/jsobfu-0.3.0 dev-ruby/json:* dev-ruby/kissfft dev-ruby/metasm:1.0.2 >=dev-ruby/metasploit_data_models-2.0.0 dev-ruby/meterpreter_bins:0.0.22 - dev-ruby/metasploit-payloads:1.1.13 - dev-ruby/metasploit_payloads-mettle:0.0.6 + dev-ruby/metasploit-payloads:1.2.24 + dev-ruby/metasploit_payloads-mettle:0.1.9 >=dev-ruby/metasploit-credential-2.0.0 >=dev-ruby/metasploit-concern-2.0.0 >=dev-ruby/metasploit-model-2.0.0 @@ -61,9 +61,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/octokit dev-ruby/openssl-ccm:1.2.1 dev-ruby/patch_finder - dev-ruby/recog:2.0.14 + >=dev-ruby/recog-2.0.14 dev-ruby/redcarpet - =dev-ruby/rkelly-remix-0.0.6 + >=dev-ruby/rkelly-remix-0.0.6 dev-ruby/rex-arch dev-ruby/rex-java dev-ruby/rex-ole @@ -81,6 +81,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/robots dev-ruby/sshkey dev-ruby/tzinfo:* + dev-ruby/windows_error java? ( dev-ruby/rjb ) oracle? ( dev-ruby/ruby-oci8 ) pcap? ( dev-ruby/pcaprub:* @@ -160,14 +161,11 @@ all_ruby_unpack() { 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_user + eapply_user #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run rm -r data/cpuinfo - #remove random oudated collected garbage - rm -r external - #remove unneeded ruby bundler versioning files #Gemfile.lock contains the versions tested by the msf team but not the hard requirements #we regen this file in each_ruby_prepare