From c2608d3ea065c66064c9429c8d0c3042e1cc066d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Jun 2022 14:50:04 +0200 Subject: [PATCH] =?UTF-8?q?wpscan:=203.8.20=20=E2=86=92=203.8.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/wpscan/Gemfile.lock | 36 +++++++++-------- pkgs/tools/security/wpscan/gemset.nix | 52 ++++++++++++------------- pkgs/tools/security/wpscan/update.sh | 5 +++ 3 files changed, 50 insertions(+), 43 deletions(-) diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 9fd526674365..1fd8ff1bc144 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (6.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,10 +9,10 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - cms_scanner (0.13.6) - ethon (~> 0.14.0) + cms_scanner (0.13.8) + ethon (>= 0.14, < 0.16) get_process_mem (~> 0.2.5) - nokogiri (>= 1.11.4, < 1.13.0) + nokogiri (>= 1.11.4, < 1.14.0) opt_parse_validator (~> 1.9.5) public_suffix (~> 4.0.3) ruby-progressbar (>= 1.10, < 1.12) @@ -20,21 +20,23 @@ GEM typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.9) - ethon (0.14.0) + concurrent-ruby (1.1.10) + ethon (0.15.0) ffi (>= 1.15.0) - ffi (1.15.4) + ffi (1.15.5) get_process_mem (0.2.7) ffi (~> 1.0) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) - minitest (5.14.4) - nokogiri (1.12.5-x86_64-linux) + mini_portile2 (2.8.0) + minitest (5.15.0) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.9) - public_suffix (4.0.6) + public_suffix (4.0.7) racc (1.6.0) ruby-progressbar (1.11.0) sys-proctable (1.2.6) @@ -44,18 +46,18 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) webrick (1.7.0) - wpscan (3.8.20) - cms_scanner (~> 0.13.6) + wpscan (3.8.22) + cms_scanner (~> 0.13.8) xmlrpc (0.3.2) webrick - yajl-ruby (1.4.1) - zeitwerk (2.5.1) + yajl-ruby (1.4.3) + zeitwerk (2.5.4) PLATFORMS - x86_64-linux + ruby DEPENDENCIES wpscan BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 0c882a313312..af6c94edac6b 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; + sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw"; type = "gem"; }; - version = "6.1.4.1"; + version = "6.1.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kpp3598xs79irb9g2wkcxjwlszj37sb7lp3xmvf6s5s40p0ccwf"; + sha256 = "15d7djrrkrcwznglgkr4y80jbsbxaf071qhjnn4i1c4n7nszwwfj"; type = "gem"; }; - version = "0.13.6"; + version = "0.13.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; ethon = { dependencies = ["ffi"]; @@ -48,20 +48,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; + sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; get_process_mem = { dependencies = ["ffi"]; @@ -80,30 +80,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; type = "gem"; }; - version = "5.14.4"; + version = "5.15.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.6"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -132,10 +132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; racc = { groups = ["default"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mzbds1j0a1y6jw4swgc4d7kcflkycdk3ivdw3lxaqaqvbfs35p"; + sha256 = "0c89shx0qv2yanyn3k6z3sjszq12vak27j33akz0lkgpfpk2sngi"; type = "gem"; }; - version = "3.8.20"; + version = "3.8.22"; }; xmlrpc = { dependencies = ["webrick"]; @@ -227,19 +227,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; + sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.3"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.4"; }; } diff --git a/pkgs/tools/security/wpscan/update.sh b/pkgs/tools/security/wpscan/update.sh index 4e55a770fd4e..c30cc62e5296 100755 --- a/pkgs/tools/security/wpscan/update.sh +++ b/pkgs/tools/security/wpscan/update.sh @@ -6,6 +6,11 @@ set -e cd "$(dirname "${BASH_SOURCE[0]}")" rm -f Gemfile.lock Gemfile.lock + +# Otherwise nokogiri will fail to build. +# https://github.com/nix-community/bundix/issues/88 +bundler config set --local force_ruby_platform true + bundler lock BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix