www/gitlab-ce: fix problem with sidekiq

Gitlab does not work with sidekiq 6.5, use version 6.4
Fixes a regression introduced by:
01b52c7a7338a97e7677e2186ac4183549e3ad7c

10 files changed, 81 insertions, 4 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 58f3488fdf8e..5bff0303af9f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6903,8 +6903,10 @@
     SUBDIR += rubygem-shoulda-context
     SUBDIR += rubygem-shoulda-matchers
     SUBDIR += rubygem-sidekiq
+    SUBDIR += rubygem-sidekiq64
     SUBDIR += rubygem-sidekiq-bulk
     SUBDIR += rubygem-sidekiq-cron
+    SUBDIR += rubygem-sidekiq-cron-sidekiq64
     SUBDIR += rubygem-sidekiq-scheduler
     SUBDIR += rubygem-sidekiq-unique-jobs
     SUBDIR += rubygem-sidetiq
diff --git a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
index e3a6622b5ff5..ec278390f149 100644
--- a/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
+++ b/devel/rubygem-gitlab-sidekiq-fetcher/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitlab-sidekiq-fetcher
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -10,7 +11,7 @@ COMMENT=	Redis reliable queue pattern implemented in Sidekiq
 
 LICENSE=	RUBY
 
-RUN_DEPENDS=	rubygem-sidekiq>=6.1<7:devel/rubygem-sidekiq
+RUN_DEPENDS=	rubygem-sidekiq64>=6.1<7:devel/rubygem-sidekiq64
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/devel/rubygem-sentry-sidekiq/Makefile b/devel/rubygem-sentry-sidekiq/Makefile
index 96ca26a6062b..ffa50291ff8e 100644
--- a/devel/rubygem-sentry-sidekiq/Makefile
+++ b/devel/rubygem-sentry-sidekiq/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sentry-sidekiq
 PORTVERSION=	5.1.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-sentry-ruby-core>=5.1.1<5.2:devel/rubygem-sentry-ruby-core \
-		rubygem-sidekiq>=3.0:devel/rubygem-sidekiq
+		rubygem-sidekiq64>=3.0:devel/rubygem-sidekiq64
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidekiq-cron-sidekiq64/Makefile b/devel/rubygem-sidekiq-cron-sidekiq64/Makefile
new file mode 100644
index 000000000000..f405ec105b15
--- /dev/null
+++ b/devel/rubygem-sidekiq-cron-sidekiq64/Makefile
@@ -0,0 +1,23 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME=	sidekiq-cron
+PORTVERSION=	1.4.0
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-sidekiq64
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Enables to set jobs to be run in specified time (using CRON notation)
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-fugit>=1<2:devel/rubygem-fugit \
+		rubygem-sidekiq64>=4.2.1:devel/rubygem-sidekiq64
+
+USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-sidekiq-cron-sidekiq64/distinfo b/devel/rubygem-sidekiq-cron-sidekiq64/distinfo
new file mode 100644
index 000000000000..240fa71f3499
--- /dev/null
+++ b/devel/rubygem-sidekiq-cron-sidekiq64/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1655113670
+SHA256 (rubygem/sidekiq-cron-1.4.0.gem) = 21612ade25ea79b4eeb8eacd7fb559a85a1abf6bf1da1aca1aa0079cafd3376d
+SIZE (rubygem/sidekiq-cron-1.4.0.gem) = 27648
diff --git a/devel/rubygem-sidekiq-cron-sidekiq64/pkg-descr b/devel/rubygem-sidekiq-cron-sidekiq64/pkg-descr
new file mode 100644
index 000000000000..78a2fca4665e
--- /dev/null
+++ b/devel/rubygem-sidekiq-cron-sidekiq64/pkg-descr
@@ -0,0 +1,11 @@
+Sidekiq-Cron is a scheduling add-on for Sidekiq.
+
+It runs a thread alongside Sidekiq workers to schedule jobs at specified times
+(using cron notation * * * * * parsed by Rufus-Scheduler).
+
+It also checks for new jobs to schedule every 10 seconds and doesn't schedule
+the same job multiple times when more than one Sidekiq worker is running.
+
+Scheduling jobs are added only when at least one Sidekiq process is running.
+
+WWW: https://github.com/ondrejbartas/sidekiq-cron
diff --git a/devel/rubygem-sidekiq64/Makefile b/devel/rubygem-sidekiq64/Makefile
new file mode 100644
index 000000000000..0ffdab7a6bdf
--- /dev/null
+++ b/devel/rubygem-sidekiq64/Makefile
@@ -0,0 +1,29 @@
+# Created by: Steve Wills <swills@FreeBSD.org>
+
+PORTNAME=	sidekiq
+PORTVERSION=	6.4.2
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	64
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Simple, efficient background processing for Ruby
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-connection_pool>=2.2.2:net/rubygem-connection_pool \
+		rubygem-rack>=2.0,3<3,3:www/rubygem-rack \
+		rubygem-redis>=4.2.0:databases/rubygem-redis
+
+USES=		cpe gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
+
+PLIST_FILES=	bin/sidekiq \
+		bin/sidekiqmon
+
+CPE_VENDOR=	contribsys
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-sidekiq64/distinfo b/devel/rubygem-sidekiq64/distinfo
new file mode 100644
index 000000000000..960be9fb0c5a
--- /dev/null
+++ b/devel/rubygem-sidekiq64/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1655105966
+SHA256 (rubygem/sidekiq-6.4.2.gem) = 0d3c05fecb5fbace5ff5efc63da707e02a9c4673fb8e33ceca10b5ec0e9f062c
+SIZE (rubygem/sidekiq-6.4.2.gem) = 262656
diff --git a/devel/rubygem-sidekiq64/pkg-descr b/devel/rubygem-sidekiq64/pkg-descr
new file mode 100644
index 000000000000..5c0231e2a043
--- /dev/null
+++ b/devel/rubygem-sidekiq64/pkg-descr
@@ -0,0 +1,4 @@
+Simple, efficient background processing for Ruby
+
+WWW: https://sidekiq.org/
+WWW: https://github.com/mperham/sidekiq
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index d1f66d833e63..332c29f48e79 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -147,8 +147,8 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \
 	rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
-	rubygem-sidekiq>=6.4<7:devel/rubygem-sidekiq \
-	rubygem-sidekiq-cron>=1.2<2.0:devel/rubygem-sidekiq-cron \
+	rubygem-sidekiq64>=6.4<6.5:devel/rubygem-sidekiq64 \
+	rubygem-sidekiq-cron-sidekiq64>=1.2<2.0:devel/rubygem-sidekiq-cron-sidekiq64 \
 	rubygem-redis-namespace>=1.8.1<1.9.0:databases/rubygem-redis-namespace \
 	rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \