From nobody Sun Oct 08 12:04:19 2023 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 4S3LS410GBz4wScZ; Sun, 8 Oct 2023 12:04:20 +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 4S3LS40N8xz4Lmt; Sun, 8 Oct 2023 12:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696766660; 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=tCqFtpN3hsGbE+xh1oZkWHofmf/IpAFJEo2rAzXl1sQ=; b=de0ZoYpsN7kc0/QGQkaTtXU7gOhULS73a2T4w6pIeTL0SDrmQ+iNj9m/jDh43tTkns+4vQ pF7Vqcc4FRPmJV8Es4hO1571t2WAhVxvLvhMY75BTXKXK+PsRm9THC5+X4nUtWq92d5wEC UL6Q3cYQoeavcEFjUjmXJnXgkspkVBIJPVk7sRxyOaiiJJQ3T1W09WdE2M/CmJTAUNh0Uj mZgnDSCB/9dqXywifviHMbwN0N0yuaCuWsA0FMeWNONUZHAShtPtig+1nZmMy8equJiwkQ sF3RUUaNIa7k77QUXtRNGATFUJif69FqA0SRWK4Lz169/XhBwK3hkfxutlMtQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696766660; a=rsa-sha256; cv=none; b=cTc18dKI7Kj3J+2EN4ZV0JpZdG7CLvWQVHYuXpkyd8vohdmUbMG8GfAqUgxHGoWhy3jgPF npExADkyC2CcNy2dkFX6tQaZAZU0ZBwHLeAF9/4DrfyrfMDEUO+YxV3iR2PkOYV3YgF3BT m76qtgC+1D3o37SiCSjfcFIHAA5d9s5WriZdwCSwGlniW4NUYK0kMjlg1fLl0aN9ucAluo 08eCcNj9zO3bTo7dz4PFImuNG97WYQWSRx077PR5Sb/s/KVV9BhROWmWWgd+Yzqj8ps+7Y LfiNx9EpUgAiOHvyEx9MjVn9/FfN/s7HfRbBn14x0NnPzmXDW/0Z6Et22sCSpg== 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=1696766660; 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=tCqFtpN3hsGbE+xh1oZkWHofmf/IpAFJEo2rAzXl1sQ=; b=XP52LwGxp5hHLGPLLEUFFp09XQrVdl51HFR/aT0DshyJBli8k9oHknikyr6RDfpsbj/S+l fl3ri1Cki1PoCsr1IuNVTfJrJkwOpjw4Ak7iaciPXFEDhZvCm5nFVwxtpeVTkSYjiDHjJb 1G4yqjb7xpDDQ0pSYww/cEV27OhYchwPW0V8P8jd/OnsT0GzDA84+0qRg3/k1jxv4GKQEq P8ndOYCiX4kFNeAVJh7AOY1WmdODqy5YJcVCZnzr/3vVz+v2f0LmwkclF8qNFr86ouuhMC IQ5GtlVFPJ0UcNyWcFPvQFDlO5OD78kh9VNStqFzFnD0lweR2Q7aF2baSftg4g== 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 4S3LS35sBqz1C3f; Sun, 8 Oct 2023 12:04: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 398C4J3M056918; Sun, 8 Oct 2023 12:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398C4J69056915; Sun, 8 Oct 2023 12:04:19 GMT (envelope-from git) Date: Sun, 8 Oct 2023 12:04:19 GMT Message-Id: <202310081204.398C4J69056915@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: aff9c1bfd601 - main - www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.11 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aff9c1bfd6018221c078c4860dd9409cf651427e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aff9c1bfd6018221c078c4860dd9409cf651427e commit aff9c1bfd6018221c078c4860dd9409cf651427e Author: Po-Chuan Hsieh AuthorDate: 2023-10-08 11:56:45 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-08 11:56:45 +0000 www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.11 - 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 9c30f90440a8..ea2397f4a921 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.4.1 -PORTREVISION= 1 +PORTREVISION= 2 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 394302ab9855..304a29612158 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.10') ++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.11') raise 'New version of sidekiq detected, please remove or update this patch' end