From nobody Mon Jun 13 10:13:55 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 66F4A83724A; Mon, 13 Jun 2022 10:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LM6q727f3z4rpx; Mon, 13 Jun 2022 10:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655115235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rj3VG9faGBN+9NlBojtF4YpGAaABkGa+xxkTJ2FdZUM=; b=cerBcd/Thn/tlhPvFvdn4AKQ1reUYCCoJFWQg0MJDnKTefrCMGJyCTW7CORtuZMqpTfWOp pHelrvfyluUQ+9z8O45Icmv8evyak7usJOj2axtxL3rLEiyTthrXl6WZjXxOfx12SZIK72 G9liCMNYAPFM42I9Ga3QkzQTAkNMMmHcokOUcEG9s5IEGC6QtPUIoLREtLQMekS8rFqJwZ UzHTmmW1q80O1EMkGxRX22rlQHoKQLXAJQZk6BoadVLSSAciDYZf+cKcqMtrdW/PUiRP5J CePn3DX/bJaEfYa50WmzvCqnqDj763s52zDcpRJFyRTRJPFtesO3rqOIrYdYkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 286FB13FA1; Mon, 13 Jun 2022 10:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25DADtfN068585; Mon, 13 Jun 2022 10:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DADtXm068584; Mon, 13 Jun 2022 10:13:55 GMT (envelope-from git) Date: Mon, 13 Jun 2022 10:13:55 GMT Message-Id: <202206131013.25DADtXm068584@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: ed5dcd73200b - main - www/gitlab-ce: fix problem with sidekiq List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed5dcd73200bc2f28ab8178c36180bee182bf724 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655115235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rj3VG9faGBN+9NlBojtF4YpGAaABkGa+xxkTJ2FdZUM=; b=PY6WGN6sSuc0ljjBbh8xNncUHQnuthWpkapTgJ2KXIiFzsAtDBaAm0e9ZB0MKgBx5BGpxr r827U9Hhv3N/o5DRH5+5jWNhqq+f3tYTWsTLgQtXZI7MYOPgN4/KhAlWIBhzuVy/+asC76 Y48C7cBxSVUXlJIrYWRw2zafGxYFalT9SJchLLNIhtEHztht8DbcGNvmLjliEjUgrA/gpk 1JUPoKWlIeFYyqgwukwRWO+0A3yo3YzqimGgnhkZhqTt8x7Aatk6jLNq+OtgZ0GQIEOzWE qaYgjto6LjscFNPcJ6j/VYZZrw8JXXYHT1y3MjIRtVqccc2CFCNn+4PLXn2Kuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655115235; a=rsa-sha256; cv=none; b=WfU0dWUc6Tq8xjNLjAB3TUZbHmBsIZYBKVJKuo96blO/NcJXRvDMGEIg8/4nW6OOglke6m xdK/0/LP6d8UvlIyl1xEZLd9fCqbqTSqiaS1QIz8lwfw01t4sWwepqva+OUJ1Cp4iT+UQN rsTXvA7hMZnjiImJ3SAFHJL6V0S3P1nV1R6sWEM7LudKjzkgeXzGcsr15G2HxuhIeD12vT s7W0cOn6fHm+kPz2ybza2cKvin9M8Ro3UQDFC5li8pDdRufBklz6OlzGUEyQr1hVA/98wf 0cJaXmFFHrkkGvpzkuiCIE/4B4VFLNKc68C4ySCxofpdcwkPQmEEan4Dl8Qmeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed5dcd73200bc2f28ab8178c36180bee182bf724 commit ed5dcd73200bc2f28ab8178c36180bee182bf724 Author: Matthias Fechner AuthorDate: 2022-06-13 09:58:00 +0000 Commit: Matthias Fechner CommitDate: 2022-06-13 10:05:34 +0000 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 --- devel/Makefile | 2 ++ devel/rubygem-gitlab-sidekiq-fetcher/Makefile | 3 ++- devel/rubygem-sentry-sidekiq/Makefile | 3 ++- devel/rubygem-sidekiq-cron-sidekiq64/Makefile | 23 ++++++++++++++++++++ devel/rubygem-sidekiq-cron-sidekiq64/distinfo | 3 +++ devel/rubygem-sidekiq-cron-sidekiq64/pkg-descr | 11 ++++++++++ devel/rubygem-sidekiq64/Makefile | 29 ++++++++++++++++++++++++++ devel/rubygem-sidekiq64/distinfo | 3 +++ devel/rubygem-sidekiq64/pkg-descr | 4 ++++ www/gitlab-ce/Makefile | 4 ++-- 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 + +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 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 + +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 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 \