From nobody Sun May 28 17:04:51 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 4QTlQC3bWwz4XdPS; Sun, 28 May 2023 17:04:51 +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 4QTlQC2fZKz3hW7; Sun, 28 May 2023 17:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293491; 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=8qYAl9SPaB1yc/JIcqs1PzLRo8cR0WTHhUK7/jc7nKc=; b=vM/YhnEGSuBMY9IwrQREWT7gLqcaIDuzefTjQN6oPF1fXOciRwHIgHvsJ2b0Ey6nehAvb0 25L1M898YgRwgDMLjhJ1vtr3qC9z3fpsXx4LqkGAVVP4ExNudNDfFUiSFv2GqabrqGStiN h1IBv95r9MsuNRZapGSVXHBSTP6inc7bm6fKFsvZPln+vjuMgn1ANzCHQ/fXypjxXbCZWR TQzM1I+kHUFXXQPlWOfh9+pm4fBqF2Gy8zWmtedYJBaz5FxQ6y5rOFlIK6+bq+8cS/xlNy KCHfbCGT0tXk56cSjP/MVtGXvGfUF6i32ZxuG3BPpPHvoblIc09Vqf2cn797nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293491; 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=8qYAl9SPaB1yc/JIcqs1PzLRo8cR0WTHhUK7/jc7nKc=; b=aOFTmcrivOLDQoALoSTzJ7HOPwFfZ/frTmc6KqveShsWldkvrTPIhkhsCSKEF2E4Z0wMRP zGDoYnuDqco7wEnOiY+WWpCjb6gKsWl3MCoajkJZVFfqdHR/4v+L2AFngF/2IjX2QJw0D+ nkrsuqulYOkqdNyAULdFVEZA3Q0ckwhR8jgb7RVNEsF7uU8IWQzktk9UUtL00O6d44I25+ PF2uRYJc4ypBmpz494xRW8QKdBnFHbkvuTx7QjXY4OuVDe163D48aivL7ZKW3sN22Nepai 3AAI/jNHQkURItMuo3uuefF4+iE+7rjkHcA+cAQxNpzblDG+HjerFTFKi/07aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685293491; a=rsa-sha256; cv=none; b=jYkkqfhAgO7zfTEWX8AUeTo4AEMnhoPPFL8YtckJz+HiyJENJ/SZBJ7miGPV0zZsg+bJm+ DIk+ifQa+gaBZ7VX87BTLO1i0824hYNGpCzWjkJLfSNiK4NVr0+aeh8ORlejG9jxVfpFAm W6WTfEWoOle9XBlBZQe/0AtO++NXwud2RbXQqbayEs3hcWxkvzpUnfHwaXZjZap+hSz5I4 tjetcH63bmPUOLNHXw3L7w1A2wQh8wID798EBAX6oeUTLW77DqHgPWmddVKSro7g+qHus2 0sXXhazYlEwhtUJkgqPJMCeEwSsWJEsGzP1Y/3HS4SLvXJlK9Lp2I7eQeugUJg== 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 4QTlQC1kDkzctV; Sun, 28 May 2023 17:04:51 +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 34SH4p69064443; Sun, 28 May 2023 17:04:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SH4p9s064442; Sun, 28 May 2023 17:04:51 GMT (envelope-from git) Date: Sun, 28 May 2023 17:04:51 GMT Message-Id: <202305281704.34SH4p9s064442@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: 6225ae173185 - main - www/gitlab-ce: fix problem with upgraded sidekiq version 6.5.9 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: 6225ae1731854190ed1ed89b49bfc3405bf35f10 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6225ae1731854190ed1ed89b49bfc3405bf35f10 commit 6225ae1731854190ed1ed89b49bfc3405bf35f10 Author: Matthias Fechner AuthorDate: 2023-05-28 17:02:27 +0000 Commit: Matthias Fechner CommitDate: 2023-05-28 17:03:50 +0000 www/gitlab-ce: fix problem with upgraded sidekiq version 6.5.9 from revision 013014feef0787c5168fd727d8d72a0322da7495 --- www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c8818844543b..ce56be8d52f7 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 @@ -1,11 +1,11 @@ ---- lib/gitlab/patch/sidekiq_cron_poller.rb.orig 2023-01-10 20:21:22 UTC +--- lib/gitlab/patch/sidekiq_cron_poller.rb.orig 2023-05-22 18:44:12 UTC +++ lib/gitlab/patch/sidekiq_cron_poller.rb @@ -7,7 +7,7 @@ require 'sidekiq/version' 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.8') ++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.9') raise 'New version of sidekiq detected, please remove or update this patch' end