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

[3.19] user/gitlab-foss: upgrade to 16.7.3 #363

Merged
ayakael merged 5 commits from gitlab-foss/upgrade/16.8.0-319 into v3.19 2024-01-21 23:45:17 +00:00
Conversation 8 Commits 5 Files changed 6 +67 -73
6 changed files with 67 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
user/gitaly/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitaly
pkgver=16.6.4
pkgver=16.7.3
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="
e83ad1470000700021495b61e991156bee511d7f94e3e07ec325f1cf5ce000cd8b5e3f8af574ced6499e9487ace43617fcb76dad61c871327bb693d364508d4a gitaly-v16.6.4.tar.gz
55230e587839df8fc8c6daeee1e5a5fbd91d6d28966d9977d59e6fb3d75e269c9d4d119f3a06217a4c6c55733a50ec9affcdb132e77e1694df839269dcd292aa config.patch
0ea3f4635b6c3f721c43b60e7e814d0895309fd8d4e35440fc6c39d821de33d40435bed8f09a6419fee658bec22bb0e23b2ae1a5962e37992c5f3823534a87ad gitaly-v16.7.3.tar.gz
0e65e620bde43a74123a281e26e85cc963a42f7113d6063511938cf828221491095ac6de7f146d9d514336597c2c1be8a21cb750871ed4a70692c6db7c44a22c config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
"

77
user/gitaly/config.patch
View file

@ -1,84 +1,73 @@
diff --git a/config.toml.example.orig b/config.toml.example
index 3d454fb..52457df 100644
index d878b16..6bb7fd9 100644
--- a/config.toml.example.orig
+++ b/config.toml.example
@@ -2,15 +2,15 @@
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
# https://docs.gitlab.com/ee//administration/gitaly/reference
@@ -2,19 +2,24 @@
# For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/
# A path which Gitaly should open a Unix socket.
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
+socket_path = "/run/gitlab/gitaly.socket"
# The directory where Gitaly's executables are stored
# Directory containing Gitaly executables.
-bin_dir = "/home/git/gitaly/_build/bin"
+bin_dir = "/usr/bin"
-# # Optional: The directory where Gitaly can create all files required to
-# # properly operate at runtime. If not set, Gitaly will create a directory in
-# # the global temporary directory. This directory must exist.
# # Optional. The directory where Gitaly can create all files required to
# # properly operate at runtime. If not set, Gitaly will create a directory in
# # the global temporary directory. This directory must exist.
-# runtime_dir = "/home/git/gitaly/run"
+# Optional: The directory where Gitaly can create all files required to
+# properly operate at runtime. If not set, Gitaly will create a directory in
+# the global temporary directory. This directory must exist.
+runtime_dir = "/run/gitaly"
# # Optional: listen on a TCP socket. This is insecure (no authentication)
# # Optional if socket_path is set. TCP address for Gitaly to listen on. This is insecure (unencrypted connection).
# listen_addr = "localhost:9999"
@@ -22,7 +22,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
# # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
# # named temp directory each time it boots.
# # Non Gitaly clients should never connect to these sockets.
-# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
+# # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
+# # named temp directory each time it boots.
+# # Non Gitaly clients should never connect to these sockets.
+internal_socket_dir = "/run/gitaly/internal"
+
# # Optional. TCP over TLS address for Gitaly to listen on.
# tls_listen_addr = "localhost:8888"
# # Optional: authenticate Gitaly requests using a shared secret
# [auth]
@@ -30,8 +30,8 @@ bin_dir = "/home/git/gitaly/_build/bin"
# transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
@@ -35,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
# # Gitaly supports TLS encryption. You must bring your own certificates because this isn’t provided automatically.
# [tls]
# # Path to the certificate.
-# certificate_path = '/home/git/cert.cert'
-# key_path = '/home/git/key.pem'
+# certificate_path = '/etc/gitlab/ssl/gitaly.crt'
# # Path to the key.
-# key_path = '/home/git/key.pem'
+# key_path = '/etc/gitlab/ssl/gitaly.key'
# # Git settings
# [git]
@@ -44,7 +44,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
[[storage]]
@@ -53,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
# # The name of the storage
name = "default"
# # The path to the storage.
-path = "/home/git/repositories"
+path = "/var/lib/gitlab/repositories"
# # You can optionally configure more storages for this Gitaly instance to serve up
#
@@ -54,15 +54,15 @@ path = "/home/git/repositories"
#
@@ -65,12 +70,12 @@ path = "/home/git/repositories"
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
-# [logging]
-# # The directory where Gitaly stores extra log files
# [logging]
# # The directory where Gitaly stores extra log files
-dir = "/home/git/gitlab/log"
-# format = "json"
-# # Optional: Set log level to only log entries with that severity or above
-# # One of, in order: debug, info, warn, errror, fatal, panic
-# # Defaults to "info"
-# level = "warn"
-#
+[logging]
+# The directory where Gitaly stores extra log files
+dir = "/var/log/gitlab"
+format = "text"
+# Optional: Set log level to only log entries with that severity or above
+# One of, in order: debug, info, warn, errror, fatal, panic
+# Defaults to "info"
# # Optional. Set log level to only log entries with that severity or above
# # One of, in order: debug, info, warn, errror, fatal, panic
# # Defaults to "info"
-# level = "warn"
+level = "warn"
+
#
# # Additionally exceptions from the Go server can be reported to Sentry
# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
@@ -71,11 +71,11 @@ dir = "/home/git/gitlab/log"
@@ -80,11 +85,11 @@ dir = "/home/git/gitlab/log"
# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
[hooks]

