From d5ba7cd83c0c3ddf5cfdefdd34d2c6bef94ce3fa Mon Sep 17 00:00:00 2001 From: blshkv Date: Mon, 14 Jan 2019 11:53:59 +0800 Subject: [PATCH] wpscan: revert back activesupport, https://github.com/wpscanteam/wpscan/issues/1266 --- ...1.ebuild => cms_scanner-0.0.41.3-r2.ebuild} | 10 ++++++---- ...-3.4.3-r1.ebuild => wpscan-3.4.3-r2.ebuild} | 18 +++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) rename dev-ruby/cms_scanner/{cms_scanner-0.0.41.3-r1.ebuild => cms_scanner-0.0.41.3-r2.ebuild} (79%) rename net-analyzer/wpscan/{wpscan-3.4.3-r1.ebuild => wpscan-3.4.3-r2.ebuild} (57%) diff --git a/dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r1.ebuild b/dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r2.ebuild similarity index 79% rename from dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r1.ebuild rename to dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r2.ebuild index 9ec40bb3a..a14889942 100644 --- a/dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r1.ebuild +++ b/dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r2.ebuild @@ -17,6 +17,8 @@ KEYWORDS="~amd64 ~x86" IUSE="test" ruby_add_rdepend " + dev-ruby/activesupport:* + >=dev-ruby/addressable-2.5.0 >=dev-ruby/nokogiri-1.10.0 >=dev-ruby/opt_parse_validator-0.0.16.6 >=dev-ruby/public_suffix-3.0.0 @@ -25,7 +27,7 @@ ruby_add_rdepend " =dev-ruby/xmlrpc-0.3* >=dev-ruby/yajl-ruby-1.4.1" -#each_ruby_prepare() { -# #relax 5.1 to any -# sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die -#} +each_ruby_prepare() { + #relax 5.1 to any + sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die +} diff --git a/net-analyzer/wpscan/wpscan-3.4.3-r1.ebuild b/net-analyzer/wpscan/wpscan-3.4.3-r2.ebuild similarity index 57% rename from net-analyzer/wpscan/wpscan-3.4.3-r1.ebuild rename to net-analyzer/wpscan/wpscan-3.4.3-r2.ebuild index c6b6a1d24..22abfc39a 100644 --- a/net-analyzer/wpscan/wpscan-3.4.3-r1.ebuild +++ b/net-analyzer/wpscan/wpscan-3.4.3-r2.ebuild @@ -18,13 +18,17 @@ KEYWORDS="~amd64 ~x86" IUSE="test" ruby_add_bdepend "dev-ruby/bundler" -ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.41.2" +ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.41.2 + >=dev-ruby/addressable-2.5.0 + dev-ruby/activesupport:* + >=dev-ruby/yajl-ruby-1.3.0 +" -#each_ruby_prepare() { +each_ruby_prepare() { #https://github.com/wpscanteam/wpscan/issues/1266 # sed -i "s|'activesupport', '~> 5.1'|'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 -# MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die -#} +# sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die + 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 +}