From 23fffdce9cdbbca263fb026bf81569a0f465736d Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Mon, 6 Mar 2023 15:24:55 +0530
Subject: [PATCH] Revert "Use openssl 3.0.2 from rubygems.org as workaround for
 #1032070"

This reverts commit 08fe0d965d01db3f4ece15c664b54c169890eda7.
---
 debian/control         | 2 --
 debian/gitlab.postinst | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/debian/control b/debian/control
index 06d5375167..433f6daa36 100644
--- a/debian/control
+++ b/debian/control
@@ -85,8 +85,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  gitlab-common (>= 15.7~),
  ruby (>= 1:2.7~),
    rubygems-integration (>= 1.18~),
-# for building openssl 3.0.2, see #1032070
- ruby-dev,
  lsb-base (>= 3.0-6),
  rake (>= 12.3.0~),
  bundler (>= 1.17.3~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index a074cda4ef..e9f2690822 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -85,12 +85,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/n
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.3.2 "^deckar01-task_list$" >/dev/null; then gem install -v 2.3.2 deckar01-task_list; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.53.0 "^google-api-client$" >/dev/null; then gem install -v 0.53.0 google-api-client; fi"
 
-# We need a newer openssl in ruby 3.1, see #1032070
-ruby_version=$(ruby -e 'print "#{RUBY_VERSION}"')
-if [ $(printf %.1s "${ruby_version}") -ge 3 ]; then
-  runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.0.2 "^openssl$" >/dev/null; then gem install -v 3.0.2 openssl; fi"
-fi
-
 # Uninstall rack 3.x
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~>3.0' "^rack$" >/dev/null; then gem uninstall -v '~>3.0' rack; fi"