From nobody Thu Oct 05 12:59:13 2023 X-Original-To: dev-commits-ports-all@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 4S1Wpn4Jhbz4wcnC; Thu, 5 Oct 2023 12:59:13 +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 4S1Wpn3bFCz4G7M; Thu, 5 Oct 2023 12:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696510753; 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=DOX24wzTYiZdCCf37BV4NVbTmR17aJLovPrI7OPTX4Q=; b=eZ9blPEf2twNH2X0EFA1jUbVuWM2PA8f3U7LvncuJ03XvZeQeTUrEoIOoPsvqJTxHWMEZF UAhHmL7yKyxhY9t+rL3q3SkEwjAo2PLAlz/HfmFFChFv19ngj1/4DEC/g2rk6hC2a1WZA5 JW9sgoeF74Jnrb4gDjYFrg+1XbdvVwxks5sxxaq6JWabHMQbmyMj+++mqOdYn+lqeAiqes J8QCNMwgLVYqpFuHgr40Ic2reeXNxFnmJgUdGQvbwzcdRsmyhstsiM28spX3jm9dzrSaDC J226MmPcDYvaQU0y/ehJgZvGSE3OBoACtU/HkY9dxc9KkCte6ao9Mv0ApU7IxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696510753; a=rsa-sha256; cv=none; b=c7i7r3b/D/wm+tiY8ENnrApVir9JOQSQKPkCJwmDqRY84rcFDVuTmJdBkT1F5KbtEqOUzn eMryl+lymEi25YCTlrpqb66E0riiXQ13d6v++4qXXIBQgzXPi54D4BcQz/Y6QMEN0c/cb9 Ug4KKU+vIVVieOkMcncpbSjF0HQmCf/LiTe327HZ1fJER+p0khYI2momQo9d7bj9iTDzIW ShwJcroV7J//goz0VcATPLwatZcPaGNMJ4pQpHQvfGYNysKsbUfW61PisxCYLN5xkcSli1 Ax9NqGaNBfkTtynecHwtud/nsK4afje6T291EsYT9MI81NAWgQaEALXpQMVAMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696510753; 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=DOX24wzTYiZdCCf37BV4NVbTmR17aJLovPrI7OPTX4Q=; b=qzO95U6dDj9Zj9zMDIRC+SZijV+Wl61nq/A+I8nW8kzizbPx5CJ4YkCAcs9fDWvafavMeI VzAT7Q2YcNpgIDV7KXZvhR7ZgXFVAO/0wnyYp6nEfEQaqb8hX0c8fRHNM87/Sj5zJY69m+ M1Xh9b5gysvqdn3Ng3otrY2laN1xs2uxqGArrLx+E6pCpfwfMZm9JVjFQ91dfAmrA1DTW2 m62PRkoB5gRhu+zpQdqWNr2ThIctH8UGe+jRX3LPgZ2zAJ78LdqxrFteiGgiIRY4kSG24+ kTlWjDuxwnwQVUEOaqEhh0SY/vrjhtBuyB3RHh345JUBJDrRbIRTaSDV8rVjtg== 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 4S1Wpn2fffz1KgJ; Thu, 5 Oct 2023 12:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395CxDgT045003; Thu, 5 Oct 2023 12:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395CxDuG045000; Thu, 5 Oct 2023 12:59:13 GMT (envelope-from git) Date: Thu, 5 Oct 2023 12:59:13 GMT Message-Id: <202310051259.395CxDuG045000@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: 3083687cbace - main - www/gitlab-ce: fix problem with rubygem-sidekiq 6.5.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 3083687cbace383da3247089d07360d4be36033d Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3083687cbace383da3247089d07360d4be36033d commit 3083687cbace383da3247089d07360d4be36033d Author: Matthias Fechner AuthorDate: 2023-10-05 12:57:59 +0000 Commit: Matthias Fechner CommitDate: 2023-10-05 12:57:59 +0000 www/gitlab-ce: fix problem with rubygem-sidekiq 6.5.10 Fix a regression instroduced by: aa93117abe2109fc18dda351690beb5358bb8c95 --- www/gitlab-ce/Makefile | 1 + www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index bbbd508350ce..9c30f90440a8 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.4.1 +PORTREVISION= 1 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 ce56be8d52f7..394302ab9855 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.9') ++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.10') raise 'New version of sidekiq detected, please remove or update this patch' end