forge/ayaports
1
0
Fork 0
Code Issues 44 Pull requests 15 Projects Releases Packages Wiki Activity Actions

user/gitlab-foss: upgrade to 15.10.2

Browse source
This commit is contained in:
Antoine Martin 2023-04-11 14:55:39 -04:00
parent 7767f572a4
commit bef1d6bf89
Signed by: forge
GPG key ID: D62A472A4AA7D541
3 changed files with 95 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
user/gitlab-foss/117063_openssl3-compat.patch Normal file
View file

@ -0,0 +1,91 @@
diff --git a/Gemfile b/Gemfile
index 1110e324e1113488bf76d7ab94352b999c478cc9..a819b603296ec9f11c4bff00cb9e00e41ea7ceae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,9 +17,7 @@ gem 'rails', '~> 6.1.7.2'
gem 'bootsnap', '~> 1.16.0', require: false
-# Pin openssl to match the version bundled with our supported Rubies.
-# See https://stdgems.org/openssl/#gem-version.
-gem 'openssl', '2.2.2'
+gem 'openssl', '~> 3.0'
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
# Since the latest version caused problems with GitLab, we pin this to an older
# version for now.
diff --git a/Gemfile.checksum b/Gemfile.checksum
index f5228227f1b0723c3cbf9dbf618b4c825c430038..fe206bde66995c30682eec938def27a1698e7417 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -421,7 +421,7 @@
{"name":"omniauth_openid_connect","version":"0.6.1","platform":"ruby","checksum":"5f1318f5b19b05e339ff494def060b57a503b1e3ea83c3a0ced6cc014407d423"},
{"name":"open4","version":"1.3.4","platform":"ruby","checksum":"a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1"},
{"name":"openid_connect","version":"1.3.0","platform":"ruby","checksum":"a796855096850cc01140e37ea6ae9fd14f2be818b9b5bc698418063dfe228770"},
-{"name":"openssl","version":"2.2.2","platform":"ruby","checksum":"53f72382bac046c36c37049c7ec9d5597d42628d140b5cfbcd61e0226c0ca077"},
+{"name":"openssl","version":"3.1.0","platform":"ruby","checksum":"e3a01279e918a7a5cf741db69b124864878b1a9783b1f2d34854bc1d444ac430"},
{"name":"openssl-signature_algorithm","version":"1.3.0","platform":"ruby","checksum":"a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80"},
{"name":"opentracing","version":"0.5.0","platform":"ruby","checksum":"deb5d7abe6b0e7631d866d8cb5ee7bb9352650a504a32f61591302bc510b9286"},
{"name":"optimist","version":"3.0.1","platform":"ruby","checksum":"336b753676d6117cad9301fac7e91dab4228f747d4e7179891ad3a163c64e2ed"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 8783a40b99acb9f695c91a86f7357b3351909a18..ac9e5f9b69e9e5d815794cce46133029bc99cb52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1091,8 +1091,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
- openssl (2.2.2)
- ipaddr
+ openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentracing (0.5.0)
@@ -1847,7 +1846,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
- openssl (= 2.2.2)
+ openssl (~> 3.0)
org-ruby (~> 0.9.12)
pact (~> 1.63)
parallel (~> 1.19)
diff --git a/spec/lib/gitlab/ci/secure_files/cer_spec.rb b/spec/lib/gitlab/ci/secure_files/cer_spec.rb
index 6b9cd0e3bfc6223fc3eaed9d5027b06e4c89a0b4..1393e8d2efd3ee1b399ab4da3280b6808b04659f 100644
--- a/spec/lib/gitlab/ci/secure_files/cer_spec.rb
+++ b/spec/lib/gitlab/ci/secure_files/cer_spec.rb
@@ -9,7 +9,7 @@
describe '#certificate_data' do
it 'assigns the error message and returns nil' do
expect(invalid_certificate.certificate_data).to be nil
- expect(invalid_certificate.error).to eq('not enough data')
+ expect(invalid_certificate.error).to eq('PEM_read_bio_X509: no start line')
end
end
diff --git a/spec/lib/gitlab/ci/secure_files/mobile_provision_spec.rb b/spec/lib/gitlab/ci/secure_files/mobile_provision_spec.rb
index fb382174c649531c673df2ab7091d0316bbd44a5..1812b90df8b436c89f0dea5841d98c364313e5d9 100644
--- a/spec/lib/gitlab/ci/secure_files/mobile_provision_spec.rb
+++ b/spec/lib/gitlab/ci/secure_files/mobile_provision_spec.rb
@@ -10,7 +10,7 @@
describe '#decoded_plist' do
it 'assigns the error message and returns nil' do
expect(invalid_profile.decoded_plist).to be nil
- expect(invalid_profile.error).to eq('Could not parse the PKCS7: not enough data')
+ expect(invalid_profile.error).to eq('Could not parse the PKCS7: no start line')
end
end
diff --git a/spec/models/ci/secure_file_spec.rb b/spec/models/ci/secure_file_spec.rb
index e526e90e25009e3c0ee6facdb4fea63f2374d69a..478af41266db213e9ec8d7b3bb97ca54aaf5f596 100644
--- a/spec/models/ci/secure_file_spec.rb
+++ b/spec/models/ci/secure_file_spec.rb
@@ -194,7 +194,7 @@
it 'logs an error when something goes wrong with the file parsing' do
corrupt_file = create(:ci_secure_file, name: 'file1.cer', file: CarrierWaveStringFile.new('11111111'))
- message = 'Validation failed: Metadata must be a valid json schema - not enough data.'
+ message = 'Validation failed: Metadata must be a valid json schema - PEM_read_bio_X509: no start line.'
expect(Gitlab::AppLogger).to receive(:error).with("Secure File Parser Failure (#{corrupt_file.id}): #{message}")
corrupt_file.update_metadata!
end

8
user/gitlab-foss/APKBUILD
View file

@ -3,7 +3,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitlab-foss
_pkgname=${pkgname%-foss}
pkgver=15.10.1
pkgver=15.10.2
_gittag=v$pkgver
pkgrel=0
pkgdesc="A version control for your server"
@ -65,7 +65,7 @@ install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
subpackages="$pkgname-assets::noarch $pkgname-openrc"
source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss-$_gittag.tar.gz
database-config.patch
openssl3-compat.patch
117063_openssl3-compat.patch
$_pkgname.initd
$_pkgname.mailroom.initd
$_pkgname.rails.initd
@ -373,9 +373,9 @@ assets() {
}
sha512sums="
68b8b434e2d1e786afc1955aed047457c3981de730747fdf645fd3d21787ad1a829909e5a02901f63dcbcf4ad62494babd6533446627b2bd3a2ad5a454e8546d gitlab-foss-v15.10.1.tar.gz
ab7a84e12249ecb19640e9fb2017b8b43a9c1029162377a2900241613beb1dbe251b05f999ffb3edad36bc18b2ca0e5f6e053aee79e3816c5a7506d9c7d1ba54 gitlab-foss-v15.10.2.tar.gz
f8b6855445e4086b4a4059a6359fafe7ca78ccf9ed6953a5b2a606d02add9519bb98ccf5f4a3bb750b94cfc44e660e70186813f7c7296fac343377e922e8a54a database-config.patch
6ad2a2d049f74b6a252df440cc0786172f1784677967595576457465558bc24e52f4fbfc45a297e6d21ce07367c57b4f976657a65a776746053e087034e4d8cf openssl3-compat.patch
857ae19d63240a581281f7816939ed751d3df0262e7f3c3ec5208672cf8a117c46af34de8232dcc6381d93f6b6f96eb32bb8fca89620835080653b713ce9ec1e 117063_openssl3-compat.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd
b6a6d9ba20557e61efa24f2d5a489873fefbb981f7d4465794a857b2971263c08ec29cc001c372522cdc0d48245e59751307c9f44f6ef4d87bf2e3ec5c23fb1c gitlab.rails.initd

45
user/gitlab-foss/openssl3-compat.patch
View file

@ -1,45 +0,0 @@
diff --git a/Gemfile.lock.orig b/Gemfile.lock
index 1f1f566..39af9ce 100644
--- a/Gemfile.lock.orig
+++ b/Gemfile.lock
@@ -1070,8 +1070,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
- openssl (2.2.2)
- ipaddr
+ openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentracing (0.5.0)
@@ -1826,7 +1825,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
- openssl (= 2.2.2)
+ openssl (~> 3.0)
org-ruby (~> 0.9.12)
pact (~> 1.63)
parallel (~> 1.19)
@@ -1936,4 +1935,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.4.8
+ 2.3.26
diff --git a/Gemfile.orig b/Gemfile
index 8cafe3b..b27f9f0 100644
--- a/Gemfile.orig
+++ b/Gemfile
@@ -17,9 +17,8 @@ gem 'rails', '~> 6.1.7.2'
gem 'bootsnap', '~> 1.16.0', require: false
-# Pin openssl to match the version bundled with our supported Rubies.
-# See https://stdgems.org/openssl/#gem-version.
-gem 'openssl', '2.2.2'
+gem 'openssl', '~> 3.0'
+
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
# Since the latest version caused problems with GitLab, we pin this to an older
# version for now.