From fc2947ff5ad5923f89ddcd124ae2de4316eb3f07 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 18 Jun 2024 17:07:46 +0900 Subject: [PATCH] msi: update bundled ruby to 3.2.4 ref. https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ drop already merged patch. See https://github.com/oneclick/rubyinstaller2/pull/375 Signed-off-by: Kentaro Hayashi --- fluent-package/config.rb | 9 +++--- fluent-package/msi/Dockerfile | 2 +- ...nvalid-registry-key-while-detecting-.patch | 29 ------------------- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 fluent-package/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch diff --git a/fluent-package/config.rb b/fluent-package/config.rb index 14fe57ff7..fdbd19ada 100644 --- a/fluent-package/config.rb +++ b/fluent-package/config.rb @@ -23,8 +23,8 @@ BUNDLER_VERSION= "2.3.27" # https://www.ruby-lang.org/en/downloads/ (tar.gz) -BUNDLED_RUBY_VERSION = "3.2.3" -BUNDLED_RUBY_SOURCE_SHA256SUM = "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" +BUNDLED_RUBY_VERSION = "3.2.4" +BUNDLED_RUBY_SOURCE_SHA256SUM = "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" BUNDLED_RUBY_PATCHES = [ # An example entry: @@ -32,11 +32,10 @@ ] # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES) -BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.3-1" -BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "cf106d718499125a55dff82daee40e7744ed224694c96036765b84a3ac4f654c" +BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.4-1" +BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "20f4c87fea871cadb3286da6c46cd018c12b9d444f0c40b3332b3f2939ce31b9" # Files under rubyinstaller/ are patches for RubyInstaller's binary package. # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES. BUNDLED_RUBY_INSTALLER_PATCHES = [ - ["rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch", [">= 0"]], ] diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile index cf8c258e8..41a98b791 100644 --- a/fluent-package/msi/Dockerfile +++ b/fluent-package/msi/Dockerfile @@ -31,7 +31,7 @@ RUN \ choco install -y git wixtoolset 7zip && \ choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System' && \ choco install -y msys2 --params /NoUpdate --version=20230718.0.0 && \ - choco install ruby -y --version=3.1.3.1 && \ + choco install ruby -y --version=3.2.4.1 && \ refreshenv && \ ridk install 3 && \ gem install --no-document --force bundler builder diff --git a/fluent-package/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch b/fluent-package/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch deleted file mode 100644 index f8c3684bb..000000000 --- a/fluent-package/patches/rubyinstaller/0001-Avoid-crash-on-invalid-registry-key-while-detecting-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c034595bc14c6862e2b83a0be48a3751cf1e350b Mon Sep 17 00:00:00 2001 -From: Takuro Ashie -Date: Tue, 20 Feb 2024 12:03:20 +0900 -Subject: [PATCH] Avoid crash on invalid registry key while detecting MSYS2 - installation - -https://github.com/oneclick/rubyinstaller2/issues/372 - -Signed-off-by: Takuro Ashie ---- - .../3.2.0/ruby_installer/runtime/msys2_installation.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/ruby/site_ruby/3.2.0/ruby_installer/runtime/msys2_installation.rb b/lib/ruby/site_ruby/3.2.0/ruby_installer/runtime/msys2_installation.rb -index cbd48981..83ab7ce0 100644 ---- a/lib/ruby/site_ruby/3.2.0/ruby_installer/runtime/msys2_installation.rb -+++ b/lib/ruby/site_ruby/3.2.0/ruby_installer/runtime/msys2_installation.rb -@@ -86,6 +86,8 @@ module Runtime # Rewrite from D:/a/rubyinstaller2/rubyinstaller2/lib/ruby_instal - # Ignore entries without valid installer data or broken character encoding - end - end -+ rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError -+ # Avoid crash even if subkey includes inconvertible characters to internal encoding - end - rescue Win32::Registry::Error - end --- -2.34.1 -