From nobody Fri Oct 06 07:24:19 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 4S20Kv5rn3z4wDgy; Fri, 6 Oct 2023 07:24:19 +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 4S20Kv5Pw4z3MKT; Fri, 6 Oct 2023 07:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696577059; 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=lNErd2q5mwi6COvLaaTx5C+BX3E0yjbX1OTuCpWQhV4=; b=QqOZB6naUQGONez+xJrqt/mCDqVOP7LjTcpjWOXEjElq3qhrDLRbGx1+8OqsozHSyD53Fq O7vSxLGJFOzEdb1+NyLr/suaEmUWjRCqGqrdliIIgDxDgoo7iYiW60BvGxPWUIJMZsSshk K/dYSRLDLyW/6LCf7wG9oZarJmw2SFYlTwsPU6G2vIGPrrccUqoSV5X3nVnjju1zb+m4Mw LR8xCCvgFI6FEc8LoH/BqQpwl4nA3lVw0539rmEiTTtZ7L7g0dLuCktIG+CekS2kBWsNPB Du/7MuJidwPsxuYq1MxTjD5B4Ov4nPfn1XRPIPoCxS60JlIoUFLCdWijvEP0Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696577059; a=rsa-sha256; cv=none; b=s2ufUgUhovhm/v0Fp5mV8oMhu88F4h3dYDG+OrgLDL20zbUVQUp3vxxnn5qb3tm+hCAn0N qYePEN2O+ifvcwV1/eAM8kqBWOBGfvAsx1T3VznUzDotBqr+purdKQ0FUoWAV6s/6SoP/1 vNJucQHa+Vj2qjKMlAt+3K46wP6kDw67nfkv8l05sGqYwnUqb+PEb+1+UVv7kgW6R4aGQi 9W2CLjefwMQzbag8AyM7b1ocMUdaSW98zEfsQVI7KVc/BwBwlY93IF+fPXonjNvyb7CIA8 Dlm5O2seG+Ik/E2SxWpP/Eo4K6quS7D5laOFTr99RnwRCrqlG7w9UbmCXveb3Q== 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=1696577059; 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=lNErd2q5mwi6COvLaaTx5C+BX3E0yjbX1OTuCpWQhV4=; b=VgZSIAyQcY1jvNlV4XOId8hO/z/1B59bo6Hs4hViyvxbg04gQAOBQNhsP48LrPbU48DWZi nk0mjzmogkmatdggPxa/jWhkdejKfHPMMVgLaoae9Gs6AOTWK2+jT9EQZyq/vXowEzSmS3 1IhSLUvEvcpi5kPssVGWODAuIkuL3GPuUe1b5cHKeWrqbQEmPM8S/B2NnEw8zOuBvEh43l OpqGTweT+kUOLn77NDQ2Mr/futGPytP+zKpV8QBSdIOj9VYLc6DTl+1wHG7IN9Q8fW0r5d jdRBl5YMmf+WHEBsXOBEZaTcXi7CjiTuT8t42ngB8qms3C5lBCjj+lGmLk7/FQ== 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 4S20Kv4L7QzfRn; Fri, 6 Oct 2023 07:24:19 +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 3967OJbR092296; Fri, 6 Oct 2023 07:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3967OJJ2092293; Fri, 6 Oct 2023 07:24:19 GMT (envelope-from git) Date: Fri, 6 Oct 2023 07:24:19 GMT Message-Id: <202310060724.3967OJJ2092293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 9b53145f43e1 - 2023Q4 - 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 9b53145f43e120edf7151c106c65edd5e245b61d Auto-Submitted: auto-generated The branch 2023Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b53145f43e120edf7151c106c65edd5e245b61d commit 9b53145f43e120edf7151c106c65edd5e245b61d Author: Matthias Fechner AuthorDate: 2023-10-05 12:57:59 +0000 Commit: Matthias Fechner CommitDate: 2023-10-06 06:05:53 +0000 www/gitlab-ce: fix problem with rubygem-sidekiq 6.5.10 Fix a regression instroduced by: aa93117abe2109fc18dda351690beb5358bb8c95 (cherry picked from commit 3083687cbace383da3247089d07360d4be36033d) --- 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 813e17c652ab..6bfe2a75c5c9 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.3.5 +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