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

user/gitlab-foss: upgrade to 16.8.1

Browse source
This commit is contained in:
Antoine Martin 2024-01-25 19:10:24 -05:00
parent e1230d065a
commit e8336635fe
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
user/gitlab-foss/APKBUILD
View file

@ -3,7 +3,7 @@
# 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=0 pkgrel=0
pkgdesc="A version control for your server" pkgdesc="A version control for your server"
@ -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