Revert "Use openssl 3.0.2 from rubygems.org as workaround for #1032070"
This reverts commit 08fe0d965d
.
This commit is contained in:
parent
2a14c7bd83
commit
23fffdce9c
2 changed files with 0 additions and 8 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -85,8 +85,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
gitlab-common (>= 15.7~),
|
gitlab-common (>= 15.7~),
|
||||||
ruby (>= 1:2.7~),
|
ruby (>= 1:2.7~),
|
||||||
rubygems-integration (>= 1.18~),
|
rubygems-integration (>= 1.18~),
|
||||||
# for building openssl 3.0.2, see #1032070
|
|
||||||
ruby-dev,
|
|
||||||
lsb-base (>= 3.0-6),
|
lsb-base (>= 3.0-6),
|
||||||
rake (>= 12.3.0~),
|
rake (>= 12.3.0~),
|
||||||
bundler (>= 1.17.3~),
|
bundler (>= 1.17.3~),
|
||||||
|
|
6
debian/gitlab.postinst
vendored
6
debian/gitlab.postinst
vendored
|
@ -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 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"
|
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
|
# 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"
|
runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~>3.0' "^rack$" >/dev/null; then gem uninstall -v '~>3.0' rack; fi"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue