user/gitlab-foss: upgrade to 16.1.0

This commit is contained in:
Antoine Martin 2023-06-25 10:48:17 -04:00
parent f736df77d4
commit fd7baa65ca
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 5 additions and 50 deletions

View file

@ -3,7 +3,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=gitlab-foss
_pkgname=${pkgname%-foss}
pkgver=15.11.2
pkgver=16.1.0
_gittag=v$pkgver
pkgrel=0
pkgdesc="A version control for your server"
@ -16,9 +16,9 @@ depends="
ca-certificates
cmd:dpkg-deb
exiftool
git>=2.18.0
gitaly~=15.3
gitlab-shell~=14.19
git>=2.40
gitaly~=16.1
gitlab-shell~=14.23
graphicsmagick
http-parser
procps
@ -372,7 +372,7 @@ assets() {
}
sha512sums="
6e88209455d6e7cbb9473088aa7749e96de8cb5bfa68ec304acaf3f06d2086944139617ba59e0e49a1e76a95ad49ba5f8d372f186a156ae6e7c757cd215abea6 gitlab-foss-v15.11.2.tar.gz
0cf2960380fcd397dfad611bbfc565aab2245eef0c42f0260502d199238ffab1c293b0827ac7b2b80bac5984a4ec2e553c83f0a12ac53aca912d57027ad5bdc1 gitlab-foss-v16.1.0.tar.gz
f8b6855445e4086b4a4059a6359fafe7ca78ccf9ed6953a5b2a606d02add9519bb98ccf5f4a3bb750b94cfc44e660e70186813f7c7296fac343377e922e8a54a database-config.patch
43e660c5ed7efea41c6dbeb68cd00bcefe628b2b9154e2362b29bdfc51cc97fde2cbe7e9f01bb3be067cd511373a5cf8a7a8a2199b6efe96375638550f0b08ae openssl3-compat.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd

View file

@ -1,45 +0,0 @@
diff --git a/Gemfile.lock.orig b/Gemfile.lock
index 2940d61..ee81009 100644
--- a/Gemfile.lock.orig
+++ b/Gemfile.lock
@@ -1093,8 +1093,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)
@@ -1855,7 +1854,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)
@@ -1967,4 +1966,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.4.12
+ 2.3.26
diff --git a/Gemfile.orig b/Gemfile
index 5c2d39a..c0688f9 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'
+
gem 'ipaddr', '~> 1.2.5'
# Responders respond_to and respond_with