user/gitlab-foss: upgrade to 15.11.2

This commit is contained in:
Antoine Martin 2023-05-08 12:00:38 -04:00
parent 5394ec808e
commit 9526b1de38
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 13 additions and 14 deletions

View file

@ -3,7 +3,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=gitlab-foss
_pkgname=${pkgname%-foss}
pkgver=15.10.6
pkgver=15.11.2
_gittag=v$pkgver
pkgrel=0
pkgdesc="A version control for your server"
@ -18,7 +18,7 @@ depends="
exiftool
git>=2.18.0
gitaly~=15.3
gitlab-shell~=14.18
gitlab-shell~=14.19
graphicsmagick
http-parser
procps
@ -266,7 +266,6 @@ package() {
find public/assets -name '*.vue' -delete
find public/assets -type d -exec rmdir --ignore-fail-on-non-empty '{}' \;
# These load gems in the assets group.
rm config/initializers/gettext_rails_i18n_patch.rb
rm config/initializers/sprockets.rb
# Remove more stuff not neeeded in production.
@ -373,9 +372,9 @@ assets() {
}
sha512sums="
f32d3669c40e1227074c2b1608e46bf9f4db5ddc47ddc929101d5ae7bfd8e4a883e59a43fc6027cc09e896bd5de9930c98c2fba3fa9a2ff4907303afdbcf73ff gitlab-foss-v15.10.6.tar.gz
6e88209455d6e7cbb9473088aa7749e96de8cb5bfa68ec304acaf3f06d2086944139617ba59e0e49a1e76a95ad49ba5f8d372f186a156ae6e7c757cd215abea6 gitlab-foss-v15.11.2.tar.gz
f8b6855445e4086b4a4059a6359fafe7ca78ccf9ed6953a5b2a606d02add9519bb98ccf5f4a3bb750b94cfc44e660e70186813f7c7296fac343377e922e8a54a database-config.patch
6ad2a2d049f74b6a252df440cc0786172f1784677967595576457465558bc24e52f4fbfc45a297e6d21ce07367c57b4f976657a65a776746053e087034e4d8cf openssl3-compat.patch
43e660c5ed7efea41c6dbeb68cd00bcefe628b2b9154e2362b29bdfc51cc97fde2cbe7e9f01bb3be067cd511373a5cf8a7a8a2199b6efe96375638550f0b08ae openssl3-compat.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd
b6a6d9ba20557e61efa24f2d5a489873fefbb981f7d4465794a857b2971263c08ec29cc001c372522cdc0d48245e59751307c9f44f6ef4d87bf2e3ec5c23fb1c gitlab.rails.initd

View file

@ -1,8 +1,8 @@
diff --git a/Gemfile.lock.orig b/Gemfile.lock
index 1f1f566..39af9ce 100644
index 2940d61..ee81009 100644
--- a/Gemfile.lock.orig
+++ b/Gemfile.lock
@@ -1070,8 +1070,7 @@ GEM
@@ -1093,8 +1093,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
@ -12,7 +12,7 @@ index 1f1f566..39af9ce 100644
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentracing (0.5.0)
@@ -1826,7 +1825,7 @@ DEPENDENCIES
@@ -1855,7 +1854,7 @@ DEPENDENCIES
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
@ -21,14 +21,14 @@ index 1f1f566..39af9ce 100644
org-ruby (~> 0.9.12)
pact (~> 1.63)
parallel (~> 1.19)
@@ -1936,4 +1935,4 @@ DEPENDENCIES
@@ -1967,4 +1966,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.4.8
- 2.4.12
+ 2.3.26
diff --git a/Gemfile.orig b/Gemfile
index 8cafe3b..b27f9f0 100644
index 5c2d39a..c0688f9 100644
--- a/Gemfile.orig
+++ b/Gemfile
@@ -17,9 +17,8 @@ gem 'rails', '~> 6.1.7.2'
@ -40,6 +40,6 @@ index 8cafe3b..b27f9f0 100644
-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.
gem 'ipaddr', '~> 1.2.5'
# Responders respond_to and respond_with