Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Patching resolv.rb to conditionally load (#1881)" #1882

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Revert "Patching resolv.rb to conditionally load (#1881)" #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions config/patches/ruby/ruby-win32_resolv.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions config/software/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,6 @@
patch source: "ruby-win32_warning_removal.patch", plevel: 1, env: patch_env
end

# We fixed a bug regarding Windows fqdn resolution in Ohai on the 17-stable branch.
# That Ohai update requires the Resolv class. The 'resolv' class unconditionally
# loads the Win32::Registry class as a dependency.
# Chef Infra already loads Win32::Registry and has a monkeypatch for the export_string method.
# When the Resolv class loads again in Ohai, it overwrites the monkeypatch and that
# leads to registry encoding/decoding errors - Base Ruby classes return text encoded in
# UTF-16LE format and we need UTF-8.
# Here we patch the Ruby Win32/Reolv.rb file to make reloading the Win32::Registry class
# conditional and therefore prevent the monkeypatch from being overwritten.
if windows? && version.satisfies?("~> 3.0.0")
patch source: "ruby-win32_resolv.patch", plevel: 1, env: patch_env
end

# RHEL6 has a base compiler that does not support -fstack-protector-strong, but we
# cannot build modern ruby on the RHEL6 base compiler, and the configure script
# determines that it supports that flag and so includes it and then ultimately
Expand Down