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.

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

Backport to 16.7.x : Add patch for Ruby to fix issue on running on legacy kernel #2898

Merged

Conversation

kkimurak
Copy link
Contributor

@kkimurak kkimurak commented Feb 7, 2024

This PR is backport of #2897 to 16.7.x branch.

This PR contains following changes:

  • Revise build patch structure to allow patching ruby
    Currently we can apply some patches only for gitlab itself. This change changes the build patch folder tree and makes it similar to runtime/config, allowing build patches to be applied to both gitlab and ruby.
  • Add patch to fix behavior of SecureRandom.gen_random_openssl(n) (See ruby/ruby@64e503e).
    This commit is originally merged into upstream (Ruby 3.3.x) but can be applied to 3.1.x or later, and neccessary to run it on legacy kernel (For example, the one used by Synology NAS that claims to be able to operate sameersbn/gitlab)

@kkimurak kkimurak changed the title Backport to 16.7.x : Add patch for Ruby Ruby patching backport16.7.x Backport to 16.7.x : Add patch for Ruby to fix issue on running on legacy kernel Feb 7, 2024
@kkimurak kkimurak mentioned this pull request Feb 8, 2024
@sachilles
Copy link
Collaborator

@kkimurak Could you be so kind and fix the merge conflict? (Did I caused the conflict?)

to allow patching each middleware or library

Just move patches to assets/build/patches/gitlabhq
Folder name are matched to assets/runtime/config
Backport: fix behavior of `SecureRandom.gen_random_openssl(n)`
commit:
ruby/ruby@64e503e

This has been merged into the Ruby 3.3 release, but Ruby (at least) 3.0 and later are affected by the issues fixed by this commit.
@kkimurak
Copy link
Contributor Author

kkimurak commented Feb 12, 2024

@sachilles Sorry for late, conflictions have been fixed. #2895 modified one of patch and this PR tried to move the patch, conflict occurred then. I should have written a patch so that we could merge them all at once..

@sachilles
Copy link
Collaborator

@kkimurak Never mind and (as always) thanks for your contribution!

@sachilles sachilles merged commit 2c619ca into sameersbn:support/16.7.x Feb 12, 2024
3 checks passed
@kkimurak kkimurak deleted the ruby-patching_backport16.7.x branch February 12, 2024 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants