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

user/gitlab-foss: upgrade to 16.8.1 #371

Merged
ayakael merged 3 commits from gitlab-foss/upgrade-16.8.1 into edge 2024-01-26 05:47:06 +00:00
Conversation 2 Commits 3 Files changed 4 +7 -28
4 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
user/gitaly/APKBUILD
View file

@ -2,7 +2,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=gitaly pkgname=gitaly
pkgver=16.8.0 pkgver=16.8.1
pkgrel=0 pkgrel=0
pkgdesc="A Git RPC service for handling all the git calls made by GitLab" pkgdesc="A Git RPC service for handling all the git calls made by GitLab"
url="https://gitlab.com/gitlab-org/gitaly/" url="https://gitlab.com/gitlab-org/gitaly/"
@ -80,7 +80,7 @@ praefect() {
} }
sha512sums=" sha512sums="
5867b328d0086e4a3135e8d66b778d1c7ee1a0abfaed1bbeecaa1876c7fcc5ec369baa6b0303522f3cf8c97c809a8263256e56844c9fae8583331efc2498b104 gitaly-v16.8.0.tar.gz b1da4605c85d1a816608ae51387cc1617f409016001c9eee431e7a00f03bd711fc13b226c4991a76adc221ebfc3aec11a29788abd67eb57e906a8c404cb2f806 gitaly-v16.8.1.tar.gz
7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
" "

14
user/gitlab-foss/APKBUILD
View file

@ -3,9 +3,9 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=gitlab-foss pkgname=gitlab-foss
_pkgname=${pkgname%-foss} _pkgname=${pkgname%-foss}
pkgver=16.8.0 pkgver=16.8.1
_gittag=v$pkgver _gittag=v$pkgver
pkgrel=1 pkgrel=0
pkgdesc="A version control for your server" pkgdesc="A version control for your server"
url="https://gitlab.com/gitlab-org/gitlab-foss" url="https://gitlab.com/gitlab-org/gitlab-foss"
arch="x86_64 aarch64" arch="x86_64 aarch64"
@ -79,7 +79,6 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss
$_pkgname.logrotate $_pkgname.logrotate
bin-wrapper.in bin-wrapper.in
downgrade-sys-filesystem-depend.patch downgrade-sys-filesystem-depend.patch
glfm_markdown_fix-library-location.diff
" "
builddir="$srcdir/gitlab-foss-$_gittag" builddir="$srcdir/gitlab-foss-$_gittag"
@ -145,12 +144,6 @@ build() {
bundle install --no-cache 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. # Replace bundled CA bundle with symlink.
( (
cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/ cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/
@ -389,7 +382,7 @@ assets() {
} }
sha512sums=" sha512sums="
90711b858345f45339e5c4e0d3a365736b053233342eadb77aa0237ab3ea1edde970cf65913c852e2c78e6e55462708850cca3764f8129750f83e8ae21c3feef gitlab-foss-v16.8.0.tar.gz 9e36eec8209a64cbda254b851213a4ba97c629cbe1f8a008ead7a53e1bc308ac866e9c65a60bcad74f377155346c38b439a2282e4d74431d1642cb6d8b31ab5d gitlab-foss-v16.8.1.tar.gz
daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd
@ -400,5 +393,4 @@ cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08d
57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate
a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in
ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch
95c2079a8b56d4571c3f9d54c3be380d36f64b7e48164468513778185957325a33c7693436b7e75f98f07aa767fda95d5852f957849199fd1f9bc6e6074e3ddc glfm_markdown_fix-library-location.diff
" "

13
user/gitlab-foss/glfm_markdown_fix-library-location.diff
View file

@ -1,13 +0,0 @@
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

4
user/gitlab-pages/APKBUILD
View file

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