From aa3219fa5f1c36ba28f8248aefb594a1e743ce2d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 21 Jan 2024 18:47:51 -0500 Subject: [PATCH 1/5] user/gitaly: upgrade to 16.8.0 --- user/gitaly/APKBUILD | 6 +++--- user/gitaly/config.patch | 45 +++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD index 79a43f3..bfd1f0c 100644 --- a/user/gitaly/APKBUILD +++ b/user/gitaly/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitaly -pkgver=16.7.3 +pkgver=16.8.0 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=" -0ea3f4635b6c3f721c43b60e7e814d0895309fd8d4e35440fc6c39d821de33d40435bed8f09a6419fee658bec22bb0e23b2ae1a5962e37992c5f3823534a87ad gitaly-v16.7.3.tar.gz -0e65e620bde43a74123a281e26e85cc963a42f7113d6063511938cf828221491095ac6de7f146d9d514336597c2c1be8a21cb750871ed4a70692c6db7c44a22c config.patch +5867b328d0086e4a3135e8d66b778d1c7ee1a0abfaed1bbeecaa1876c7fcc5ec369baa6b0303522f3cf8c97c809a8263256e56844c9fae8583331efc2498b104 gitaly-v16.8.0.tar.gz +7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd " diff --git a/user/gitaly/config.patch b/user/gitaly/config.patch index 79cd1e8..9df7db0 100644 --- a/user/gitaly/config.patch +++ b/user/gitaly/config.patch @@ -1,9 +1,9 @@ diff --git a/config.toml.example.orig b/config.toml.example -index d878b16..6bb7fd9 100644 +index 82b8502..9982087 100644 --- a/config.toml.example.orig +++ b/config.toml.example @@ -2,19 +2,24 @@ - # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/ + # 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" @@ -42,7 +42,7 @@ index d878b16..6bb7fd9 100644 # # Git settings # [git] -@@ -53,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -58,7 +63,7 @@ bin_dir = "/home/git/gitaly/_build/bin" # # The name of the storage name = "default" # # The path to the storage. @@ -51,34 +51,41 @@ index d878b16..6bb7fd9 100644 # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -65,12 +70,12 @@ path = "/home/git/repositories" - # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout +@@ -70,12 +75,12 @@ path = "/home/git/repositories" + # # Optional. Configure Gitaly to output JSON-formatted log messages to stdout. # [logging] - # # The directory where Gitaly stores extra log files + # # Directory where Gitaly stores extra log files. -dir = "/home/git/gitlab/log" ++dir = "/vat/log/gitlab" + # # Log format. Either 'text' or 'json'. -# format = "json" -+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. + # # Valid values are, in order, 'debug', 'info', 'warn', 'error', 'fatal', and 'panic'. Defaults to 'info'. -# level = "warn" +level = "warn" - # - # # Additionally exceptions from the Go server can be reported to Sentry + # # Additionally, exceptions from the Go server can be reported to Sentry. Sentry DSN (Data Source Name) + # # for exception monitoring. # sentry_dsn = "https://:@sentry.io/" -@@ -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] - +@@ -91,18 +96,18 @@ sentry_environment = "" + # # Custom Git hooks that are used to perform tasks based on changes performed in any repository. [hooks] + # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used. -custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "/etc/gitlab/custom_hooks" + # # Gitaly must connect to the GitLab application to perform access checks when a user performs a change. [gitlab] --secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" + # # URL of the GitLab server. -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" -+secret_file = "/etc/gitlab/gitlab_shell_secret" +url = "http+unix://%2Frun%2Fgitlab%2Fworkhorse.socket" - # Only needed if a UNIX socket is used in `url` and GitLab is configured to - # use a relative path (e.g. /gitlab). + # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to + # # use a relative path. For example, '/gitlab'. # relative_url_root = '/' + # # Path of the file containing the secret token used to authenticate with GitLab. Use either 'secret_token' or 'secret' + # # but not both. +-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" ++secret_file = "/etc/gitlab/gitlab_shell_secret" + # # Secret token used to authenticate with GitLab. + # secret = "" + -- 2.45.2 From 46daf7941d3c7deecac296501d23b23d1e743037 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 21 Jan 2024 18:49:09 -0500 Subject: [PATCH 2/5] user/gitlab-foss: upgrade to 16.8.0 --- user/gitlab-foss/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index f7bef5a..fe61db9 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.7.3 +pkgver=16.8.0 _gittag=v$pkgver pkgrel=0 pkgdesc="A version control for your server" @@ -17,8 +17,8 @@ depends=" cmd:dpkg-deb exiftool git>=2.42.0 - gitaly~=16.7 - gitlab-shell~=14.32 + gitaly~=16.8 + gitlab-shell~=14.33 graphicsmagick http-parser procps @@ -382,7 +382,7 @@ assets() { } sha512sums=" -639f3e51df604e8139e8b8e772a330139373e0c38c39f491befd7a1db06fcf95a3e97736de016756eceda978c23e3068a1d36fe71339c2b97b62e706e759c434 gitlab-foss-v16.7.3.tar.gz +90711b858345f45339e5c4e0d3a365736b053233342eadb77aa0237ab3ea1edde970cf65913c852e2c78e6e55462708850cca3764f8129750f83e8ae21c3feef gitlab-foss-v16.8.0.tar.gz daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd -- 2.45.2 From 228d753920d9f81b8d14e380b129b7d0c75160a5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 21 Jan 2024 18:49:39 -0500 Subject: [PATCH 3/5] user/gitlab-pages: upgrade to 16.8.0 --- 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 2ddbc52..af6cc79 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.7.3 +pkgver=16.8.0 _gittag="v$pkgver" pkgrel=0 pkgdesc="A daemon used to serve static websites for GitLab users" @@ -29,7 +29,7 @@ package() { } sha512sums=" -b4d2dc4171e84ca2c491f435f159a4b774bcd912504b69d3467f42e97748bb41487f1c879780ba287595df7890b75d7f0fe8264e5a6ff4c77205130b33b70f05 gitlab-pages-v16.7.3.tar.gz +c9a53a5dc76adcea2be2c321139f3dbc70629e6e3b88ca30da8fc1d824e394f1b17209effc22f1302474b0ddb88066325de4b04d69ae12be0220857f5f492756 gitlab-pages-v16.8.0.tar.gz 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd " -- 2.45.2 From 6187ef07741ea347bf83152fb49eef1019ceb3f9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 21 Jan 2024 18:50:24 -0500 Subject: [PATCH 4/5] user/gitlab-shell: upgrade to 14.33.0 --- user/gitlab-shell/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitlab-shell/APKBUILD b/user/gitlab-shell/APKBUILD index 136d4ce..47240c9 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.32.0 +pkgver=14.33.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=" -c5bed5cb69319547b774fa3bd69edb89cf534e8c53de48ffcd1d9d695f7961c347c94703b0393a4f05b4208778d7bf7600a25d8d416b036800179e4f4469885b gitlab-shell-v14.32.0.tar.gz +4b6a5aa8e47b3ce90abe77e1d5f89a7a4d7fa20d9984d3bf45e3a1d140529ea6e2ee96f6e24db88a4c52315d76393379eeb7d7f24d42c90a16ba17d191b39bd6 gitlab-shell-v14.33.0.tar.gz 8cf13bf472e22b1c429bba5df98afb931c80b043ec83c8366d59f15a1e9b21daf09078f134e7aa622c87b32c774d1d5cf129878d5035102c06d0b12ead33f804 config.patch 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada change-config-path.patch c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c gitconfig -- 2.45.2 From 8082ac390f003ffc50aa2e57a31fdc09ed8f0f0e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 21 Jan 2024 19:32:35 -0500 Subject: [PATCH 5/5] user/gitlab-foss: fix glfm_markdown libary location --- user/gitlab-foss/APKBUILD | 8 ++++++++ .../glfm_markdown_fix-library-location.diff | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 user/gitlab-foss/glfm_markdown_fix-library-location.diff diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index fe61db9..d5c5b8e 100644 --- a/user/gitlab-foss/APKBUILD +++ b/user/gitlab-foss/APKBUILD @@ -79,6 +79,7 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss $_pkgname.logrotate bin-wrapper.in downgrade-sys-filesystem-depend.patch + glfm_markdown_fix-library-location.diff " builddir="$srcdir/gitlab-foss-$_gittag" @@ -144,6 +145,12 @@ build() { bundle install --no-cache + # Patch intalled gem glfm_markdown to look for rust library at right path + ( + cd vendor/bundle/ruby/*/gems/gitlab-glfm-markdown-*/ + patch -p1 -i "$srcdir"/glfm_markdown_fix-library-location.diff + ) + # Replace bundled CA bundle with symlink. ( cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/ @@ -393,4 +400,5 @@ cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08d 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch +95c2079a8b56d4571c3f9d54c3be380d36f64b7e48164468513778185957325a33c7693436b7e75f98f07aa767fda95d5852f957849199fd1f9bc6e6074e3ddc glfm_markdown_fix-library-location.diff " diff --git a/user/gitlab-foss/glfm_markdown_fix-library-location.diff b/user/gitlab-foss/glfm_markdown_fix-library-location.diff new file mode 100644 index 0000000..3d5bfd8 --- /dev/null +++ b/user/gitlab-foss/glfm_markdown_fix-library-location.diff @@ -0,0 +1,13 @@ +diff --git a/lib/glfm_markdown/loader.rb.orig b/lib/glfm_markdown/loader.rb +index 295d549..6718619 100644 +--- a/lib/glfm_markdown/loader.rb.orig ++++ b/lib/glfm_markdown/loader.rb +@@ -2,7 +2,7 @@ + + def load_rust_extension + ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION) +- require_relative "./#{ruby_version}/glfm_markdown" ++ require_relative "../../lib/glfm_markdown" + rescue LoadError + require 'glfm_markdown/glfm_markdown' + end -- 2.45.2