From 6c24e38caf4e9109611cf71977e5b2668e4ef3a6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 9 Mar 2024 00:27:48 -0500 Subject: [PATCH 1/4] user/gitlab-foss: upgrade to 16.9.2 --- user/gitlab-foss/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index a1e458a..97f6016 100644 --- a/user/gitlab-foss/APKBUILD +++ b/user/gitlab-foss/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Antoine Martin (ayakael) pkgname=gitlab-foss _pkgname=${pkgname%-foss} -pkgver=16.9.0 +pkgver=16.9.2 _gittag=v$pkgver pkgrel=0 pkgdesc="A version control for your server" @@ -18,7 +18,7 @@ depends=" exiftool git>=2.42.0 gitaly~=16.9 - gitlab-shell~=14.33 + gitlab-shell~=14.34 graphicsmagick http-parser procps @@ -382,7 +382,7 @@ assets() { } sha512sums=" -029a3c84b46e654f87724c62e66a2d2eab010425fee8079ef8f5e0855433e7e5ab42fe80becc97a0a05429121104dc2609acf1a4028a84fe2b6f20dd7794af88 gitlab-foss-v16.9.0.tar.gz +eeb09db0b1d4ae66347f3b5ef7dbaf0fda67ec099f0a07e119ba43773e940039a1fd1aa1b6f80dc301e72edff872fedb7db33b58c4a67ec7be9266b12590cfda gitlab-foss-v16.9.2.tar.gz daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd -- 2.45.2 From e8400cd1650b75473cc9dd6c3483d588095398a4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 9 Mar 2024 00:28:06 -0500 Subject: [PATCH 2/4] user/gitlab-pages: upgrade to 16.9.2 --- user/gitlab-pages/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitlab-pages/APKBUILD b/user/gitlab-pages/APKBUILD index be67699..fd1adba 100644 --- a/user/gitlab-pages/APKBUILD +++ b/user/gitlab-pages/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitlab-pages -pkgver=16.9.0 +pkgver=16.9.2 _gittag="v$pkgver" pkgrel=0 pkgdesc="A daemon used to serve static websites for GitLab users" @@ -29,7 +29,7 @@ package() { } sha512sums=" -4c3c4d78c07160aa2851d0d0e76e7a4060c7844e4d76e07b42a67eb6a7dda338e83384a2d860386792863315a136f0fd05afb8d3254de8dfae2e4fa2caabae22 gitlab-pages-v16.9.0.tar.gz +d9652827ce69ad6f3417611ad326852d2f107381689ee59bf066d5659385305500f9a7252d2267978630d03e9a4f21c0e1860371065de949b8560a8810e412a2 gitlab-pages-v16.9.2.tar.gz 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd " -- 2.45.2 From 2a825ce109ddb5b5b13ff69d030403ff2986b942 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 9 Mar 2024 00:28:28 -0500 Subject: [PATCH 3/4] user/gitaly: upgrade to 16.9.2 --- user/gitaly/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD index 57b84de..fef8064 100644 --- a/user/gitaly/APKBUILD +++ b/user/gitaly/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitaly -pkgver=16.9.0 +pkgver=16.9.2 pkgrel=0 pkgdesc="A Git RPC service for handling all the git calls made by GitLab" url="https://gitlab.com/gitlab-org/gitaly/" @@ -80,7 +80,7 @@ praefect() { } sha512sums=" -2a02bf6cee13c979f44ec5e0e9aa65fca13b88d329823b21975af687b065e8ece619e875e102b0d0cc0554499dd91dde2e84d44b7f7af8b6fd06e6d8f717f7cb gitaly-v16.9.0.tar.gz +dbf673d519ee8664916252addb979312e9c9ce1815d5c2883445a81b45fd910c0802756e2a4c070e03096f52a15adb9f8f2cbe86860f1755f3a46de8c88e388c gitaly-v16.9.2.tar.gz 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd " -- 2.45.2 From 2a4c907f834d10ab509fad308517d97ff85a3a42 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 9 Mar 2024 00:33:56 -0500 Subject: [PATCH 4/4] user/gitlab-shell: upgrade to 14.34.0 --- user/gitlab-shell/APKBUILD | 6 +++--- user/gitlab-shell/config.patch | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/user/gitlab-shell/APKBUILD b/user/gitlab-shell/APKBUILD index 47240c9..544bd55 100644 --- a/user/gitlab-shell/APKBUILD +++ b/user/gitlab-shell/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitlab-shell -pkgver=14.33.0 +pkgver=14.34.0 pkgrel=0 pkgdesc="GitLab Shell handles git SSH sessions for GitLab" url="https://gitlab.com/gitlab-org/gitlab-shell" @@ -59,8 +59,8 @@ package() { } sha512sums=" -4b6a5aa8e47b3ce90abe77e1d5f89a7a4d7fa20d9984d3bf45e3a1d140529ea6e2ee96f6e24db88a4c52315d76393379eeb7d7f24d42c90a16ba17d191b39bd6 gitlab-shell-v14.33.0.tar.gz -8cf13bf472e22b1c429bba5df98afb931c80b043ec83c8366d59f15a1e9b21daf09078f134e7aa622c87b32c774d1d5cf129878d5035102c06d0b12ead33f804 config.patch +703685c8aae6498ad42103a70a65e18b4d2a617687a5488a52bf4c8147cd56a724a109ea27456ca93a723b458499ab09590ad5d1591eb5d3c38d8d33870736eb gitlab-shell-v14.34.0.tar.gz +5123f639de976b83a961f5d0a9f53b0ff7559ceb4e73b25a8029423932ba6249c430b8bb04dae4dce2e13330e95d4a7a88e63376ead2d6369f6adb264fd36d49 config.patch 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig " diff --git a/user/gitlab-shell/config.patch b/user/gitlab-shell/config.patch index b4b1e92..27d6771 100644 --- a/user/gitlab-shell/config.patch +++ b/user/gitlab-shell/config.patch @@ -1,5 +1,5 @@ diff --git a/config.yml.example.orig b/config.yml.example -index 886fde0..f03c897 100644 +index 13850e6..98eb0e3 100644 --- a/config.yml.example.orig +++ b/config.yml.example @@ -13,7 +13,7 @@ user: git @@ -47,11 +47,10 @@ index 886fde0..f03c897 100644 # Audit usernames. # 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 - # Distributed Tracing. GitLab-Shell has distributed tracing instrumentation. +@@ -62,60 +62,6 @@ audit_usernames: false # For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html # gitlab_tracing: opentracing://driver -- + -# This section configures the built-in SSH server. Ignored when running on OpenSSH. -sshd: - # Address which the SSH server listens on. Defaults to [::]:22. @@ -105,3 +104,7 @@ index 886fde0..f03c897 100644 - keytab: "" - # The Kerberos service name to be used by sshd. Defaults to "", accepts any service name in keytab file. - service_principal_name: "" +- + lfs: + # https://gitlab.com/groups/gitlab-org/-/epics/11872, disabled by default. + pure_ssh_protocol: false -- 2.45.2