diff --git a/debian/patches/0499-80-relax-bcrypt.patch b/debian/patches/0499-80-relax-bcrypt.patch new file mode 100644 index 0000000000..44a9d6183c --- /dev/null +++ b/debian/patches/0499-80-relax-bcrypt.patch @@ -0,0 +1,12 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -23,8 +23,7 @@ + + # Authentication libraries + gem 'devise', '~> 4.7.2' +-# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) +-gem 'bcrypt', '3.1.12' ++gem 'bcrypt', '~> 3.1', '>= 3.1.14' + gem 'doorkeeper', '~> 5.3.0' + gem 'doorkeeper-openid_connect', '~> 1.7.4' + gem 'omniauth', '~> 1.8' diff --git a/debian/patches/0499-90-relax-webrick.patch b/debian/patches/0499-90-relax-webrick.patch new file mode 100644 index 0000000000..debe30d0c3 --- /dev/null +++ b/debian/patches/0499-90-relax-webrick.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -315,7 +315,7 @@ + # Metrics + group :metrics do + gem 'method_source', '~> 1.0', require: false +- gem 'webrick', '~> 1.6.1', require: false ++ gem 'webrick', '~> 1.6', require: false + + # Prometheus + gem 'prometheus-client-mmap', '~> 0.12.0' diff --git a/debian/patches/series b/debian/patches/series index 7996222e81..d95465ad9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,6 +16,8 @@ 0499-30-remove-guard-rspec.patch 0499-40-relax-rouge.patch 0499-70-relax-graphlient.patch +0499-80-relax-bcrypt.patch +0499-90-relax-webrick.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch