From b87d30fff28e63a782ec7074bdd94b82dd1319f3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Apr 2024 20:20:46 -0400 Subject: [PATCH 1/4] user/gitlab-foss: upgrade to 16.9.5 --- 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 0783d92..e95a621 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.3 +pkgver=16.9.5 _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.34 + gitlab-shell>=14.34 graphicsmagick http-parser procps @@ -382,7 +382,7 @@ assets() { } sha512sums=" -d17ff841977d157965337774ac8ebed409e058bb1617d3fadeb8330d46efe32a091483ba30955c883e654b138d9a3ae7740a528418cd30eb1ed18cced508ddb8 gitlab-foss-v16.9.3.tar.gz +b428269cf9cb8ebf4ce13a8c2b271dd7d5ad1993dc18269697586906d408eb359ef648fe213f3ebdd1c02256d837442c72eb5d483aa3b2d72283d54ff81f2a8e gitlab-foss-v16.9.5.tar.gz daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd -- 2.45.2 From 3a1d0dbc588108271a772b95561fc75827534193 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Apr 2024 20:21:02 -0400 Subject: [PATCH 2/4] user/gitlab-pages: upgrade to 16.9.5 --- 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 ec35745..5058e29 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.3 +pkgver=16.9.5 _gittag="v$pkgver" pkgrel=0 pkgdesc="A daemon used to serve static websites for GitLab users" @@ -29,7 +29,7 @@ package() { } sha512sums=" -5a97176d820f787b96cac54dc040a0232c6b0e8a98f7e737af2f5c9a0cff10ce79263a35fdf560c58eb84eaaf1ed109a75121b050f059b4bdf493d05b58861bc gitlab-pages-v16.9.3.tar.gz +f255564f17efdaba2fb0194d95a656947d667095aaad4bd95359e390ab20c8ab57a5c7e80d606f104a48ffec729f26ccfd1b03f97fc6fb9991733651f985a15c gitlab-pages-v16.9.5.tar.gz 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd " -- 2.45.2 From 090192268315f17ea6b242ed8821409fc6e54f8a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Apr 2024 20:21:32 -0400 Subject: [PATCH 3/4] user/gitaly: upgrade to 16.9.5 --- user/gitaly/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD index 3a56350..8ba4d8f 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.3 +pkgver=16.9.5 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=" -c3784b7fb692d2e57a484b3a33b719de76d3ee8bfabc95919e7dabd89f5429f06000c615e433c99f18c1a6706ecd389dcf15d55a59ed546f62c10b585e20ad7b gitaly-v16.9.3.tar.gz +b8a7545ad6f4ebb21f2b2c9bd41da78f47884bca16ef41050f200114d710bf2146b67edbadf1064ee304ed9774f50532cea8788f998191a1f819912bbb11e114 gitaly-v16.9.5.tar.gz 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd " -- 2.45.2 From 8acf280f53d6e4729578dd5c1204ab7ed9d8d102 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Apr 2024 20:22:07 -0400 Subject: [PATCH 4/4] user/gitlab-shell: upgrade to 14.35.0 --- user/gitlab-shell/APKBUILD | 6 +++--- user/gitlab-shell/config.patch | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/user/gitlab-shell/APKBUILD b/user/gitlab-shell/APKBUILD index 544bd55..b370c2c 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.34.0 +pkgver=14.35.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=" -703685c8aae6498ad42103a70a65e18b4d2a617687a5488a52bf4c8147cd56a724a109ea27456ca93a723b458499ab09590ad5d1591eb5d3c38d8d33870736eb gitlab-shell-v14.34.0.tar.gz -5123f639de976b83a961f5d0a9f53b0ff7559ceb4e73b25a8029423932ba6249c430b8bb04dae4dce2e13330e95d4a7a88e63376ead2d6369f6adb264fd36d49 config.patch +eec1020dfa579dfec61ce3fbaea7c98a415be257595b7894a980b9d9157e225d74e6fe5ca768938eb25a1d88992e8806bb475f7e5adffb8dbffa0f01256d1fc1 gitlab-shell-v14.35.0.tar.gz +e9dd69c57c65197493f75bdde682075c6ab22892ed07d37c7a73129fb42a8349a676d5986bfd17f1df331645334248383845f21ce08d1e9664c38e4bbf5343ba config.patch 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig " diff --git a/user/gitlab-shell/config.patch b/user/gitlab-shell/config.patch index 27d6771..6dabe44 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 13850e6..98eb0e3 100644 +index fb147c4..98eb0e3 100644 --- a/config.yml.example.orig +++ b/config.yml.example @@ -13,7 +13,7 @@ user: git @@ -47,7 +47,7 @@ index 13850e6..98eb0e3 100644 # Audit usernames. # Set to true to see real usernames in the logs instead of key ids, which is easier to follow, but -@@ -62,60 +62,6 @@ audit_usernames: false +@@ -62,62 +62,6 @@ audit_usernames: false # For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html # gitlab_tracing: opentracing://driver @@ -87,6 +87,8 @@ index 13850e6..98eb0e3 100644 - kex_algorithms: [curve25519-sha256, curve25519-sha256@libssh.org, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1] - # Specified the ciphers allowed - ciphers: [aes128-gcm@openssh.com, chacha20-poly1305@openssh.com, aes256-gcm@openssh.com, aes128-ctr, aes192-ctr,aes256-ctr] +- # Specified the available Public Key algorithms +- public_key_algorithms: [ssh-rsa, ssh-dss, ecdsa-sha2-nistp256, sk-ecdsa-sha2-nistp256@openssh.com, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521, ssh-ed25519, sk-ssh-ed25519@openssh.com, rsa-sha2-256, rsa-sha2-512] - # SSH host key files. - host_key_files: - - /run/secrets/ssh-hostkeys/ssh_host_rsa_key -- 2.45.2