From 71709b32adf964b71df094f3062e8e92aaa714b3 Mon Sep 17 00:00:00 2001 From: blshkv Date: Thu, 20 Dec 2018 10:07:32 +0800 Subject: [PATCH] wpscan: relax activesupport dep requirement --- .../cms_scanner-0.0.41.0-r1.ebuild | 27 +++++++++++++++ ...=> opt_parse_validator-0.0.16.4-r1.ebuild} | 4 +-- net-analyzer/wpscan/Manifest | 2 -- net-analyzer/wpscan/wpscan-3.3.2.ebuild | 33 ------------------- ...an-3.3.1.ebuild => wpscan-3.4.1-r1.ebuild} | 6 ++-- .../base/package.accept_keywords/dev-ruby | 2 +- 6 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 dev-ruby/cms_scanner/cms_scanner-0.0.41.0-r1.ebuild rename dev-ruby/opt_parse_validator/{opt_parse_validator-0.0.16.4.ebuild => opt_parse_validator-0.0.16.4-r1.ebuild} (81%) delete mode 100644 net-analyzer/wpscan/wpscan-3.3.2.ebuild rename net-analyzer/wpscan/{wpscan-3.3.1.ebuild => wpscan-3.4.1-r1.ebuild} (79%) diff --git a/dev-ruby/cms_scanner/cms_scanner-0.0.41.0-r1.ebuild b/dev-ruby/cms_scanner/cms_scanner-0.0.41.0-r1.ebuild new file mode 100644 index 000000000..7e9503c49 --- /dev/null +++ b/dev-ruby/cms_scanner/cms_scanner-0.0.41.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby23 ruby24 ruby25" +RUBY_FAKEGEM_EXTRAINSTALL="app" + +inherit ruby-fakegem + +DESCRIPTION="Framework to provide an easy way to implement CMS Scanners" +HOMEPAGE="https://github.com/wpscanteam/CMSScanner" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +ruby_add_rdepend "dev-ruby/activesupport:* + >=dev-ruby/addressable-2.5.0 + >=dev-ruby/nokogiri-1.8.0 + >=dev-ruby/opt_parse_validator-0.0.16.4 + >=dev-ruby/public_suffix-3.0.0 + >=dev-ruby/ruby-progressbar-1.10.0 + dev-ruby/typhoeus:1 + =dev-ruby/xmlrpc-0.3* + >=dev-ruby/yajl-ruby-1.4.1" diff --git a/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4.ebuild b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4-r1.ebuild similarity index 81% rename from dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4.ebuild rename to dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4-r1.ebuild index cae527df2..84a2186ac 100644 --- a/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4.ebuild +++ b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.4-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" inherit ruby-fakegem @@ -14,5 +14,5 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="test" -ruby_add_rdepend ">=dev-ruby/activesupport-5.2.1:* +ruby_add_rdepend "dev-ruby/activesupport:* >=dev-ruby/addressable-2.5.0" diff --git a/net-analyzer/wpscan/Manifest b/net-analyzer/wpscan/Manifest index bd17f990e..149125090 100644 --- a/net-analyzer/wpscan/Manifest +++ b/net-analyzer/wpscan/Manifest @@ -1,4 +1,2 @@ -DIST wpscan-3.3.1.tar.gz 5781065 BLAKE2B 4f12e6ced7fdee1f42f676ff5d6009f30bf2ec3fbd5dd2eb33d7cb7d6ad606084fbc2292331f561a3a3fc903873fa646b70753339c4192259dbe416995a0158a SHA512 1b0dc3cf8d3459c2ae6a189f0ec45fe8ca80cc22cdd55c6f2122d474259c373aeb1577d3d8f3a24b31f51160b5a3f73c36c6e9c64d272e066c1b106047bff7a2 -DIST wpscan-3.3.2.tar.gz 5858828 BLAKE2B b8b4c7ed7a1f071c8ddabaea263571e11ba915c7ab8b703818c5c6b2cf46ff9b99d1f2ec13c6fe6dfa31de4e2472ca1e1a8a74d36257ee402899b9ac0f081ea1 SHA512 a36ce992dd16e9acbd6e1d8d77caf93131e7e9d5a34adb2028b35fe1c66ab074f33a6925b07a5ca0e24fcd2b615c601a652be479c9f493c9da7611cc39252c71 DIST wpscan-3.3.3.tar.gz 5858504 BLAKE2B 62b93dcdd0520c9bb8bc6fbf077a2c1b7b2f2b329a5dedc003ff0555a3e7656c339b6321f089e75d89c67841727658509a3ecc378cf2cbe544f6a369117bb7d5 SHA512 e751ae70bd2560c3fddba65788d5e79f36ebfa7b5fb8f9dfb7ecf3082f847913e062ab76e9eeaafdaa1514a1aaca770dc31926530ad06ef185360493626f0af0 DIST wpscan-3.4.1.tar.gz 6009051 BLAKE2B d992aee244c0b5a91191d3f5dd7edeca65063b2b9b2033ff48c58a9f7c8242812f63efb29667d90894347bcc2439dfa225641707d82a103c1ac7994325298dd5 SHA512 f6370086e0b95c8b111496c74760cfb08f24d3e36f8aa2939fb8d19639131e78063f8fc7e0382f06fe22033dea51a47c13b3557659066bb46fa4ca15c3ce74a0 diff --git a/net-analyzer/wpscan/wpscan-3.3.2.ebuild b/net-analyzer/wpscan/wpscan-3.3.2.ebuild deleted file mode 100644 index 29f51c0b1..000000000 --- a/net-analyzer/wpscan/wpscan-3.3.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" -RUBY_FAKEGEM_EXTRAINSTALL="app bin spec" - -inherit ruby-fakegem - -DESCRIPTION="Wordpress security scanner" -HOMEPAGE="http://wpscan.org/" -SRC_URI="https://github.com/wpscanteam/wpscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_bdepend "dev-ruby/bundler" - -ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.40.2 - >=dev-ruby/addressable-2.5.0 - dev-ruby/activesupport:5.2 - >=dev-ruby/yajl-ruby-1.3.0 -" - -each_ruby_prepare() { - sed -i -e '/s.add_development_dependency/d' wpscan.gemspec - - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die -} diff --git a/net-analyzer/wpscan/wpscan-3.3.1.ebuild b/net-analyzer/wpscan/wpscan-3.4.1-r1.ebuild similarity index 79% rename from net-analyzer/wpscan/wpscan-3.3.1.ebuild rename to net-analyzer/wpscan/wpscan-3.4.1-r1.ebuild index 6c0f4b48c..0ec07e28e 100644 --- a/net-analyzer/wpscan/wpscan-3.3.1.ebuild +++ b/net-analyzer/wpscan/wpscan-3.4.1-r1.ebuild @@ -19,13 +19,15 @@ IUSE="test" ruby_add_bdepend "dev-ruby/bundler" -ruby_add_rdepend "dev-ruby/cms_scanner +ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.41.0 >=dev-ruby/addressable-2.5.0 - dev-ruby/activesupport:5.2 + dev-ruby/activesupport:* >=dev-ruby/yajl-ruby-1.3.0 " each_ruby_prepare() { +#https://github.com/wpscanteam/wpscan/issues/1266 + sed -i "s|'activesupport', '~> 5.2'|'activesupport'|g" wpscan.gemspec sed -i -e '/s.add_development_dependency/d' wpscan.gemspec MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index 9eabc42c6..6f188e266 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -38,7 +38,7 @@ dev-ruby/actionview:4.2 #dev-ruby/actioncable:5.2 #dev-ruby/activejob:5.2 #dev-ruby/actionmailer:5.2 -dev-ruby/activesupport:5.2 +#dev-ruby/activesupport:5.2 #ruby23 ~dev-ruby/rdoc-5.1.0