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

Updating Patch for resolv.rb #1884

Merged
merged 6 commits into from
Mar 27, 2024
Merged

Updating Patch for resolv.rb #1884

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9536675
The patcher cannot find the files to patch. Correcting the path
johnmccrae Mar 27, 2024
e68febb
The patcher cannot find the files to patch. Correcting the path
johnmccrae Mar 27, 2024
a7bb1a5
The patcher cannot find the files to patch. Correcting the path
johnmccrae Mar 27, 2024
93b0470
The patcher cannot find the files to patch. Correcting the path
johnmccrae Mar 27, 2024
8d5c42f
The patcher cannot find the files to patch. Had to update the plevel …
johnmccrae Mar 27, 2024
06081d5
Merge branch 'main' into jfm/chef17-patch-update
johnmccrae Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/software/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
# 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
patch source: "ruby-win32_resolv.patch", plevel: 0, env: patch_env
end

# RHEL6 has a base compiler that does not support -fstack-protector-strong, but we
Expand Down