From nobody Wed Oct 11 22:23:35 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 4S5S3D2053z4wncK; Wed, 11 Oct 2023 22:23:36 +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 4S5S3D09JBz3WY9; Wed, 11 Oct 2023 22:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697063016; 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=MFZQEQPZ5dPSc5qSWyJoD4LBgOTr65ECbSJqvVg9gxk=; b=ALybDn1eH6/mFngIageqQPLOoA2R6jc0lp+DxdgLuKZO18pzIz4QwQuH7+bWpkw7h2Hkc0 YPvYd9FKjLLF0jni7x0s/6vIzUCfA4MCRWf6q+js7XXiN648VpaZunuO48SjsUUmrsfeXO f69yOcd1YVq/ta1UeVaTR1NAnJWJArdumUJp/jlZCarhvBG8P5FAzw/SAr+nSkLPNsafIu 8TN5AfFyIcw5tNn1+vOGxz3OHViu0poy8y03HArs/aH5cuG8R+QSffe1aaHzigodHno4ZO DdJfCqv8CQmFwA0yse4L/N7FC/layRAMjOzMItFOkN31mAERodlEJoX1kNUP+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697063016; a=rsa-sha256; cv=none; b=nHWT8f/QLdttWYyGVxM8/F9Qs4FdFGsep17bG9gueoLQ1HaF9M1CBpaqbdlMhjYHy0ABYW 8PkIhzhYmR+zcv40e66v1PvuNfqBn39kirETA3wzK5C7y3UQ5ZhaCRqtn++vIbBv1T1up8 Y4X4uRjiYMoATsWXQPvOX4LAJM5DmKJmmxfi3nfrSoaaFrUleDosK0w9UnkaHzef7fg7os NrrCjS89c7/fYbmExPmFPkJOXgHFCxE6Ibg4TNGfZg9DTMc1OPBvED2o8OvAx4ktFCBLjM P2T31v19qAtea3ZxMQ3sxRjVbP4liAIBgNFC90EM71exC0KWkxhzdL08RKLJ2A== 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=1697063016; 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=MFZQEQPZ5dPSc5qSWyJoD4LBgOTr65ECbSJqvVg9gxk=; b=lXd6dtTmgFmMtmdPXsdm24jActFgq7/WstakDpRDP5DGqMSQiotOj5vNGerGsnQxDZVe9c ddO4qaU/pQ5QoI9WoHk+CTn9w+oNhtq7SLDg3zkbxbBxUHrJQDzjWFFPtPpXedNjjx2/HV jXceQxF1qPVMjUX2oG2OiMQHNfctNri2b9Zf9hyjeSezQbptAXXM8KSjVgNbJkAvLgcnMQ mJ8Wl61j4xbxwhD23ns7JlPrbGmu6utYlGpYV1sa7EUapfRrfXcUSiQHOwfiQUvCSAuh+L b/lBAcbKH1YIW09/0N2+wptTqNvLEFvZLO8m1qMk6us1OD0ww8BewBWldyl7rQ== 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 4S5S3C6LyJzfSS; Wed, 11 Oct 2023 22:23:35 +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 39BMNZEK092348; Wed, 11 Oct 2023 22:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BMNZrt092345; Wed, 11 Oct 2023 22:23:35 GMT (envelope-from git) Date: Wed, 11 Oct 2023 22:23:35 GMT Message-Id: <202310112223.39BMNZrt092345@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: 7a257f7e0c0c - main - www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.12 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: 7a257f7e0c0c29fc3708e53aba919ee5c91e4dd2 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a257f7e0c0c29fc3708e53aba919ee5c91e4dd2 commit 7a257f7e0c0c29fc3708e53aba919ee5c91e4dd2 Author: Po-Chuan Hsieh AuthorDate: 2023-10-11 22:22:55 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-11 22:22:55 +0000 www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.12 - 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 4540bd11edcf..97d611fcb6c1 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitlab-ce PORTVERSION= 16.4.1 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org 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 304a29612158..858010032dd9 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.11') ++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.12') raise 'New version of sidekiq detected, please remove or update this patch' end