From ef35da7941bb6c4b3842f6cafddc7edeb3e5d5c7 Mon Sep 17 00:00:00 2001 From: davepgreene Date: Fri, 7 Apr 2017 09:50:38 -0400 Subject: [PATCH 1/4] Updated fpm dependency. --- Gemfile.lock | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 781a895..fb1ef1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GEM jmespath (~> 1.0) aws-sdk-resources (2.5.1) aws-sdk-core (= 2.5.1) - backports (3.6.8) + backports (3.7.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -52,7 +52,7 @@ GEM faraday_middleware (~> 0.10.0) ignorefile thor (~> 0.19.0) - cabin (0.8.1) + cabin (0.9.0) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) @@ -95,25 +95,26 @@ GEM mixlib-log (~> 1.3) rack (< 2) uuidtools (~> 2.1) - childprocess (0.5.9) + childprocess (0.6.3) ffi (~> 1.0, >= 1.0.11) - clamp (1.0.0) + clamp (1.0.1) cleanroom (1.0.0) dep-selector-libgecode (1.3.1) dep_selector (1.0.4) dep-selector-libgecode (~> 1.0) ffi (~> 1.9) diff-lcs (1.2.5) + dotenv (2.2.0) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.14) + ffi (1.9.18) ffi-yajl (2.3.0) libyajl2 (~> 1.2) - fpm (1.6.2) - archive-tar-minitar + fpm (1.8.1) + archive-tar-minitar (= 0.5.2) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) @@ -134,7 +135,7 @@ GEM io-like (0.3.0) ipaddress (0.8.3) jmespath (1.3.1) - json (1.8.3) + json (1.8.6) libyajl2 (1.2.0) mime-types (3.1) mime-types-data (~> 3.2015) @@ -178,9 +179,10 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - pleaserun (0.0.24) + pleaserun (0.0.28) cabin (> 0) clamp + dotenv insist mustache (= 0.99.8) stud @@ -271,4 +273,4 @@ DEPENDENCIES rake (~> 10.5) BUNDLED WITH - 1.12.5 + 1.13.6 From ea65b5584146dab020ebe3cba8f4745e3262134f Mon Sep 17 00:00:00 2001 From: davepgreene Date: Fri, 7 Apr 2017 09:51:48 -0400 Subject: [PATCH 2/4] Updated Rakefile to recommend installing nodejs rather than depending on it explicitly. --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index be91f3e..45509a7 100644 --- a/Rakefile +++ b/Rakefile @@ -111,8 +111,8 @@ task :deb => [:chdir_pkg, :source] do 'exec', 'fpm', '--deb-no-default-config-files', - "--depends \"nodejs >= #{target_version}\"", - "--depends \"nodejs << #{max_version}\"", + "--deb-recommends \"nodejs >= #{target_version}\"", + "--deb-recommends \"nodejs << #{max_version}\"", "--license \"#{license}\"", "--url \"#{homepage}\"", "--description \"#{description}\"", From a6a3edeb1917d1aee98851311eaad6c8a88fc129 Mon Sep 17 00:00:00 2001 From: davepgreene Date: Fri, 7 Apr 2017 10:00:44 -0400 Subject: [PATCH 3/4] Added vendor and maintainer fields. --- Rakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rakefile b/Rakefile index 45509a7..dd11cfd 100644 --- a/Rakefile +++ b/Rakefile @@ -115,6 +115,8 @@ task :deb => [:chdir_pkg, :source] do "--deb-recommends \"nodejs << #{max_version}\"", "--license \"#{license}\"", "--url \"#{homepage}\"", + '--vendor Rapid7', + '--maintainer Rapid7', "--description \"#{description}\"", '-s dir', '-t deb', From 83c9d0baabf20b6cc380b63419a3d5417c69c1c2 Mon Sep 17 00:00:00 2001 From: davepgreene Date: Fri, 7 Apr 2017 09:51:07 -0400 Subject: [PATCH 4/4] Updated builderator dependency. --- Gemfile.lock | 92 +++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb1ef1e..68ec675 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,19 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.4.0) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) archive-tar-minitar (0.5.2) arr-pm (0.0.10) cabin (> 0) - aws-sdk (2.5.1) - aws-sdk-resources (= 2.5.1) - aws-sdk-core (2.5.1) + aws-sdk (2.9.5) + aws-sdk-resources (= 2.9.5) + aws-sdk-core (2.9.5) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.5.1) - aws-sdk-core (= 2.5.1) + aws-sdk-resources (2.9.5) + aws-sdk-core (= 2.9.5) + aws-sigv4 (1.0.0) backports (3.7.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -42,11 +45,11 @@ GEM buff-ruby_engine (0.1.0) buff-shell_out (0.2.0) buff-ruby_engine (~> 0.1.0) - builder (3.2.2) - builderator (1.1.9) + builder (3.2.3) + builderator (1.2.2) aws-sdk (~> 2.0) berkshelf (~> 4.3) - chef (~> 12.5) + chef (~> 12.7.2) childprocess (~> 0.5) dep_selector (~> 1.0) faraday_middleware (~> 0.10.0) @@ -58,24 +61,21 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef (12.12.15) - bundler (>= 1.10) - chef-config (= 12.12.15) + chef (12.7.2) + chef-config (= 12.7.2) chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) - iniparse (~> 1.4) mixlib-authentication (~> 1.4) mixlib-cli (~> 1.4) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) - net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 2.9, < 4.0) net-ssh-multi (~> 1.1) ohai (>= 8.6.0.alpha.1, < 9) - plist (~> 3.2) + plist (~> 3.1.0) proxifier (~> 1.0) rspec-core (~> 3.4) rspec-expectations (~> 3.4) @@ -85,11 +85,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef-config (12.12.15) - fuzzyurl (~> 0.8.0) + chef-config (12.7.2) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-zero (4.8.0) + chef-zero (4.9.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) @@ -103,13 +102,13 @@ GEM dep_selector (1.0.4) dep-selector-libgecode (~> 1.0) ffi (~> 1.9) - diff-lcs (1.2.5) + diff-lcs (1.3) dotenv (2.2.0) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) + faraday_middleware (0.10.1) + faraday (>= 0.7.4, < 1.0) ffi (1.9.18) ffi-yajl (2.3.0) libyajl2 (~> 1.2) @@ -124,13 +123,11 @@ GEM json (>= 1.7.7, < 2.0) pleaserun (~> 0.0.24) ruby-xz - fuzzyurl (0.8.0) - hashie (3.4.4) + hashie (3.5.5) highline (1.7.8) hitimes (1.2.4) httpclient (2.7.2) ignorefile (1.1.0) - iniparse (1.4.2) insist (1.0.0) io-like (0.3.0) ipaddress (0.8.3) @@ -140,41 +137,39 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - minitar (0.5.4) - mixlib-archive (0.2.0) + minitar (0.6.1) + mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.1) mixlib-log mixlib-cli (1.7.0) - mixlib-config (2.2.1) - mixlib-log (1.7.0) - mixlib-shellout (2.2.6) + mixlib-config (2.2.4) + mixlib-log (1.7.1) + mixlib-shellout (2.2.7) molinillo (0.4.5) multi_json (1.12.1) multipart-post (2.0.0) mustache (0.99.8) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) net-ssh (3.2.0) - net-ssh-gateway (1.2.0) + net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) - nio4r (1.2.1) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - ohai (8.18.0) + nio4r (2.0.0) + octokit (4.7.0) + sawyer (~> 0.8.0, >= 0.5.3) + ohai (8.23.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress mixlib-cli mixlib-config (~> 2.0) - mixlib-log + mixlib-log (>= 1.7.1, < 2.0) mixlib-shellout (~> 2.0) plist (~> 3.1) systemu (~> 2.6.4) @@ -186,9 +181,10 @@ GEM insist mustache (= 0.99.8) stud - plist (3.2.0) + plist (3.1.0) proxifier (1.0.3) - rack (1.6.4) + public_suffix (2.0.5) + rack (1.6.5) rake (10.5.0) retryable (2.0.4) ridley (4.6.1) @@ -213,7 +209,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.2) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -231,28 +227,28 @@ GEM ruby-xz (0.2.3) ffi (~> 1.9) io-like (~> 0.3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) semverse (1.2.1) - serverspec (2.36.0) + serverspec (2.38.0) multi_json rspec (~> 3.0) rspec-its specinfra (~> 2.53) - sfl (2.2) + sfl (2.3) solve (2.0.3) molinillo (~> 0.4.2) semverse (~> 1.1) - specinfra (2.60.3) + specinfra (2.67.7) net-scp - net-ssh (>= 2.7, < 4.0) + net-ssh (>= 2.7, < 5.0) net-telnet sfl stud (0.0.22) syslog-logger (1.6.8) systemu (2.6.5) - thor (0.19.1) + thor (0.19.4) timers (4.0.4) hitimes uuidtools (2.1.5)