From a50d442d1796a45033f1b315078dcd0da1c68bf5 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sat, 29 Sep 2018 10:38:15 +0800 Subject: [PATCH] wpscan: bump and cleanup deps, cms_scanner --- dev-ruby/cms_scanner/Manifest | 2 +- ....40.ebuild => cms_scanner-0.0.40.1.ebuild} | 11 ++-------- dev-ruby/cms_scanner/files/0.0.40_spec.patch | 21 ------------------- dev-ruby/cms_scanner/files/0.0.40_spec.patch2 | 21 ------------------- dev-ruby/cms_scanner/files/0.0.40_spec.patch3 | 21 ------------------- dev-ruby/opt_parse_validator/Manifest | 1 + .../opt_parse_validator-0.0.16.3.ebuild | 18 ++++++++++++++++ .../base/package.accept_keywords/dev-ruby | 4 ++-- 8 files changed, 24 insertions(+), 75 deletions(-) rename dev-ruby/cms_scanner/{cms_scanner-0.0.40.ebuild => cms_scanner-0.0.40.1.ebuild} (66%) delete mode 100644 dev-ruby/cms_scanner/files/0.0.40_spec.patch delete mode 100644 dev-ruby/cms_scanner/files/0.0.40_spec.patch2 delete mode 100644 dev-ruby/cms_scanner/files/0.0.40_spec.patch3 create mode 100644 dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild diff --git a/dev-ruby/cms_scanner/Manifest b/dev-ruby/cms_scanner/Manifest index 18f3202b6..3e3f83226 100644 --- a/dev-ruby/cms_scanner/Manifest +++ b/dev-ruby/cms_scanner/Manifest @@ -1 +1 @@ -DIST cms_scanner-0.0.40.gem 34816 BLAKE2B 303c043e9c7239b69c4c2392840f0efc5db1746430ef9fba615e63de273232dd8a3840576027aab9522b4be9ef68ecbd3750fab6654c0053a83ae29bd8e82600 SHA512 132363aa1b40d92d5c412108d304d51f1570e1777c23e5963a40365c39e8312c4f4a2139079e4c2eb72975adf3e3a2b54ac12abf73fc4796f3a959f9156b316b +DIST cms_scanner-0.0.40.1.gem 30208 BLAKE2B 7d03f5e94193f2678e9d46377483d4c0cd568dcc7e16fc61a0afe3025b04e85d30b2894edb107227403381b9c6654a5e5c3f386104b2ecad00c691cc767402ed SHA512 5cb7332119878c9d860553dedffe50cb009eb3637fd9fb43190172ac8ff60933ad106ddc1383e2457845774bc900485fd197c45c0654662e2666b4b721dbb7f9 diff --git a/dev-ruby/cms_scanner/cms_scanner-0.0.40.ebuild b/dev-ruby/cms_scanner/cms_scanner-0.0.40.1.ebuild similarity index 66% rename from dev-ruby/cms_scanner/cms_scanner-0.0.40.ebuild rename to dev-ruby/cms_scanner/cms_scanner-0.0.40.1.ebuild index 79aaf6863..2d94e40c8 100644 --- a/dev-ruby/cms_scanner/cms_scanner-0.0.40.ebuild +++ b/dev-ruby/cms_scanner/cms_scanner-0.0.40.1.ebuild @@ -5,7 +5,6 @@ EAPI=6 USE_RUBY="ruby23 ruby24" #RUBY_FAKEGEM_GEMSPEC="cms_scanner.gemspec" -#RUBY_FAKEGEM_REQUIRE_PATHS="app" RUBY_FAKEGEM_EXTRAINSTALL="app" inherit ruby-fakegem @@ -21,15 +20,9 @@ IUSE="test" ruby_add_rdepend "dev-ruby/activesupport:5.2 >=dev-ruby/addressable-2.5.0 >=dev-ruby/nokogiri-1.8.0 - >=dev-ruby/opt_parse_validator-0.0.16.2 + =dev-ruby/opt_parse_validator-0.0.16* >=dev-ruby/public_suffix-3.0.0 >=dev-ruby/ruby-progressbar-1.10.0 dev-ruby/typhoeus:1 - >=dev-ruby/xmlrpc-0.3.0 + =dev-ruby/xmlrpc-0.3* >=dev-ruby/yajl-ruby-1.4.1" - -#all_ruby_prepare() { -# epatch "${FILESDIR}/0.0.40_spec.patch" -# sed -i -e 's/git ls-files -z/find . -type f -print/' ${RUBY_FAKEGEM_GEMSPEC} || die -# sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die -#} diff --git a/dev-ruby/cms_scanner/files/0.0.40_spec.patch b/dev-ruby/cms_scanner/files/0.0.40_spec.patch deleted file mode 100644 index 1694dc032..000000000 --- a/dev-ruby/cms_scanner/files/0.0.40_spec.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/cms_scanner.gemspec.orig 2018-09-26 03:14:10.000000000 +0800 -+++ b/cms_scanner.gemspec 2018-09-28 15:32:27.329156352 +0800 -@@ -15,17 +15,7 @@ - s.homepage = 'https://github.com/wpscanteam/CMSScanner' - s.license = 'MIT' - -- s.files = `git ls-files -z`.split("\x0").reject do |file| -- file =~ %r{^(?: -- spec\/.* -- |Gemfile -- |Rakefile -- |\.rspec -- |\.gitignore -- |\.rubocop.yml -- |\.travis.yml -- )$}x -- end -+ s.files = Dir['**/*'].keep_if { |file| File.file?(file) } - - s.test_files = [] - s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) } diff --git a/dev-ruby/cms_scanner/files/0.0.40_spec.patch2 b/dev-ruby/cms_scanner/files/0.0.40_spec.patch2 deleted file mode 100644 index f1b57b151..000000000 --- a/dev-ruby/cms_scanner/files/0.0.40_spec.patch2 +++ /dev/null @@ -1,21 +0,0 @@ ---- a/cms_scanner.gemspec.orig 2018-09-26 03:14:10.000000000 +0800 -+++ b/cms_scanner.gemspec 2018-09-28 15:32:27.329156352 +0800 -@@ -15,17 +15,7 @@ - s.homepage = 'https://github.com/wpscanteam/CMSScanner' - s.license = 'MIT' - -- s.files = `git ls-files -z`.split("\x0").reject do |file| -- file =~ %r{^(?: -- spec\/.* -- |Gemfile -- |Rakefile -- |\.rspec -- |\.gitignore -- |\.rubocop.yml -- |\.travis.yml -- )$}x -- end -+ s.files = Dir['README.md', 'LICENSE', 'lib/**/*', 'app/**/*' ] - - s.test_files = [] - s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) } diff --git a/dev-ruby/cms_scanner/files/0.0.40_spec.patch3 b/dev-ruby/cms_scanner/files/0.0.40_spec.patch3 deleted file mode 100644 index f7412bc51..000000000 --- a/dev-ruby/cms_scanner/files/0.0.40_spec.patch3 +++ /dev/null @@ -1,21 +0,0 @@ ---- a/cms_scanner.gemspec.orig 2018-09-26 03:14:10.000000000 +0800 -+++ b/cms_scanner.gemspec 2018-09-28 15:32:27.329156352 +0800 -@@ -15,17 +15,7 @@ - s.homepage = 'https://github.com/wpscanteam/CMSScanner' - s.license = 'MIT' - -- s.files = `git ls-files -z`.split("\x0").reject do |file| -- file =~ %r{^(?: -- spec\/.* -- |Gemfile -- |Rakefile -- |\.rspec -- |\.gitignore -- |\.rubocop.yml -- |\.travis.yml -- )$}x -- end -+ s.files = Dir.glob("{app,lib}/**/*") + %w(README.md LICENSE) - - s.test_files = [] - s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) } diff --git a/dev-ruby/opt_parse_validator/Manifest b/dev-ruby/opt_parse_validator/Manifest index 276ea0826..ee09569a7 100644 --- a/dev-ruby/opt_parse_validator/Manifest +++ b/dev-ruby/opt_parse_validator/Manifest @@ -1 +1,2 @@ DIST opt_parse_validator-0.0.16.2.gem 14336 BLAKE2B 606edf2c5cf1d6873f70010c58824721294b077b7a95e778f25a57fe732f5ee75222e8a44d6b43274b2ace14095f1a9034c51410462db6354f57e246276d61b1 SHA512 7ebce88bf39a9495a97826f5ee9f69a18b58d1d1ad70ae9f67aa8f23ba56ed2a4b97690d1fcc3366050771df35937fc703eae19d3e1ee57b9a50a061b58335db +DIST opt_parse_validator-0.0.16.3.gem 11776 BLAKE2B 638bcbfffb1e74d72110dd91984dc593f72ac83371954b0b48f1378ad0a3e9ca32122ab4a1a8474072393aa05631a280d28b3a75faa88bb3b0bc72d6c2a7aa0b SHA512 064f33066a4bd0cddc7591e4475ed37fa951c0d4416ce27bc71920586f4a8a5b2d763f834bcbfa206a98ddacd383b926eb28a761ba79c2a1e5a7fa54adca9799 diff --git a/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild new file mode 100644 index 000000000..cae527df2 --- /dev/null +++ b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24" + +inherit ruby-fakegem + +DESCRIPTION="OptionParser lib in ruby" +HOMEPAGE="https://rubygems.org/gems/opt_parse_validator" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +ruby_add_rdepend ">=dev-ruby/activesupport-5.2.1:* + >=dev-ruby/addressable-2.5.0" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index e7c62fcfd..12730e315 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -226,8 +226,8 @@ dev-ruby/pdf-reader:2 =dev-ruby/yajl-ruby-1.4* =dev-ruby/ruby-progressbar-1.10* -~dev-ruby/cms_scanner-0.0.40 -~dev-ruby/opt_parse_validator-0.0.16.2 +=dev-ruby/cms_scanner-0.0.40* +=dev-ruby/opt_parse_validator-0.0.16* #beef =www-apps/beef-0.4.4.5