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

[3.19] user/gitlab-foss: upgrade to 16.9.3 #426

Merged
ayakael merged 4 commits from gitlab-foss/upgrade-16.9.3-319 into v3.19 2024-04-02 20:57:25 +00:00
Conversation 3 Commits 4 Files changed 5 +18 -15
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
user/gitaly/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitaly pkgname=gitaly
pkgver=16.8.5 pkgver=16.9.3
pkgrel=0 pkgrel=0
pkgdesc="A Git RPC service for handling all the git calls made by GitLab" pkgdesc="A Git RPC service for handling all the git calls made by GitLab"
url="https://gitlab.com/gitlab-org/gitaly/" url="https://gitlab.com/gitlab-org/gitaly/"
@ -80,7 +80,7 @@ praefect() {
} }
sha512sums=" sha512sums="
953990920af9510a036a49d640d599463fc6fce565b4e088c9be51792c3b0860885a735bf6ff8a0dedc8f9c0eb8a25c2e6b3d49e947a2b682a6662942aa3c483 gitaly-v16.8.5.tar.gz c3784b7fb692d2e57a484b3a33b719de76d3ee8bfabc95919e7dabd89f5429f06000c615e433c99f18c1a6706ecd389dcf15d55a59ed546f62c10b585e20ad7b gitaly-v16.9.3.tar.gz
7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
" "

8
user/gitlab-foss/APKBUILD
View file

@ -3,7 +3,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=gitlab-foss pkgname=gitlab-foss
_pkgname=${pkgname%-foss} _pkgname=${pkgname%-foss}
pkgver=16.8.5 pkgver=16.9.3
_gittag=v$pkgver _gittag=v$pkgver
pkgrel=0 pkgrel=0
pkgdesc="A version control for your server" pkgdesc="A version control for your server"
@ -17,8 +17,8 @@ depends="
cmd:dpkg-deb cmd:dpkg-deb
exiftool exiftool
git>=2.42.0 git>=2.42.0
gitaly~=16.8 gitaly~=16.9
gitlab-shell~=14.33 gitlab-shell~=14.34
graphicsmagick graphicsmagick
http-parser http-parser
procps procps
@ -382,7 +382,7 @@ assets() {
} }
sha512sums=" sha512sums="
1ac656b5252df76a5d4e16381b5be1f128ba23f22239211641418949356c993945b0ef1e85b583cf6fe176dbc747a89ac9811fd17525b2255dc2b56fb4ee1a2f gitlab-foss-v16.8.5.tar.gz d17ff841977d157965337774ac8ebed409e058bb1617d3fadeb8330d46efe32a091483ba30955c883e654b138d9a3ae7740a528418cd30eb1ed18cced508ddb8 gitlab-foss-v16.9.3.tar.gz
daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd

4
user/gitlab-pages/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitlab-pages pkgname=gitlab-pages
pkgver=16.8.5 pkgver=16.9.3
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=0 pkgrel=0
pkgdesc="A daemon used to serve static websites for GitLab users" pkgdesc="A daemon used to serve static websites for GitLab users"
@ -29,7 +29,7 @@ package() {
} }
sha512sums=" sha512sums="
59484287a4c75ec229be093d1810e482aa805ebb84b668fcda72167a5b1e3d6f851e0bb5588feebb71ea2d5903682181c618f09a09d667d90203f489d8f4ddb4 gitlab-pages-v16.8.5.tar.gz 5a97176d820f787b96cac54dc040a0232c6b0e8a98f7e737af2f5c9a0cff10ce79263a35fdf560c58eb84eaaf1ed109a75121b050f059b4bdf493d05b58861bc gitlab-pages-v16.9.3.tar.gz
710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch
20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd
" "

6
user/gitlab-shell/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitlab-shell pkgname=gitlab-shell
pkgver=14.33.0 pkgver=14.34.0
pkgrel=0 pkgrel=0
pkgdesc="GitLab Shell handles git SSH sessions for GitLab" pkgdesc="GitLab Shell handles git SSH sessions for GitLab"
url="https://gitlab.com/gitlab-org/gitlab-shell" url="https://gitlab.com/gitlab-org/gitlab-shell"
@ -59,8 +59,8 @@ package() {
} }
sha512sums=" sha512sums="
4b6a5aa8e47b3ce90abe77e1d5f89a7a4d7fa20d9984d3bf45e3a1d140529ea6e2ee96f6e24db88a4c52315d76393379eeb7d7f24d42c90a16ba17d191b39bd6 gitlab-shell-v14.33.0.tar.gz 703685c8aae6498ad42103a70a65e18b4d2a617687a5488a52bf4c8147cd56a724a109ea27456ca93a723b458499ab09590ad5d1591eb5d3c38d8d33870736eb gitlab-shell-v14.34.0.tar.gz
8cf13bf472e22b1c429bba5df98afb931c80b043ec83c8366d59f15a1e9b21daf09078f134e7aa622c87b32c774d1d5cf129878d5035102c06d0b12ead33f804 config.patch 5123f639de976b83a961f5d0a9f53b0ff7559ceb4e73b25a8029423932ba6249c430b8bb04dae4dce2e13330e95d4a7a88e63376ead2d6369f6adb264fd36d49 config.patch
499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch
c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig
" "

11
user/gitlab-shell/config.patch
View file

@ -1,5 +1,5 @@
diff --git a/config.yml.example.orig b/config.yml.example diff --git a/config.yml.example.orig b/config.yml.example
index 886fde0..f03c897 100644 index 13850e6..98eb0e3 100644
--- a/config.yml.example.orig --- a/config.yml.example.orig
+++ b/config.yml.example +++ b/config.yml.example
@@ -13,7 +13,7 @@ user: git @@ -13,7 +13,7 @@ user: git
@ -47,11 +47,10 @@ index 886fde0..f03c897 100644
# Audit usernames. # Audit usernames.
# Set to true to see real usernames in the logs instead of key ids, which is easier to follow, but # Set to true to see real usernames in the logs instead of key ids, which is easier to follow, but
@@ -61,57 +61,3 @@ audit_usernames: false @@ -62,60 +62,6 @@ audit_usernames: false
# Distributed Tracing. GitLab-Shell has distributed tracing instrumentation.
# For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html # For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html
# gitlab_tracing: opentracing://driver # gitlab_tracing: opentracing://driver
-
-# This section configures the built-in SSH server. Ignored when running on OpenSSH. -# This section configures the built-in SSH server. Ignored when running on OpenSSH.
-sshd: -sshd:
- # Address which the SSH server listens on. Defaults to [::]:22. - # Address which the SSH server listens on. Defaults to [::]:22.
@ -105,3 +104,7 @@ index 886fde0..f03c897 100644
- keytab: "" - keytab: ""
- # The Kerberos service name to be used by sshd. Defaults to "", accepts any service name in keytab file. - # The Kerberos service name to be used by sshd. Defaults to "", accepts any service name in keytab file.
- service_principal_name: "" - service_principal_name: ""
-
lfs:
# https://gitlab.com/groups/gitlab-org/-/epics/11872, disabled by default.
pure_ssh_protocol: false