git: 7a257f7e0c0c - main - www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.12
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Oct 2023 22:23:35 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7a257f7e0c0c29fc3708e53aba919ee5c91e4dd2
commit 7a257f7e0c0c29fc3708e53aba919ee5c91e4dd2
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-10-11 22:22:55 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-10-11 22:22:55 +0000
www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.12
- 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 +-
www/gitlab-ce/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 4540bd11edcf..97d611fcb6c1 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.4.1
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
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 304a29612158..858010032dd9 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.11')
++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.12')
raise 'New version of sidekiq detected, please remove or update this patch'
end