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

user/gitlab-shell: upgrade to 14.17.0

Browse source
This commit is contained in:
Antoine Martin 2023-03-03 01:40:01 -05:00
parent d47baab861
commit 0daa0f5273
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
user/gitlab-shell/APKBUILD
View file

@ -1,19 +1,19 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitlab-shell pkgname=gitlab-shell
pkgver=14.15.0 pkgver=14.17.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"
arch="all" arch="all"
license="MIT" license="MIT"
depends="git openssh" depends="git openssh"
makedepends="go" makedepends="go krb5-dev"
pkgusers="git" pkgusers="git"
pkggroups="git" pkggroups="git"
install="$pkgname.pre-install $pkgname.post-install" install="$pkgname.pre-install $pkgname.post-install"
# NOTE: user vs system gitconfig, see https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6166 # NOTE: user vs system gitconfig, see https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6166
source="https://gitlab.com/gitlab-org/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz source="https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v$pkgver/gitlab-shell-v$pkgver.tar.gz
config.patch config.patch
change-config-path.patch change-config-path.patch
gitconfig gitconfig
@ -58,8 +58,8 @@ package() {
} }
sha512sums=" sha512sums="
d13f71012801fa9b24728776f74237b891c6dae5be430c6ea50e1326b3ecabc4b9f0691c04d71d52862744244f47e58ecf8b3f7b3eebc4140fc3a227a5e9d42c gitlab-shell-v14.15.0.tar.gz 2329f1172fe7f765cbf40a5155c08f19534b24d80d9c2ec379e08a363f949144a3bc49a35db872f3b33e1d6d675174245c66bfe24ca09bad1d96bd0f1ca35257 gitlab-shell-v14.17.0.tar.gz
0c42072b8c3a1206e5ff0d90727b4762bbccafa709c6daa2fb4ef384d66850308b08bd54411728b84d53ca9645eacec152fb4a20dd9efb26ba651e6161de1f3d config.patch 8cf13bf472e22b1c429bba5df98afb931c80b043ec83c8366d59f15a1e9b21daf09078f134e7aa622c87b32c774d1d5cf129878d5035102c06d0b12ead33f804 config.patch
499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch
c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig
" "

12
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 0154723..f03c897 100644 index 886fde0..f03c897 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,7 +47,7 @@ index 0154723..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,49 +61,3 @@ audit_usernames: false @@ -61,57 +61,3 @@ audit_usernames: false
# Distributed Tracing. GitLab-Shell has distributed tracing instrumentation. # 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
@ -97,3 +97,11 @@ index 0154723..f03c897 100644
- - /run/secrets/ssh-hostkeys/ssh_host_rsa_key-cert.pub - - /run/secrets/ssh-hostkeys/ssh_host_rsa_key-cert.pub
- - /run/secrets/ssh-hostkeys/ssh_host_ecdsa_key-cert.pub - - /run/secrets/ssh-hostkeys/ssh_host_ecdsa_key-cert.pub
- - /run/secrets/ssh-hostkeys/ssh_host_ed25519_key-cert.pub - - /run/secrets/ssh-hostkeys/ssh_host_ed25519_key-cert.pub
- # GSSAPI-related settings
- gssapi:
- # Enable the gssapi-with-mic authentication method. Defaults to false.
- enabled: false
- # Keytab path. Defaults to "", system default (usually /etc/krb5.keytab).
- keytab: ""
- # The Kerberos service name to be used by sshd. Defaults to "", accepts any service name in keytab file.
- service_principal_name: ""