From aff9c1bfd6018221c078c4860dd9409cf651427e Mon Sep 17 00:00:00 2001
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 8 Oct 2023 19:56:45 +0800
Subject: [PATCH] www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.11
- Bump PORTREVISION for package change
Note that it is an upstream issue.
Upstream has conflicting requirement for sidekiq which causes runtime issue.
from Gemfile:
gem 'sidekiq', '~> 6.5.7'
from lib/gitlab/patch/sidekiq_cron_poller.rb:
if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7')
raise 'New version of sidekiq detected, please remove or update this patch'
end
---
www/gitlab-ce/Makefile | 2 +-
.../files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 9c30f90440a8..ea2397f4a921 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.4.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= www devel
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb b/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb
index 394302ab9855..304a29612158 100644
--- a/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb
+++ b/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb
@@ -5,7 +5,7 @@
require 'sidekiq/cron/version'
-if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7')
-+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.10')
++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.11')
raise 'New version of sidekiq detected, please remove or update this patch'
end
--
GitLab