From 0618b4b530b7b30055f6d591c87bc930f9581792 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 10 Jul 2023 20:32:48 +0530 Subject: [PATCH] Relax gitaly version in Gemfile to allow release candidates --- .../Gemfile/0230-relax-gitaly-for-rc.patch | 15 ++++ .../Gemfile/0230-relax-omniauth-auth0.patch | 22 ----- .../0240-remove-omniauth-shibboleth.patch | 83 ------------------- debian/patches/series | 2 +- 4 files changed, 16 insertions(+), 106 deletions(-) create mode 100644 debian/patches/Gemfile/0230-relax-gitaly-for-rc.patch delete mode 100644 debian/patches/Gemfile/0230-relax-omniauth-auth0.patch delete mode 100644 debian/patches/Gemfile/0240-remove-omniauth-shibboleth.patch diff --git a/debian/patches/Gemfile/0230-relax-gitaly-for-rc.patch b/debian/patches/Gemfile/0230-relax-gitaly-for-rc.patch new file mode 100644 index 0000000000..df599f6de5 --- /dev/null +++ b/debian/patches/Gemfile/0230-relax-gitaly-for-rc.patch @@ -0,0 +1,15 @@ +rubygems.org only has pre releases + +Forwarded: not-needed + +--- a/Gemfile ++++ b/Gemfile +@@ -425,7 +425,7 @@ + gem 'spamcheck', '~> 1.3' + + # Gitaly GRPC protocol definitions +-gem 'gitaly', '~> 15.9' ++gem 'gitaly', '~> 15.9.0-rc3' + + # KAS GRPC protocol definitions + gem 'kas-grpc', '~> 0.1.0' diff --git a/debian/patches/Gemfile/0230-relax-omniauth-auth0.patch b/debian/patches/Gemfile/0230-relax-omniauth-auth0.patch deleted file mode 100644 index 80f7f01873..0000000000 --- a/debian/patches/Gemfile/0230-relax-omniauth-auth0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e401d71c70d9d259726bd56ab739d4e514678f28 Mon Sep 17 00:00:00 2001 -From: Pirate Praveen -Date: Mon, 20 Mar 2023 14:49:32 +0000 -Subject: [PATCH] Update omniauth-auth0 rubygem to 3.1 - ---- - Gemfile | 2 +- - Gemfile.checksum | 2 +- - Gemfile.lock | 7 ++++--- - 3 files changed, 6 insertions(+), 5 deletions(-) - ---- a/Gemfile -+++ b/Gemfile -@@ -53,7 +53,7 @@ gem 'doorkeeper-openid_connect', '~> 1.8 - gem 'rexml', '~> 3.2', '>= 3.2.3.1' - gem 'ruby-saml', '~> 1.13.0' - gem 'omniauth', '~> 2.1.0' --gem 'omniauth-auth0', '~> 3.1' -+gem 'omniauth-auth0', '~> 2.0' - gem 'omniauth-azure-activedirectory-v2', '~> 2.0' - gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md - gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md diff --git a/debian/patches/Gemfile/0240-remove-omniauth-shibboleth.patch b/debian/patches/Gemfile/0240-remove-omniauth-shibboleth.patch deleted file mode 100644 index 5fe8e2a8c2..0000000000 --- a/debian/patches/Gemfile/0240-remove-omniauth-shibboleth.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 93d13533cdad1aa5e7b508f88b44fb9a758d06d5 Mon Sep 17 00:00:00 2001 -From: Imre Farkas -Date: Mon, 23 Jan 2023 17:11:50 +0100 -Subject: [PATCH] Remove omniauth-shibboleth gem - -Integration with Shibboleth is recommended via omniauth-saml since -GitLab 10. ---- - Gemfile | 1 - - Gemfile.checksum | 1 - - Gemfile.lock | 3 --- - app/assets/images/auth_buttons/shibboleth_64.png | Bin 2993 -> 0 bytes - app/helpers/auth_helper.rb | 1 - - spec/lib/gitlab/omniauth_initializer_spec.rb | 8 -------- - 6 files changed, 14 deletions(-) - delete mode 100644 app/assets/images/auth_buttons/shibboleth_64.png - ---- a/Gemfile -+++ b/Gemfile -@@ -72,7 +72,6 @@ - gem 'omniauth-google-oauth2', '~> 1.1' - gem 'omniauth-oauth2-generic', '~> 0.2.2' - gem 'omniauth-saml', '~> 2.0' --gem 'omniauth-shibboleth', '~> 1.3' - gem 'omniauth-twitter', '~> 1.4' - gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md - gem 'omniauth-authentiq', '~> 0.3.3' ---- a/Gemfile.checksum -+++ b/Gemfile.checksum -@@ -397,7 +397,6 @@ - {"name":"omniauth-oauth2","version":"1.8.0","platform":"ruby","checksum":"b2f8e9559cc7e2d4efba57607691d6d2b634b879fc5b5b6ccfefa3da85089e78"}, - {"name":"omniauth-oauth2-generic","version":"0.2.8","platform":"ruby","checksum":"ce6e8539019d5ebf2f48867072b9f248f148bb4cbe7166dee655865abfae7613"}, - {"name":"omniauth-saml","version":"2.0.0","platform":"ruby","checksum":"02594fd6630de26a9e65a2e64223e9ad32324fa97a6c7f1f22a1553ea3dd44c7"}, --{"name":"omniauth-shibboleth","version":"1.3.0","platform":"ruby","checksum":"b0bb725ced5cb76fbfc187ddbb8ad6864d0cd5df714cab36a528df8ee4b1d113"}, - {"name":"omniauth-twitter","version":"1.4.0","platform":"ruby","checksum":"c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264"}, - {"name":"open4","version":"1.3.4","platform":"ruby","checksum":"a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1"}, - {"name":"openid_connect","version":"1.3.0","platform":"ruby","checksum":"a796855096850cc01140e37ea6ae9fd14f2be818b9b5bc698418063dfe228770"}, ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -1015,8 +1015,6 @@ - omniauth-saml (2.0.0) - omniauth (~> 2.0) - ruby-saml (~> 1.9) -- omniauth-shibboleth (1.3.0) -- omniauth (>= 1.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack -@@ -1762,7 +1760,6 @@ - omniauth-oauth2-generic (~> 0.2.2) - omniauth-salesforce (~> 1.0.5)! - omniauth-saml (~> 2.0.0) -- omniauth-shibboleth (~> 1.3.0) - omniauth-twitter (~> 1.4) - omniauth_crowd (~> 2.4.0)! - openssl (= 2.2.2) ---- a/app/helpers/auth_helper.rb -+++ b/app/helpers/auth_helper.rb -@@ -17,7 +17,6 @@ - jwt - openid_connect - salesforce -- shibboleth - twitter - ).freeze - LDAP_PROVIDER = /\Aldap/.freeze ---- a/spec/lib/gitlab/omniauth_initializer_spec.rb -+++ b/spec/lib/gitlab/omniauth_initializer_spec.rb -@@ -216,14 +216,6 @@ - expect { subject.execute([hash_config]) }.to raise_error(NameError) - end - -- it 'configures fail_with_empty_uid for shibboleth' do -- shibboleth_config = { 'name' => 'shibboleth', 'args' => {} } -- -- expect(devise_config).to receive(:omniauth).with(:shibboleth, fail_with_empty_uid: true) -- -- subject.execute([shibboleth_config]) -- end -- - it 'configures remote_sign_out_handler proc for authentiq' do - authentiq_config = { 'name' => 'authentiq', 'args' => {} } - diff --git a/debian/patches/series b/debian/patches/series index e5f53a903b..9c4427066a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,7 @@ Gemfile/0040-relax-httparty.patch Gemfile/0090-remove-ee-only-gems.patch Gemfile/0180-add-parser-gem.patch Gemfile/0220-relax-oj-in-ipynbdiff.patch -#Gemfile/0230-relax-omniauth-auth0.patch +Gemfile/0230-relax-gitaly-for-rc.patch nodejs/0010-set-webpack-root.patch nodejs/0030-use-yarnpkg.patch tweaks/0010-source-init-functions.patch