From c532c615941d477e2cb65088de128a619ea281d3 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Sun, 4 Jan 2026 12:12:17 +0100 Subject: [PATCH 1/2] Remove libgcc_s_seh-1.dll It is no longer necessary. --- recipes/sandbox/rubyinstaller-2.3.4-x64-msvcrt.files | 1 - recipes/sandbox/rubyinstaller-3.1.7-x64-ucrt.files | 1 - recipes/sandbox/rubyinstaller-3.2.9-x64-ucrt.files | 1 - recipes/sandbox/rubyinstaller-3.3.10-x64-ucrt.files | 1 - recipes/sandbox/rubyinstaller-3.4.8-x64-ucrt.files | 1 - recipes/sandbox/rubyinstaller-4.0.0-x64-ucrt.files | 1 - recipes/sandbox/rubyinstaller-head-x64-ucrt.files | 1 - 7 files changed, 7 deletions(-) diff --git a/recipes/sandbox/rubyinstaller-2.3.4-x64-msvcrt.files b/recipes/sandbox/rubyinstaller-2.3.4-x64-msvcrt.files index 0ed5d8013..60a497160 100644 --- a/recipes/sandbox/rubyinstaller-2.3.4-x64-msvcrt.files +++ b/recipes/sandbox/rubyinstaller-2.3.4-x64-msvcrt.files @@ -1,4 +1,3 @@ -bin/libgcc_s_seh-1.dll bin/libwinpthread-1.dll bin/x64-msvcrt-ruby230.dll lib/libx64-msvcrt-ruby230.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.1.7-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.1.7-x64-ucrt.files index 09e9ad431..4dc208598 100644 --- a/recipes/sandbox/rubyinstaller-3.1.7-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.1.7-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-1_1-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-1_1-x64.dll bin/x64-ucrt-ruby310.dll lib/libx64-ucrt-ruby310.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.2.9-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.2.9-x64-ucrt.files index 5cbc322fc..9a9fb8dba 100644 --- a/recipes/sandbox/rubyinstaller-3.2.9-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.9-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-3-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby320.dll lib/libx64-ucrt-ruby320.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.3.10-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.3.10-x64-ucrt.files index 06dffce74..a33eddd09 100644 --- a/recipes/sandbox/rubyinstaller-3.3.10-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.3.10-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-3-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby330.dll lib/libx64-ucrt-ruby330.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.4.8-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.4.8-x64-ucrt.files index b78e30a1f..c8f0d0228 100644 --- a/recipes/sandbox/rubyinstaller-3.4.8-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.4.8-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-3-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby340.dll lib/libx64-ucrt-ruby340.dll.a diff --git a/recipes/sandbox/rubyinstaller-4.0.0-x64-ucrt.files b/recipes/sandbox/rubyinstaller-4.0.0-x64-ucrt.files index 04693ef33..fccc40da1 100644 --- a/recipes/sandbox/rubyinstaller-4.0.0-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-4.0.0-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-3-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby400.dll lib/libx64-ucrt-ruby400.dll.a diff --git a/recipes/sandbox/rubyinstaller-head-x64-ucrt.files b/recipes/sandbox/rubyinstaller-head-x64-ucrt.files index 99a8c049c..d8a35a6a7 100644 --- a/recipes/sandbox/rubyinstaller-head-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-head-x64-ucrt.files @@ -1,5 +1,4 @@ bin/libcrypto-3-x64.dll -bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby410.dll lib/libx64-ucrt-ruby410.dll.a From 876e40b33e33d313a90596ea23c4a51d2590e51c Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Sun, 4 Jan 2026 12:40:09 +0100 Subject: [PATCH 2/2] CI: Apply UTF8-CLI patch to ruby/spec And exclude spec which failes on ruby-3.2.9 like so: ``` 1) URI#select conforms to the MatzRuby tests FAILED Expected "http://oof@baz" == "***baz" to be truthy but was false D:/a/rubyinstaller2/rubyinstaller2/ruby/spec/ruby/library/uri/set_component_spec.rb:9:in `block (2 levels) in ' D:/a/rubyinstaller2/rubyinstaller2/ruby/spec/ruby/library/uri/set_component_spec.rb:5:in `' ``` --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ce188b55..82ed2bc49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,9 @@ jobs: ridk enable if (-not ([string]::IsNullOrWhiteSpace($env:run_mri_spec))) { git clone --depth 1 https://github.com/ruby/ruby -b $env:run_mri_spec && - env --unset=RUBYOPT ruby -C ruby/spec/ruby ../mspec/bin/mspec -I../../tool/lib -j --exclude "CVE-2020-10663 is resisted by only creating custom objects if passed create_additions: true or using JSON.load" + cd ruby && + curl https://raw.githubusercontent.com/oneclick/rubyinstaller2-packages/refs/heads/master/mingw-w64-ruby40/0016-Windows-Change-command-line-interface-to-UTF-8-specs.patch | patch -p1 && + env --unset=RUBYOPT ruby -C spec/ruby ../mspec/bin/mspec -I../../tool/lib -j --exclude "CVE-2020-10663 is resisted by only creating custom objects if passed create_additions: true or using JSON.load" --exclude "URI#select conforms to the MatzRuby tests" } - name: Verify that the used CA list is still the latest.