From e1b23495b831fcb1f898358a13d9cea827d8471c Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sun, 5 Mar 2023 15:02:35 +0530
Subject: [PATCH] Use ruby-redis-namespace and ruby-invisble-captcha from
 archives

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

diff --git a/debian/control b/debian/control
index be5c49fa6e..433f6daa36 100644
--- a/debian/control
+++ b/debian/control
@@ -146,7 +146,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Spam and anti-bot protection
  ruby-recaptcha (>= 4.11~),
  ruby-akismet (>= 3.0~),
- ruby-invisible-captcha (>= 1.1~),
+ ruby-invisible-captcha (>= 2.0~),
 # Two-factor authentication
  ruby-devise-two-factor (>= 4.0.2~),
  ruby-rqrcode-rails3 (>= 0.1.7-2~),
@@ -256,7 +256,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Background jobs
  ruby-sidekiq (>= 6.5.7~),
  ruby-sidekiq-cron (>= 1.8~),
- ruby-redis-namespace (>= 1.8.1~),
+ ruby-redis-namespace (>= 1.9~),
  ruby-gitlab-sidekiq-fetcher (>= 0.9~),
 # Cron Parser
  ruby-fugit (>= 1.2.1~),
@@ -348,7 +348,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 #
  ruby-premailer-rails (>= 1.10.3-2~),
 # LabKit: Tracing and Correlation
- ruby-gitlab-labkit (>= 0.25~),
+ ruby-gitlab-labkit (>= 0.29~),
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
  ruby-thrift (>= 0.16~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 482f0f9303..e9f2690822 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -71,7 +71,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^gitlab-dangerfiles$" >/de
 
 # TODO: Update packages for these gems
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.0.12' "^arr-pm$" >/dev/null; then gem install -v '~> 0.0.12' arr-pm; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.9 "^redis-namespace$" >/dev/null; then gem install -v 1.9 redis-namespace; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.12' "^google-apis-monitoring_v3$" >/dev/null; then gem install -v '~>0.12' google-apis-monitoring_v3; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.6' "^google-apis-iamcredentials_v1$" >/dev/null; then gem install -v '~> 0.6' google-apis-iamcredentials_v1; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.12' "^google-apis-dns_v1$" >/dev/null; then gem install -v '~> 0.12' google-apis-dns_v1; fi"
@@ -80,10 +79,9 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v  0.4 "google-apis-core$"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.14' "^google-apis-compute_v1$" >/dev/null; then gem install -v '~> 0.14' google-apis-compute_v1; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.13' "^google-apis-sqladmin_v1beta4$" >/dev/null; then gem install -v '~> 0.13' google-apis-sqladmin_v1beta4; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7' "^google-apis-pubsub_v1$" >/dev/null; then gem install -v '~> 0.7' google-apis-pubsub_v1; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0.0' "^invisible_captcha$" >/dev/null; then gem install -v '~> 2.0.0' invisible_captcha; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.19' "^fog-google$" >/dev/null; then gem install -v '~> 1.19' fog-google; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.29.0 "^gitlab-labkit$" >/dev/null; then gem install -v 0.29.0 gitlab-labkit; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/null; then gem install -v 1.2.2 ipaddr; fi"
+# Packaged version is probably buggy - task lists on issues broken
 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"