From 831176fbfe32b497f1e60dea2768f63c7e748fe4 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sun, 4 Dec 2022 21:58:53 +0530 Subject: [PATCH] Use openssl from the archive (patch Gemfile) --- .../patches/Gemfile/0210-comment-out-openssl.patch | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/Gemfile/0210-comment-out-openssl.patch diff --git a/debian/patches/Gemfile/0210-comment-out-openssl.patch b/debian/patches/Gemfile/0210-comment-out-openssl.patch new file mode 100644 index 0000000000..3d8e8702da --- /dev/null +++ b/debian/patches/Gemfile/0210-comment-out-openssl.patch @@ -0,0 +1,13 @@ +We have to use openssl available in the archive + +--- a/Gemfile ++++ b/Gemfile +@@ -19,7 +19,7 @@ + + # Pin openssl to match the version bundled with our supported Rubies. + # See https://stdgems.org/openssl/#gem-version. +-gem 'openssl', '2.2.1' ++# gem 'openssl', '2.2.1' + # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. + # Since the latest version caused problems with GitLab, we pin this to an older + # version for now. diff --git a/debian/patches/series b/debian/patches/series index 6b33d56088..d3eb96a7fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,7 @@ Gemfile/0160-relax-rexml.patch Gemfile/0180-add-parser-gem.patch Gemfile/0190-relax-rdoc.patch Gemfile/0200-add-gitlab-dangerfiles.patch +Gemfile/0210-comment-out-openssl.patch nodejs/0010-set-webpack-root.patch nodejs/0020-remove-dev-dependencies.patch nodejs/0030-use-yarnpkg.patch