41
user/gitlab-foss/APKBUILD
View file

@ -3,7 +3,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=gitlab-foss
_pkgname=${pkgname%-foss}
pkgver=16.6.4
pkgver=16.7.3
_gittag=v$pkgver
pkgrel=0
pkgdesc="A version control for your server"
@ -17,28 +17,30 @@ depends="
cmd:dpkg-deb
exiftool
git>=2.42.0
gitaly~=16.6
gitlab-shell~=14.30
gitaly~=16.7
gitlab-shell~=14.32
graphicsmagick
http-parser
procps
py-docutils
python3
redis>=2.8
ruby3.0
ruby3.0-bigdecimal
ruby3.0-bundler
ruby3.0-fiddle
ruby3.0-io-console
ruby3.0-irb
ruby3.0-json
ruby3.0-rake
ruby3.0-rdoc
ruby3.0-webrick
ruby
ruby-bigdecimal
ruby-bundler
ruby-fiddle
ruby-io-console
ruby-irb
ruby-json
ruby-rake
ruby-rdoc
ruby-webrick
shared-mime-info
tzdata
"
makedepends="
cargo
clang-dev
cmd:chrpath
cmake
file-dev
@ -51,13 +53,15 @@ makedepends="
libxml2-dev
libxslt-dev
linux-headers
llvm
nodejs
openssl-dev
protobuf-dev
re2-dev
ruby3.0-dev
ruby3.0-grpc~=1.58
ruby3.0-rugged
ruby-dev
ruby-grpc~=1.58
ruby-rugged
rust
yarn>=1.2.0
"
pkgusers="git"
@ -83,7 +87,8 @@ _prefix="usr/lib/bundles/$_pkgname"
export BUNDLE_DEPLOYMENT=true
export BUNDLE_FORCE_RUBY_PLATFORM=true
export BUNDLE_FROZEN=true
export BUNDLE_JOBS=${JOBS:-2}
# Should be tied to $JOBS, but rust native code fails to build
export BUNDLE_JOBS=1
prepare() {
local sysgemdir=$(ruby -e 'puts Gem.default_dir')
@ -377,7 +382,7 @@ assets() {
}
sha512sums="
ea6f5a6d00cc298052500617c962ddb235b4f5bc563af447e23d6af32f9e447970c4d3be0506b354802996508e8572df413a2350a603b8093f3c84f056005f55 gitlab-foss-v16.6.4.tar.gz
639f3e51df604e8139e8b8e772a330139373e0c38c39f491befd7a1db06fcf95a3e97736de016756eceda978c23e3068a1d36fe71339c2b97b62e706e759c434 gitlab-foss-v16.7.3.tar.gz
daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd

4
user/gitlab-pages/APKBUILD
View file

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

4
user/gitlab-shell/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitlab-shell
pkgver=14.30.1
pkgver=14.32.0
pkgrel=0
pkgdesc="GitLab Shell handles git SSH sessions for GitLab"
url="https://gitlab.com/gitlab-org/gitlab-shell"
@ -59,7 +59,7 @@ package() {
}
sha512sums="
5cd602ffc98fa2f6c5efbc9541bb6ff234253e299b690aa43feaefab2518b63fd0f69a8c3d79a4f04624c2a6daceaefc300be90ef2a29ff0b8a2392d0ae710cf gitlab-shell-v14.30.1.tar.gz
c5bed5cb69319547b774fa3bd69edb89cf534e8c53de48ffcd1d9d695f7961c347c94703b0393a4f05b4208778d7bf7600a25d8d416b036800179e4f4469885b gitlab-shell-v14.32.0.tar.gz
8cf13bf472e22b1c429bba5df98afb931c80b043ec83c8366d59f15a1e9b21daf09078f134e7aa622c87b32c774d1d5cf129878d5035102c06d0b12ead33f804 config.patch
499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch
c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig

8
user/grpc/APKBUILD
View file

@ -3,7 +3,7 @@
# Maintainer: wener <wenermail@gmail.com>
pkgname=grpc
pkgver=1.58.0
pkgrel=0
pkgrel=1
pkgdesc="The C based gRPC"
url="https://grpc.io/"
arch="all"
@ -22,7 +22,7 @@ _pythondepends="
"
_rubydepends="
$pkgname=$pkgver-r$pkgrel
ruby3.0-google-protobuf>=3.19
ruby-google-protobuf>=3.19
"
makedepends="
abseil-cpp-dev
@ -38,7 +38,7 @@ makedepends="
openssl-dev>3
protobuf-dev
re2-dev
ruby3.0-dev
ruby-dev
samurai
yaml-dev
xxhash-dev
@ -54,7 +54,7 @@ subpackages="
$pkgname-doc
py3-grpcio-pyc
py3-grpcio:grpcio
ruby3.0-grpc:_ruby
ruby-grpc:_ruby
libaddress_sorting:lib
libgpr:lib
libgrpc:lib