From 6940c139b1dd1cbb313ad328012bb272c599b648 Mon Sep 17 00:00:00 2001 From: Ling Huang Date: Fri, 8 Jul 2022 11:00:01 -0400 Subject: [PATCH] Bump Ruby version from 2.6.9 to 2.6.10. (#383) --- config/projects/google-fluentd.rb | 2 +- config/software/ruby.rb | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb index ac52bd13..2e2b2075 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.9' +override :ruby, :version => '2.6.10' override :zlib, :version => '1.2.8' override :rubygems, :version => '3.0.0' override :postgresql, :version => '9.3.5' diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 5127d9e3..455917bc 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -28,7 +28,7 @@ # - 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.9" +default_version "2.6.10" fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false @@ -45,7 +45,8 @@ # and that's the only one we will ever use. dependency "libiconv" -# The checksums below are for the *.tar.gz packages. +# The checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases. +version("2.6.10") { source sha256: "0dc609f263d49c4176d5725deefc337273676395985b5e017789373e8cadf16e" } version("2.6.9") { source sha256: "eb7bae7aac64bf9eb2153710a4cafae450ccbb62ae6f63d573e1786178b0efbb" } version("2.6.8") { source sha256: "1807b78577bc08596a390e8a41aede37b8512190e05c133b17d0501791a8ca6d" } version("2.6.7") { source sha256: "e4227e8b7f65485ecb73397a83e0d09dcd39f25efd411c782b69424e55c7a99e" } @@ -219,8 +220,8 @@ configure_command << "--with-ext=psych" if version.satisfies?("< 2.3") configure_command << "--with-bundled-md5" if fips_enabled - # resolve C99 code accidentally introduced in Ruby 2.6.7 and it's still in 2.6.8 :( - patch source: "ruby-2.6.7_c99.patch", plevel: 1, env: patch_env if version.satisfies?("~> 2.6.7") + # resolve C99 code accidentally introduced in Ruby 2.6.7. No longer an issue for >= 2.6.10 + patch source: "ruby-2.6.7_c99.patch", plevel: 1, env: patch_env if version.satisfies?("~> 2.6.7", "< 2.6.10") if aix? # need to patch ruby's configure file so it knows how to find shared libraries