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 E1AA1138334 for ; Wed, 21 Nov 2018 18:22:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7016E08C4; Wed, 21 Nov 2018 18:22:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64F8DE08C4 for ; Wed, 21 Nov 2018 18:22:02 +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 C71FE335CEA for ; Wed, 21 Nov 2018 18:22:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 331C6485 for ; Wed, 21 Nov 2018 18:21:56 +0000 (UTC) From: "Rick 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, "Rick Farina" Message-ID: <1542824464.6b390ad4078b74e687e2c3df5b058cae00fc338d.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/metasploit/Manifest net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild net-analyzer/metasploit/metasploit-4.14.16.ebuild net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild net-analyzer/metasploit/metasploit-9999.ebuild X-VCS-Directories: net-analyzer/metasploit/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 6b390ad4078b74e687e2c3df5b058cae00fc338d X-VCS-Branch: master Date: Wed, 21 Nov 2018 18:21:56 +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: 15b2c0d6-71e5-4c3b-9640-7a4e04ddb747 X-Archives-Hash: d6d188c5b375822bb31c9e2249276411 commit: 6b390ad4078b74e687e2c3df5b058cae00fc338d Author: Zero_Chaos gentoo org> AuthorDate: Wed Nov 21 18:20:20 2018 +0000 Commit: Rick Farina gentoo org> CommitDate: Wed Nov 21 18:21:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b390ad4 net-analyzer/metasploit: bump mostly import from pentoo add x86, drop arm until further testing ruby24 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina gentoo.org> net-analyzer/metasploit/Manifest | 1 + .../metasploit/metasploit-4.14.16-r1.ebuild | 16 ++--- ...4.14.16.ebuild => metasploit-4.17.21-r1.ebuild} | 74 +++++++++++++-------- net-analyzer/metasploit/metasploit-9999.ebuild | 77 ++++++++++++++-------- 4 files changed, 102 insertions(+), 66 deletions(-) diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index 0477770c488..0c21a598802 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -1 +1,2 @@ DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2 +DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9 diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild index 1609560a641..10055eaae1c 100644 --- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild +++ b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -19,8 +19,8 @@ else SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm" RUBY_S="${PN}-framework-${MY_PV}" - inherit versionator - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)" + inherit eapi7-ver + SLOT="$(ver_cut 1).$(ver_cut 2)" fi DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code" @@ -40,8 +40,8 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/bit-struct >=dev-ruby/builder-3.0 dev-ruby/bundler - dev-ruby/filesize - >=dev-ruby/jsobfu-0.3.0 + dev-ruby/filesize:* + >=dev-ruby/jsobfu-0.3.0:* dev-ruby/json:* dev-ruby/kissfft dev-ruby/metasm:1.0.2 @@ -79,9 +79,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/rex-struct2 dev-ruby/rex-text dev-ruby/rex-zip - dev-ruby/ruby_smb + dev-ruby/ruby_smb:* dev-ruby/sqlite3 - >=dev-ruby/pg-0.11 + >=dev-ruby/pg-0.11:* dev-ruby/packetfu:1.1.13 >=dev-ruby/rubyzip-1.1 >=dev-ruby/rb-readline-0.5.4 @@ -300,7 +300,7 @@ all_ruby_install() { # do not remove LICENSE, bug #238137 dodir /usr/share/doc/${PF} cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild similarity index 88% rename from net-analyzer/metasploit/metasploit-4.14.16.ebuild rename to net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild index 5057b32c61a..6323d42a0e3 100644 --- a/net-analyzer/metasploit/metasploit-4.14.16.ebuild +++ b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" #never ever ever have more than one ruby in here -USE_RUBY="ruby23" +USE_RUBY="ruby24" inherit eutils ruby-ng if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" + EGIT_BRANCH="4.x" EGIT_CHECKOUT_DIR="${WORKDIR}"/all inherit git-r3 KEYWORDS="" @@ -17,10 +18,10 @@ else ##Tags https://github.com/rapid7/metasploit-framework/releases MY_PV=${PV/_p/-} SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" + KEYWORDS="~amd64 ~x86" RUBY_S="${PN}-framework-${MY_PV}" - inherit versionator - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)" + inherit eapi7-ver + SLOT="$(ver_cut 1).$(ver_cut 2)" fi DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code" @@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test" #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) RESTRICT="test" +#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort RUBY_COMMON_DEPEND="virtual/ruby-ssl - >=dev-ruby/activesupport-4.2.6:4.2 >=dev-ruby/actionpack-4.2.6:4.2 >=dev-ruby/activerecord-4.2.6:4.2 + >=dev-ruby/activesupport-4.2.6:4.2 + dev-ruby/backports dev-ruby/bcrypt-ruby + dev-ruby/bcrypt_pbkdf dev-ruby/bit-struct - >=dev-ruby/builder-3.0 dev-ruby/bundler - dev-ruby/filesize - >=dev-ruby/jsobfu-0.3.0 + dev-ruby/dnsruby + dev-ruby/faker + dev-ruby/filesize:* + dev-ruby/jsobfu:* 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.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 + dev-ruby/metasm:* + dev-ruby/metasploit-concern + =dev-ruby/recog-2.0.14 + dev-ruby/pdf-reader:* + ~dev-ruby/pg-0.21.0 + dev-ruby/railties:* + dev-ruby/rb-readline + dev-ruby/recog:* dev-ruby/redcarpet - >=dev-ruby/rkelly-remix-0.0.6 dev-ruby/rex-arch dev-ruby/rex-bin_tools dev-ruby/rex-core @@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/rex-mime dev-ruby/rex-nop dev-ruby/rex-ole - dev-ruby/rex-powershell + =dev-ruby/pg-0.11 - dev-ruby/packetfu:1.1.13 - >=dev-ruby/rubyzip-1.1 - >=dev-ruby/rb-readline-0.5.4 - dev-ruby/robots dev-ruby/sshkey dev-ruby/tzinfo:* dev-ruby/windows_error + dev-ruby/xdr:* dev-ruby/xmlrpc java? ( dev-ruby/rjb ) nexpose? ( dev-ruby/nexpose ) @@ -138,9 +146,14 @@ QA_PREBUILT=" usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf + usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so + usr/lib*/${PN}${SLOT}/data/exploits/* usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so + usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin + usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin + usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin " pkg_setup() { @@ -185,6 +198,9 @@ all_ruby_prepare() { sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die #use released packetfu sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die + #use the stable pg + #https://github.com/rapid7/metasploit-framework/issues/10234 + sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die #git gems are only for ruby24 support and we are not there yet sed -i "/git:/d" Gemfile || die @@ -297,7 +313,7 @@ all_ruby_install() { # do not remove LICENSE, bug #238137 dodir /usr/share/doc/${PF} cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index 3f4e20c9c00..6323d42a0e3 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" #never ever ever have more than one ruby in here -USE_RUBY="ruby23" +USE_RUBY="ruby24" inherit eutils ruby-ng if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" + EGIT_BRANCH="4.x" EGIT_CHECKOUT_DIR="${WORKDIR}"/all inherit git-r3 KEYWORDS="" @@ -17,10 +18,10 @@ else ##Tags https://github.com/rapid7/metasploit-framework/releases MY_PV=${PV/_p/-} SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" RUBY_S="${PN}-framework-${MY_PV}" - inherit versionator - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)" + inherit eapi7-ver + SLOT="$(ver_cut 1).$(ver_cut 2)" fi DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code" @@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test" #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) RESTRICT="test" +#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort RUBY_COMMON_DEPEND="virtual/ruby-ssl - >=dev-ruby/activesupport-4.2.6:4.2 >=dev-ruby/actionpack-4.2.6:4.2 >=dev-ruby/activerecord-4.2.6:4.2 + >=dev-ruby/activesupport-4.2.6:4.2 + dev-ruby/backports dev-ruby/bcrypt-ruby + dev-ruby/bcrypt_pbkdf dev-ruby/bit-struct - >=dev-ruby/builder-3.0 dev-ruby/bundler - dev-ruby/filesize - >=dev-ruby/jsobfu-0.3.0 + dev-ruby/dnsruby + dev-ruby/faker + dev-ruby/filesize:* + dev-ruby/jsobfu:* 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.2.28 - 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 + dev-ruby/metasm:* + dev-ruby/metasploit-concern + =dev-ruby/recog-2.0.14 + dev-ruby/pdf-reader:* + ~dev-ruby/pg-0.21.0 + dev-ruby/railties:* + dev-ruby/rb-readline + dev-ruby/recog:* dev-ruby/redcarpet - >=dev-ruby/rkelly-remix-0.0.6 dev-ruby/rex-arch dev-ruby/rex-bin_tools dev-ruby/rex-core @@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl dev-ruby/rex-mime dev-ruby/rex-nop dev-ruby/rex-ole - dev-ruby/rex-powershell + =dev-ruby/pg-0.11 - dev-ruby/packetfu:1.1.13 - >=dev-ruby/rubyzip-1.1 - >=dev-ruby/rb-readline-0.5.4 - dev-ruby/robots dev-ruby/sshkey dev-ruby/tzinfo:* dev-ruby/windows_error + dev-ruby/xdr:* dev-ruby/xmlrpc java? ( dev-ruby/rjb ) nexpose? ( dev-ruby/nexpose ) @@ -138,9 +146,14 @@ QA_PREBUILT=" usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf + usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so + usr/lib*/${PN}${SLOT}/data/exploits/* usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so + usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin + usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin + usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin " pkg_setup() { @@ -180,8 +193,14 @@ all_ruby_prepare() { #Gemfile.lock contains the versions tested by the msf team but not the hard requirements #we regen this file in each_ruby_prepare rm Gemfile.lock + #The Gemfile contains real known deps sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die + #use released packetfu + sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die + #use the stable pg + #https://github.com/rapid7/metasploit-framework/issues/10234 + sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die #git gems are only for ruby24 support and we are not there yet sed -i "/git:/d" Gemfile || die @@ -294,7 +313,7 @@ all_ruby_install() { # do not remove LICENSE, bug #238137 dodir /usr/share/doc/${PF} cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate