From f5bbad0712750eea9175fbaf7fceaa8ae08dd52f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 12 Jun 2024 20:11:40 -0400 Subject: [PATCH 1/3] user/gitaly: upgrade to 16.11.4 --- user/gitaly/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD index 3d17edb..801d299 100644 --- a/user/gitaly/APKBUILD +++ b/user/gitaly/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitaly -pkgver=16.9.8 +pkgver=16.11.4 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=" -f3a7c7e2e5d96d5238bad16f9d0d79a8819b15be5228bb3a7fc8c796488eb7a7914355a4d6ec1ae0b0fa971d3299068735816518005f62dacc6211b59bdc58f7 gitaly-v16.9.8.tar.gz +c8107d5058bb7470244bc368fd1cec827a6fac32efef3ed4ffe637b1897bac6c440001e7a17bac97a22942c2dcba118c7fdd9dde49b8f286a0676c483aa815e4 gitaly-v16.11.4.tar.gz 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd " -- 2.45.2 From 507663db3b844f0dec3c4341e8112b62f06cbd79 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 12 Jun 2024 20:12:14 -0400 Subject: [PATCH 2/3] user/gitlab-pages: upgrade to 16.11.4 --- 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 18e54c9..ab65b67 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.9.8 +pkgver=16.11.4 _gittag="v$pkgver" pkgrel=0 pkgdesc="A daemon used to serve static websites for GitLab users" @@ -29,7 +29,7 @@ package() { } sha512sums=" -aeef1c9c226238f5846080c5bbd3d2481f6cb5741ce80fc39ba98669f24959c7142fa491a7c65239d61084f8d7c0feba384a99d17f6c60b5b1a7aee9db1c41e9 gitlab-pages-v16.9.8.tar.gz +09b8fa7e094698ad196de1e75c07fdce3d6b37a11ce7aa57bb2953b098bfd1fd9661911488a914d8e458b3c282c805649219189cf4fc75a45c54785ad87b4074 gitlab-pages-v16.11.4.tar.gz 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd " -- 2.45.2 From 65a5f41649d09416dbb44fe0f2a2c86f12087de7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 12 Jun 2024 20:12:46 -0400 Subject: [PATCH 3/3] user/gitlab-foss: upgrade to 16.11.4 --- user/gitlab-foss/APKBUILD | 8 ++++---- ...tch => upgrade-sys-filesystem-depend.patch} | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) rename user/gitlab-foss/{downgrade-sys-filesystem-depend.patch => upgrade-sys-filesystem-depend.patch} (73%) diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index 9d13bd8..9925aa5 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.9.8 +pkgver=16.11.4 _gittag=v$pkgver pkgrel=0 pkgdesc="A version control for your server" @@ -78,7 +78,7 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss $_pkgname.confd $_pkgname.logrotate bin-wrapper.in - downgrade-sys-filesystem-depend.patch + upgrade-sys-filesystem-depend.patch " builddir="$srcdir/gitlab-foss-$_gittag" @@ -379,7 +379,7 @@ assets() { } sha512sums=" -95120e8bdd2245b54b1c520b3d32b72747cffadede3bcd9eb43d2de68887ac4b96581ce14a647f2c380fd41878d8b1d2a999c0412db50b75d94b4965195f064b gitlab-foss-v16.9.8.tar.gz +8b9438778b61901dbfbc5c8af699a72e2279fb25f4e129ebdda294a6a0885056d0b1d2d51d760ad00a86f8ee61eb52bbf82cb96122fe5ccb2d5bffb485e720d3 gitlab-foss-v16.11.4.tar.gz daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd @@ -389,5 +389,5 @@ cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08d 4dc00b16462f30591297fcb535fc364185d3ed76e9956597f0423a8dfd8a9a351f6ac29d9f0c73052c11324fba4768eb89a21c6bef4da99f15baaea8c9ab8407 gitlab.confd 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in -ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch +0eaa7de9a906ddb0fe84b7afbaec893a134bbbdb9e71da75cf4095ef40404643e51447aee88d3cad6e565bc709b34ffd8901cc93061e4a2a410838aed42d3644 upgrade-sys-filesystem-depend.patch " diff --git a/user/gitlab-foss/downgrade-sys-filesystem-depend.patch b/user/gitlab-foss/upgrade-sys-filesystem-depend.patch similarity index 73% rename from user/gitlab-foss/downgrade-sys-filesystem-depend.patch rename to user/gitlab-foss/upgrade-sys-filesystem-depend.patch index 3ed59d0..d608191 100644 --- a/user/gitlab-foss/downgrade-sys-filesystem-depend.patch +++ b/user/gitlab-foss/upgrade-sys-filesystem-depend.patch @@ -7,31 +7,29 @@ index c1e9e34..a4448b7 100644 # System information gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'sys-filesystem', '= 1.3.2' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'sys-filesystem', '~> 1.4.5' # rubocop:todo Gemfile/MissingFeatureCategory # NTP client gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.lock.orig b/Gemfile.lock -index e2ebb91..39b6df3 100644 +index bb66169..a4da10b 100644 --- a/Gemfile.lock.orig +++ b/Gemfile.lock -@@ -1605,8 +1605,8 @@ GEM +@@ -1657,7 +1657,7 @@ GEM attr_required (>= 0.0.5) httpclient (>= 2.4) sync (0.5.0) - sys-filesystem (1.4.3) -- ffi (~> 1.1) -+ sys-filesystem (1.3.2) -+ ffi (>= 0) ++ sys-filesystem (1.4.5) + ffi (~> 1.1) sysexits (1.2.0) table_print (1.5.7) - tanuki_emoji (0.9.0) -@@ -2061,7 +2059,7 @@ DEPENDENCIES - ssh_data (~> 1.3) +@@ -2123,7 +2123,7 @@ DEPENDENCIES stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) + static_holmes (~> 0.7.7) - sys-filesystem (~> 1.4.3) -+ sys-filesystem (= 1.3.2) ++ sys-filesystem (~> 1.4.5) tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) -- 2.45.2