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

[3.20] user/gitlab-foss: upgrade to 17.0.2 #532

Merged
ayakael merged 3 commits from gitlab-foss/upgrade-17.0.2-320 into v3.20 2024-06-14 18:34:23 +00:00
Conversation 1 Commits 3 Files changed 3 +8 -26
3 changed files with 8 additions and 26 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.11.4 pkgver=17.0.2
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="
c8107d5058bb7470244bc368fd1cec827a6fac32efef3ed4ffe637b1897bac6c440001e7a17bac97a22942c2dcba118c7fdd9dde49b8f286a0676c483aa815e4 gitaly-v16.11.4.tar.gz 645673511a9fbf868094e58c36395867228ba8a9c8e829d499e8008d8a713bab5b0f0bd0daec3f2acea5349435ccfff3559d086a2a96edca97573f8dcbb92fbd gitaly-v17.0.2.tar.gz
7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch
c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd
" "

26
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.11.4 pkgver=17.0.2
_gittag=v$pkgver _gittag=v$pkgver
pkgrel=0 pkgrel=0
pkgdesc="A version control for your server" pkgdesc="A version control for your server"
@ -17,8 +17,8 @@ depends="
cmd:dpkg-deb cmd:dpkg-deb
exiftool exiftool
git>=2.42.0 git>=2.42.0
gitaly~=16.9 gitaly~=17.0
gitlab-shell>=14.34 gitlab-shell>=14.35
graphicsmagick graphicsmagick
http-parser http-parser
procps procps
@ -59,8 +59,6 @@ makedepends="
protobuf-dev protobuf-dev
re2-dev re2-dev
ruby3.2-dev ruby3.2-dev
ruby3.2-grpc~=1.58
ruby3.2-rugged
rust rust
yarn>=1.2.0 yarn>=1.2.0
" "
@ -91,8 +89,6 @@ export BUNDLE_FROZEN=true
export BUNDLE_JOBS=1 export BUNDLE_JOBS=1
prepare() { prepare() {
local sysgemdir=$(ruby -e 'puts Gem.default_dir')
default_prepare default_prepare
# The default log level is very chatty. # The default log level is very chatty.
@ -108,17 +104,6 @@ prepare() {
# Allow use of any bundler # Allow use of any bundler
sed -i -e '/BUNDLED/,+1d' Gemfile.lock sed -i -e '/BUNDLED/,+1d' Gemfile.lock
# Some gems are broken, so we copy our fixed version
# instead of installing it from RubyGems using Bundler.
for i in grpc rugged; do
mkdir -p vendor/gems/$i/src/ruby/lib/$i
cp -r "$sysgemdir"/gems/$i-*/* vendor/gems/$i/
cp "$sysgemdir"/specifications/$i-*.gemspec \
vendor/gems/$i/$i.gemspec
cp "$sysgemdir"/extensions/*/*/$i-*/$i/*.so \
vendor/gems/$i/src/ruby/lib/$i/
done
} }
build() { build() {
@ -154,9 +139,6 @@ build() {
# Remove faulty RPATH. # Remove faulty RPATH.
chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so
# cp grpc lib
cp vendor/gems/grpc/src/ruby/lib/grpc/grpc_c.so vendor/bundle/ruby/*/gems/grpc-*/src/ruby/lib/grpc/grpc_c.so
# Patch installed gem gitlab-markup to use python3. # Patch installed gem gitlab-markup to use python3.
# Option "-S" causes that Python cannot find docutils module. # Option "-S" causes that Python cannot find docutils module.
sed -i 's/python2 -S/python3/g' \ sed -i 's/python2 -S/python3/g' \
@ -379,7 +361,7 @@ assets() {
} }
sha512sums=" sha512sums="
8b9438778b61901dbfbc5c8af699a72e2279fb25f4e129ebdda294a6a0885056d0b1d2d51d760ad00a86f8ee61eb52bbf82cb96122fe5ccb2d5bffb485e720d3 gitlab-foss-v16.11.4.tar.gz f9e9a5c4dec5a15281e9173ad93b260315330d4707985e5393d86e08d3dc1883cb107f5e4f6fd2c0d2d3e3325a99e678471a04aa613f8a4a99e9e965f7626466 gitlab-foss-v17.0.2.tar.gz
daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd

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.11.4 pkgver=17.0.2
_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="
09b8fa7e094698ad196de1e75c07fdce3d6b37a11ce7aa57bb2953b098bfd1fd9661911488a914d8e458b3c282c805649219189cf4fc75a45c54785ad87b4074 gitlab-pages-v16.11.4.tar.gz 3cbd35acdd98acac4300bf1eadedd53db8925ae70c1af7c94eaff26399b501490b81432631c493988ca5fa91154b72b0eb8b00441caec6f67771be3079bee526 gitlab-pages-v17.0.2.tar.gz
710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch
20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd
" "