From 191aad7b582c34f87d803ad6887a5e461acc52da Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 29 Dec 2022 12:07:31 -0500 Subject: [PATCH] Upgrading ruby version to 2.7.6 (#394) --- Berksfile | 5 +- Berksfile.lock | 53 ----- Gemfile | 13 +- Gemfile.lock | 321 --------------------------- README.md | 2 +- build/x86_64_amzn-2016.09/Dockerfile | 2 +- build/x86_64_centos6/Dockerfile | 2 +- build/x86_64_centos7/Dockerfile | 2 +- build/x86_64_centos8/Dockerfile | 2 +- build/x86_64_debian/Dockerfile | 2 +- build/x86_64_sles12/Dockerfile | 2 +- build/x86_64_sles15/Dockerfile | 2 +- config/projects/google-fluentd.rb | 2 +- config/software/ruby.rb | 28 ++- config/software/td-agent-cleanup.rb | 2 +- config/software/td-agent-files.rb | 2 +- config/software/td-agent-ui.rb | 2 +- config/software/td.rb | 2 +- 18 files changed, 40 insertions(+), 406 deletions(-) delete mode 100644 Berksfile.lock delete mode 100644 Gemfile.lock diff --git a/Berksfile b/Berksfile index 87dd1ce3..1a5f3e80 100644 --- a/Berksfile +++ b/Berksfile @@ -5,7 +5,4 @@ source 'https://supermarket.chef.io' cookbook 'apt', '~> 2.8' cookbook 'yum-epel', '~> 0.6' -cookbook 'omnibus', '~> 4' - -# Uncomment to use the latest version of the Omnibus cookbook from GitHub -# cookbook 'omnibus', github: 'opscode-cookbooks/omnibus' +cookbook 'omnibus', github: 'opscode-cookbooks/omnibus' diff --git a/Berksfile.lock b/Berksfile.lock deleted file mode 100644 index d3ec0231..00000000 --- a/Berksfile.lock +++ /dev/null @@ -1,53 +0,0 @@ -DEPENDENCIES - apt (~> 2.8) - omnibus (~> 4) - yum-epel (~> 0.6) - -GRAPH - apt (2.9.2) - build-essential (6.0.4) - compat_resource (>= 12.10) - mingw (>= 1.1) - seven_zip (>= 0.0.0) - chef-ingredient (0.19.0) - chef-sugar (3.4.0) - chef_handler (1.4.0) - compat_resource (12.14.0) - dmg (2.4.0) - git (4.6.0) - build-essential (>= 0.0.0) - dmg (>= 0.0.0) - windows (>= 0.0.0) - yum-epel (>= 0.0.0) - homebrew (2.1.0) - build-essential (>= 2.1.2) - languages (0.2.8) - build-essential (>= 0.0.0) - chef-sugar (>= 0.0.0) - homebrew (>= 0.0.0) - remote_install (>= 0.0.0) - mingw (1.2.4) - compat_resource (>= 0.0.0) - seven_zip (>= 0.0.0) - omnibus (4.2.4) - build-essential (>= 6.0.0) - chef-ingredient (>= 0.18.0) - chef-sugar (>= 3.2.0) - git (>= 0.0.0) - homebrew (>= 0.0.0) - languages (>= 0.0.0) - remote_install (>= 0.0.0) - windows (>= 0.0.0) - windows-sdk (>= 0.0.0) - wix (>= 0.0.0) - remote_install (1.0.2) - seven_zip (2.0.2) - windows (>= 1.2.2) - windows (1.44.3) - chef_handler (>= 0.0.0) - windows-sdk (1.0.2) - wix (2.0.2) - windows (>= 1.38.2) - yum (3.12.0) - yum-epel (0.7.1) - yum (>= 3.6.3) diff --git a/Gemfile b/Gemfile index 82c2f547..2c4c88c1 100644 --- a/Gemfile +++ b/Gemfile @@ -4,15 +4,20 @@ source 'https://rubygems.org' gem 'berkshelf', '~> 3.0' # Install omnibus software -gem 'omnibus', :github => 'chef/omnibus', :branch => '7.0.9' -gem 'omnibus-software', :github => 'chef/omnibus-software' #, :branch => 'omnibus/3.2-stable' +gem 'omnibus', :github => 'chef/omnibus' +gem 'omnibus-software', :github => 'chef/omnibus-software' + +gem 'kubeclient', '4.10.1' + +gem 'ohai', '>17.7' +gem 'chef-cleanroom', '1.0.1' # Use open_uri_redirections to allow HTTPS -> HTTP redirections in omnibus gem 'open_uri_redirections', '0.2.1' # Use Test Kitchen with Vagrant for convering the build environment -gem 'test-kitchen', '~> 1.2' -gem 'kitchen-vagrant', '~> 0.14' +gem 'test-kitchen', '~> 2.4' +gem 'kitchen-vagrant', '~> 1.6' group :test do gem 'rake', '~> 10.1.0' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index f2696e0a..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,321 +0,0 @@ -GIT - remote: https://github.com/chef/omnibus-software.git - revision: a901ec26f8c704ba793c0609319f00f49e630d6b - specs: - omnibus-software (4.0.0) - omnibus (>= 5.6.1) - -GIT - remote: https://github.com/chef/omnibus.git - revision: 82fd5b928c0da947f2407c2510562fa807ece481 - branch: 7.0.9 - specs: - omnibus (7.0.9) - aws-sdk-s3 (~> 1) - chef-cleanroom (~> 1.0) - chef-sugar (>= 3.3) - ffi-yajl (~> 2.2) - license_scout (~> 1.0) - mixlib-shellout (>= 2.0, < 4.0) - mixlib-versioning - ohai (>= 13, < 16) - pedump - ruby-progressbar (~> 1.7) - thor (>= 0.18, < 2.0) - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.3.8) - awesome_print (1.8.0) - aws-eventstream (1.1.0) - aws-partitions (1.301.0) - aws-sdk-core (3.94.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.63.0) - aws-sdk-core (~> 3, >= 3.83.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.2) - aws-eventstream (~> 1.0, >= 1.0.2) - berkshelf (3.3.0) - addressable (~> 2.3.4) - berkshelf-api-client (~> 1.2) - buff-config (~> 1.0) - buff-extensions (~> 1.0) - buff-shell_out (~> 0.1) - celluloid (~> 0.16.0) - celluloid-io (~> 0.16.1) - cleanroom (~> 1.0) - faraday (~> 0.9.0) - httpclient (~> 2.6.0) - minitar (~> 0.5.4) - octokit (~> 3.0) - retryable (~> 2.0) - ridley (~> 4.0) - solve (~> 1.1) - thor (~> 0.19) - berkshelf-api-client (1.3.1) - faraday (~> 0.9.1) - httpclient (~> 2.6.0) - buff-config (1.0.1) - buff-extensions (~> 1.0) - varia_model (~> 0.4) - buff-extensions (1.0.0) - buff-ignore (1.2.0) - buff-ruby_engine (0.1.0) - buff-shell_out (0.2.0) - buff-ruby_engine (~> 0.1.0) - builder (3.2.4) - celluloid (0.16.0) - timers (~> 4.0.0) - celluloid-io (0.16.2) - celluloid (>= 0.16.0) - nio4r (>= 1.1.0) - chef-cleanroom (1.0.2) - chef-config (15.8.23) - addressable - chef-utils (= 15.8.23) - fuzzyurl - mixlib-config (>= 2.2.12, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) - tomlrb (~> 1.2) - chef-sugar (5.1.9) - chef-utils (15.8.23) - citrus (3.0.2) - cleanroom (1.0.0) - dep-selector-libgecode (1.3.5) - dep_selector (1.0.6) - dep-selector-libgecode (~> 1.0) - ffi (~> 1.9) - diff-lcs (1.3) - equatable (0.6.1) - erubi (1.9.0) - erubis (2.7.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - ffi (1.12.2) - ffi-yajl (2.3.3) - libyajl2 (~> 1.2) - fuzzyurl (0.9.0) - gssapi (1.3.0) - ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) - hashie (3.6.0) - hitimes (2.0.0) - httpclient (2.6.0.1) - iostruct (0.0.4) - ipaddress (0.8.3) - jmespath (1.4.0) - json (2.3.0) - kitchen-vagrant (0.21.1) - test-kitchen (~> 1.4) - libyajl2 (1.2.0) - license-acceptance (1.0.13) - pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) - license_scout (1.1.8) - ffi-yajl (~> 2.2) - mixlib-shellout (>= 2.2, < 4.0) - toml-rb (>= 1, < 3) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - minitar (0.5.4) - mixlib-authentication (3.0.6) - mixlib-cli (2.1.6) - mixlib-config (3.0.6) - tomlrb - mixlib-install (3.11.26) - mixlib-shellout - mixlib-versioning - thor - mixlib-log (3.0.8) - mixlib-shellout (2.4.4) - mixlib-versioning (1.2.12) - multi_json (1.14.1) - multipart-post (2.1.1) - necromancer (0.5.1) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) - net-ssh (4.2.0) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-telnet (0.1.1) - nio4r (2.5.2) - nori (2.6.0) - octokit (3.8.0) - sawyer (~> 0.6.0, >= 0.5.3) - ohai (15.9.1) - chef-config (>= 12.8, < 16) - ffi (~> 1.9) - ffi-yajl (~> 2.2) - ipaddress - mixlib-cli (>= 1.7.0) - mixlib-config (>= 2.0, < 4.0) - mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) - plist (~> 3.1) - systemu (~> 2.6.4) - wmi-lite (~> 1.0) - open_uri_redirections (0.2.1) - pastel (0.7.3) - equatable (~> 0.6) - tty-color (~> 0.5) - pedump (0.5.4) - awesome_print - iostruct (>= 0.0.4) - multipart-post (>= 2.0.0) - progressbar - rainbow - zhexdump (>= 0.0.2) - plist (3.5.0) - progressbar (1.10.1) - rainbow (3.0.0) - rake (10.1.1) - retryable (2.0.4) - ridley (4.4.2) - addressable - buff-config (~> 1.0) - buff-extensions (~> 1.0) - buff-ignore (~> 1.1) - buff-shell_out (~> 0.1) - celluloid (~> 0.16.0) - celluloid-io (~> 0.16.1) - chef-config - erubis - faraday (~> 0.9.0) - hashie (>= 2.0.2, < 4.0.0) - httpclient (~> 2.6) - json (>= 1.7.7) - mixlib-authentication (>= 1.3.0) - retryable (~> 2.0) - semverse (~> 1.1) - varia_model (~> 0.4.0) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-its (1.3.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - ruby-progressbar (1.10.1) - rubyntlm (0.6.2) - rubyzip (2.2.0) - sawyer (0.6.0) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - semverse (1.2.1) - serverspec (2.18.0) - multi_json - rspec (~> 3.0) - rspec-its - specinfra (~> 2.35) - sfl (2.3) - solve (1.2.1) - dep_selector (~> 1.0) - semverse (~> 1.1) - specinfra (2.82.10) - net-scp - net-ssh (>= 2.7) - net-telnet (= 0.1.1) - sfl - strings (0.1.8) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) - unicode_utils (~> 1.4) - strings-ansi (0.2.0) - systemu (2.6.5) - test-kitchen (1.25.0) - license-acceptance (~> 1.0, >= 1.0.11) - mixlib-install (~> 3.6) - mixlib-shellout (>= 1.2, < 3.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 5.0) - net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) - winrm (~> 2.0) - winrm-elevated (~> 1.0) - winrm-fs (~> 1.1) - thor (0.20.3) - timers (4.0.4) - hitimes - toml-rb (2.0.1) - citrus (~> 3.0, > 3.0) - tomlrb (1.2.9) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) - tty-cursor (~> 0.7) - tty-color (0.5.1) - tty-cursor (0.7.1) - tty-prompt (0.20.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) - tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.7.1) - unicode-display_width (1.6.1) - unicode_utils (1.4.0) - varia_model (0.4.1) - buff-extensions (~> 1.0) - hashie (>= 2.0.2, < 4.0.0) - winrm (2.3.4) - builder (>= 2.1.2) - erubi (~> 1.8) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.1) - erubi (~> 1.8) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.4) - erubi (~> 1.8) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 2.0) - winrm (~> 2.0) - wisper (2.0.1) - wmi-lite (1.0.5) - zhexdump (0.0.2) - -PLATFORMS - ruby - -DEPENDENCIES - berkshelf (~> 3.0) - kitchen-vagrant (~> 0.14) - omnibus! - omnibus-software! - open_uri_redirections (= 0.2.1) - rake (~> 10.1.0) - serverspec (~> 2.18.0) - test-kitchen (~> 1.2) - -BUNDLED WITH - 2.0.2 diff --git a/README.md b/README.md index d47adae2..02fd3848 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ td-agent package is based on [Omnibus-ruby](https://github.com/opscode/omnibus-r ## Installation -We'll assume you have Ruby 2.6 and Bundler installed. First ensure all required gems are installed and ready to use: +We'll assume you have Ruby 2.7 and Bundler installed. First ensure all required gems are installed and ready to use: ```shell $ bundle install --binstubs diff --git a/build/x86_64_amzn-2016.09/Dockerfile b/build/x86_64_amzn-2016.09/Dockerfile index 610813d7..cc91e330 100644 --- a/build/x86_64_amzn-2016.09/Dockerfile +++ b/build/x86_64_amzn-2016.09/Dockerfile @@ -25,5 +25,5 @@ RUN yum -y install \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ && yum -y clean all diff --git a/build/x86_64_centos6/Dockerfile b/build/x86_64_centos6/Dockerfile index ccddb073..25035ade 100644 --- a/build/x86_64_centos6/Dockerfile +++ b/build/x86_64_centos6/Dockerfile @@ -44,5 +44,5 @@ RUN yum -y install \ # RVM requires running in a login shell. # Force RVM to link in a newer openssl version. && /bin/bash -l -c 'sed -i "/openssl_version/s/1.0.1i/1.0.1n/" $rvm_path/config/db && rvm pkg install openssl' \ - && /bin/bash -l -c 'rvm requirements && rvm install 2.5.3 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update' \ + && /bin/bash -l -c 'rvm requirements && rvm install 2.7.6 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update' \ && yum -y clean all diff --git a/build/x86_64_centos7/Dockerfile b/build/x86_64_centos7/Dockerfile index 07069b1e..b557de6a 100644 --- a/build/x86_64_centos7/Dockerfile +++ b/build/x86_64_centos7/Dockerfile @@ -25,5 +25,5 @@ RUN yum -y install \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ && yum -y clean all diff --git a/build/x86_64_centos8/Dockerfile b/build/x86_64_centos8/Dockerfile index eefc51a6..b98d09e8 100644 --- a/build/x86_64_centos8/Dockerfile +++ b/build/x86_64_centos8/Dockerfile @@ -32,5 +32,5 @@ RUN yum -y install \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ && yum -y clean all diff --git a/build/x86_64_debian/Dockerfile b/build/x86_64_debian/Dockerfile index c73e421b..ee26c531 100644 --- a/build/x86_64_debian/Dockerfile +++ b/build/x86_64_debian/Dockerfile @@ -24,5 +24,5 @@ RUN apt-get -y update \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ && apt-get -y clean diff --git a/build/x86_64_sles12/Dockerfile b/build/x86_64_sles12/Dockerfile index 5bdf0ee9..9b8715b2 100644 --- a/build/x86_64_sles12/Dockerfile +++ b/build/x86_64_sles12/Dockerfile @@ -29,7 +29,7 @@ RUN zypper modifyrepo -d 'OSS Update' \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ # Pretend we're on SLES 12. && /bin/sed -i -e 's/VERSION = 42.3/VERSION = 12/' /etc/SuSE-release \ && /bin/sed -i -e 's/VERSION="42.3"/VERSION="12-SP3"/' -e 's/VERSION_ID="42.3"/VERSION_ID="12.3"/' /etc/os-release \ diff --git a/build/x86_64_sles15/Dockerfile b/build/x86_64_sles15/Dockerfile index ea89fdd2..9d35821e 100644 --- a/build/x86_64_sles15/Dockerfile +++ b/build/x86_64_sles15/Dockerfile @@ -24,7 +24,7 @@ RUN zypper -n refresh \ && /bin/bash get-rvm-io.sh stable \ && rm -f get-rvm-io.sh \ # RVM requires running in a login shell. - && /bin/bash -l -c "rvm requirements && rvm install 2.5.3 && gem install bundler --no-document && gem update" \ + && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \ # Pretend we're on SLES 15. && /bin/sed -i -e 's/VERSION="15.1"/VERSION="15-SP1"/' /etc/os-release \ && zypper -n clean diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb index 428697e2..a9040c01 100644 --- a/config/projects/google-fluentd.rb +++ b/config/projects/google-fluentd.rb @@ -14,7 +14,7 @@ # creates required build directories dependency "preparation" -override :ruby, :version => '2.6.10' +override :ruby, :version => '2.7.6' override :zlib, :version => '1.2.8' override :rubygems, :version => '3.0.0' override :postgresql, :version => '9.6.24' diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 455917bc..301123f9 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -25,14 +25,18 @@ # https://bugs.ruby-lang.org/issues/11869 # - the current status of 2.3.x is that it downloads but fails to compile. # - verify that all ffi libs are available for your version on all platforms. -# - Note: When updating major version (i.e. 2.2 -> 2.3), gem_dir_version must be -# updated to 2.X.0 in td.rb, td-agent-cleanup.rb, td-agent-files.rb, and -# td-agent-ui.rb. -default_version "2.6.10" + +# Note: When updating Ruby minor version (i.e. 2.2 -> 2.3), gem_dir_version must be +# updated to 2.X.0 in the following file paths: +# config/software/td.rb +# config/software/td-agent-cleanup.rb +# config/software/td-agent-files.rb +# config/software/td-agent-ui.rb +default_version "2.7.6" fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false -dependency "patch" if solaris_10? +dependency "patch" if solaris2? && platform_version.satisfies?("= 5.10") dependency "ncurses" unless windows? || version.satisfies?(">= 2.1") dependency "zlib" dependency "openssl" @@ -45,7 +49,9 @@ # and that's the only one we will ever use. dependency "libiconv" -# The checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases. +# The SHA256 checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases. +version("2.7.6") { source sha256: "e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" } + version("2.6.10") { source sha256: "0dc609f263d49c4176d5725deefc337273676395985b5e017789373e8cadf16e" } version("2.6.9") { source sha256: "eb7bae7aac64bf9eb2153710a4cafae450ccbb62ae6f63d573e1786178b0efbb" } version("2.6.8") { source sha256: "1807b78577bc08596a390e8a41aede37b8512190e05c133b17d0501791a8ca6d" } @@ -140,7 +146,7 @@ env["SOLIBS"] = "-lm -lc" # need to use GNU m4, default m4 doesn't work env["M4"] = "/opt/freeware/bin/m4" -elsif solaris_10? +elsif solaris2? && platform_version.satisfies?("= 5.10") if sparc? # Known issue with rubby where too much GCC optimization blows up miniruby on sparc env["CFLAGS"] << " -std=c99 -O0 -g -pipe -mcpu=v9" @@ -164,18 +170,18 @@ patch_env = env.dup patch_env["PATH"] = "/opt/freeware/bin:#{env['PATH']}" if aix? - if solaris_10? && version.satisfies?(">= 2.1") + if solaris2? && platform_version.satisfies?("= 5.10") && version.satisfies?(">= 2.1") patch source: "ruby-no-stack-protector.patch", plevel: 1, env: patch_env - elsif solaris_10? && version =~ /^1.9/ + elsif solaris2? && platform_version.satisfies?("= 5.10") && version =~ /^1.9/ patch source: "ruby-sparc-1.9.3-c99.patch", plevel: 1, env: patch_env - elsif solaris_11? && version =~ /^2.1/ + elsif solaris2? && platform_version.satisfies?("= 5.11") && version =~ /^2.1/ patch source: "ruby-solaris-linux-socket-compat.patch", plevel: 1, env: patch_env end # wrlinux7/ios_xr build boxes from Cisco include libssp and there is no way to # disable ruby from linking against it, but Cisco switches will not have the # library. Disabling it as we do for Solaris. - if ios_xr? && version.satisfies?(">= 2.1") + if RUBY_PLATFORM.match("ios_xr") && version.satisfies?(">= 2.1") patch source: "ruby-no-stack-protector.patch", plevel: 1, env: patch_env end diff --git a/config/software/td-agent-cleanup.rb b/config/software/td-agent-cleanup.rb index 5a0ca5f3..7da2968c 100644 --- a/config/software/td-agent-cleanup.rb +++ b/config/software/td-agent-cleanup.rb @@ -6,7 +6,7 @@ build do block do project_name = project.name - gem_dir_version = "2.6.0" + gem_dir_version = "2.7.0" # remove unnecessary files FileUtils.rm_f(Dir.glob("/opt/#{project_name}/embedded/lib/ruby/gems/#{gem_dir_version}/cache/*.gem")) diff --git a/config/software/td-agent-files.rb b/config/software/td-agent-files.rb index 545f5c01..5e509092 100644 --- a/config/software/td-agent-files.rb +++ b/config/software/td-agent-files.rb @@ -14,7 +14,7 @@ install_path = project.install_dir # for ERB project_name = project.name # for ERB project_name_snake = project.name.gsub('-', '_') # for variable names in ERB - gem_dir_version = "2.6.0" + gem_dir_version = "2.7.0" use_systemd = ohai["os"] == "linux" && ohai["platform_family"] == "suse" template = ->(*parts) { File.join('templates', *parts) } diff --git a/config/software/td-agent-ui.rb b/config/software/td-agent-ui.rb index 298932c2..2b59cd29 100644 --- a/config/software/td-agent-ui.rb +++ b/config/software/td-agent-ui.rb @@ -14,7 +14,7 @@ project_name = project.name # for ERB project_name_snake = project.name.gsub('-', '_') # for variable names in ERB project_name_snake_upcase = project_name_snake.upcase - gem_dir_version = "2.6.0" + gem_dir_version = "2.7.0" template = ->(*parts) { File.join('templates', *parts) } generate_from_template = ->(dst, src, erb_binding, opts={}) { diff --git a/config/software/td.rb b/config/software/td.rb index 16631a91..006c4764 100644 --- a/config/software/td.rb +++ b/config/software/td.rb @@ -13,7 +13,7 @@ project_name = project.name # for ERB project_name_snake = project.name.gsub('-', '_') # for variable names in ERB project_name_snake_upcase = project_name_snake.upcase - gem_dir_version = "2.6.0" + gem_dir_version = "2.7.0" template = ->(*parts) { File.join('templates', *parts) } generate_from_template = ->(dst, src, erb_binding, opts={}) {