From 786deddd56a5ab90c757083af6c0a7755e94fb51 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Fri, 19 Aug 2022 14:06:23 +0530
Subject: [PATCH] Use more packaged ruby gem depemdencies

---
 debian/control         | 12 +++++++-----
 debian/gitlab.postinst |  6 ------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 2beb08e13e..e3dc014fc5 100644
--- a/debian/control
+++ b/debian/control
@@ -157,7 +157,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # GPG
  ruby-gpgme (>= 2.0.19~),
 # LDAP Auth
- ruby-omniauth-ldap (>= 2.1.1~),
+ ruby-omniauth-ldap (>= 2.2~),
    ruby-ntlm (>= 0.6.1~),
  ruby-net-ldap (>= 0.16.3~),
 # API
@@ -236,7 +236,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-diff-match-patch (>= 0.1~),
 # Application server
  ruby-rack (>= 2.2.4~),
- ruby-rack-timeout (>= 0.5.1~),
+ ruby-rack-timeout (>= 0.6.0~),
  puma (>= 5.6.2~),
  ruby-puma-worker-killer (>= 0.3.1~),
  ruby-sd-notify,
@@ -364,9 +364,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Metrics
  ruby-method-source (>= 1.0~),
  ruby-webrick (>= 1.6.1~),
- ruby-prometheus-client-mmap (>= 0.15~),
+ ruby-prometheus-client-mmap (>= 0.16.2~),
 #
- ruby-warning,
+ ruby-warning (>= 1.3~),
 #
  ruby-octokit (>= 4.15~),
 #
@@ -383,6 +383,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-activerecord-explain-analyze (>= 0.1~),
 # OAuth
  ruby-oauth2 (>= 1.4.4~),
+# oauth2 2.0 is installed from rubygems.org
+   ruby-omniauth-oauth2 (>= 1.7.3~),
 # Health check
  ruby-health-check (>= 3.0~),
 # System information
@@ -430,7 +432,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-json (>= 2.5.1~),
  ruby-json-schema (>= 2.8.1-2~),
  ruby-json-schemer (>= 0.2.12~),
- ruby-oj (>= 3.10.6~),
+ ruby-oj (>= 3.13.19~),
  ruby-multi-json (>= 1.14.1~),
  ruby-yajl (>= 1.4.1~),
  ruby-webauthn (>= 2.5~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 8c11d5fcb3..ef68d1b7ec 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -72,18 +72,12 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^gitlab-dangerfiles$" >/de
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 7.2 "^elasticsearch-model$" >/dev/null; then gem install -v 7.2 elasticsearch-model; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 7.2 "^elasticsearch-rails$" >/dev/null; then gem install -v 7.2 elasticsearch-rails; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.14 "^fog-aws$" >/dev/null; then gem install -v 3.14 fog-aws; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.6.0 "^rack-timeout$" >/dev/null; then gem install -v 0.6.0 rack-timeout; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 6.6 "^rack-attack$" >/dev/null; then gem install -v 6.6 rack-attack; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.2 "^gitlab_omniauth-ldap$" >/dev/null; then gem install -v 2.2 gitlab_omniauth-ldap; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.131 "^aws-sdk-core$" >/dev/null; then gem install -v 3.131 aws-sdk-core; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.114 "^aws-sdk-s3$" >/dev/null; then gem install -v 1.114 aws-sdk-s3; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.10.13 "^asana$" >/dev/null; then gem install -v 0.10.13 asana; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 7.0' "^rails-i18n$" >/dev/null; then gem install -v '~> 7.0' rails-i18n; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.16' "^prometheus-client-mmap$" >/dev/null; then gem install -v '~> 0.16' prometheus-client-mmap; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.3' "^warning$" >/dev/null; then gem install -v '~> 1.3' warning; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0' "^oauth2$" >/dev/null; then gem install -v '~> 2.0' oauth2; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 3.13, 3.13.19' "^oj$" >/dev/null; then gem install -v '~> 3.13' oj; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.0, >= 1.7.3' "^omniauth-oauth2$" >/dev/null; then gem install -v '~> 1.7.3' omniauth-oauth2; fi"
 
 #######################################################################
 # update Gemfile.lock and yarn.lock, always