From nobody Thu Feb 22 09:22:26 2024 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 4TgSN3041Nz5CFw0; Thu, 22 Feb 2024 09:22:27 +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 4TgSN25HSvz4bQx; Thu, 22 Feb 2024 09:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593746; 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=HrkWXbUz4J05jxJpkLQZpEs4gIEphGO7JmY/YVt7KVI=; b=G/jo8d2Dh2gEDSOv2Q2rg1uW7GZ3RiRetkYLVeXyolLD5vAAGuRM+r8FQFa0lwFmbVH6xW KmNtQhip8Xq4PlbK6Nk0dOYQxe+t7/P0IbtypEq/w91PKAOiopTz0vlF9tZdPaJQ07Elso mNIZ3XnMdiHm4tdXMpvTQDfaYRva82hFZZ4p/9MNRgr2JeSWnlOEE10r/FqNTOCKQfK8Rh 6BGMF+xSKLMg2LqqDKBE8c2jkUV3J26CAnQr4AEN9dTm1Dx1ChLUg7DXnlhwS9FxlxNTGp Gaz5uuqB60ncJR0XGeO0+UZ7Z0fVKJXG6AbFT94+EdXa9Oym0YR3Y5mQKsyUHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593746; 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=HrkWXbUz4J05jxJpkLQZpEs4gIEphGO7JmY/YVt7KVI=; b=mcHieFCr6AEoGHmnhuwL1JGdv9aWfhNBZ/K4YZNOAZyF4c8KRTvxmxDfhpxl4Khvf8qfpo PUfxSkwQxwmB7QwV66DPb/3ReRZJQzLHJ0wDrTZ/wwqJv+AMRbuq6XRr97ap6yDb2WsO2Z dD3rRw0BbAlTG02m/TpDqhBhYXqRJp/Kfw96zjznu3B/Es7SLeDroLW5gxtsgDdNwrdi3V qwC6Gr1eueTPOwrrnDNZtVHrv56Qd8kXPv1R56fGhcON5Mrg1apArsYO4TUTJmNwg+WrrD p+Prm8Oq0zTgGvsCzlOJSb+5zH5G2hD7saeRwl1AJjzSTfm/xUJhsf4U8+3DAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708593746; a=rsa-sha256; cv=none; b=JVd32KwMW+Bo2sFndVi4KfhMLCZXnK0OZ0cr0fvBCaUexhy9bZ06t+Pb4guFM583LFvAhQ pv1pZ8PATOnZ9TUidOVv+xT4Ol8IM0x5hVpxnrY15RR7opMhA5PXbYDO7MD1Ig8qag01BL dENbA170t6mB/xhmKFTF059WG0+bkUq3dvA9rk2JLQ3NOY2I6rg1KQ1nW91Kem/wTEaHIu HCPzPXFvGmmmnnZ8P+UCxFGigIWXaNv7e7g2hqluCZ+6urW1JhaM2WBF/QvMWa4vJ5VFsI odN/cpTeMdhlI4Bt69qgngRbTqggYG/nvjtpJ0e4WnFy/5kQCdtK5mkz0U44Fg== 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 4TgSN24NtSzQb8; Thu, 22 Feb 2024 09:22:26 +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 41M9MQrv001393; Thu, 22 Feb 2024 09:22:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M9MQp7001390; Thu, 22 Feb 2024 09:22:26 GMT (envelope-from git) Date: Thu, 22 Feb 2024 09:22:26 GMT Message-Id: <202402220922.41M9MQp7001390@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: 06b726b81869 - main - www/gitlab-ce: fix regression from 6b48a4fbbed1d124465aa72606b03e6ab559817c 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06b726b8186948d6c0869a0669bc0405ee12b3e1 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=06b726b8186948d6c0869a0669bc0405ee12b3e1 commit 06b726b8186948d6c0869a0669bc0405ee12b3e1 Author: Matthias Fechner AuthorDate: 2024-02-22 08:02:41 +0000 Commit: Matthias Fechner CommitDate: 2024-02-22 09:22:11 +0000 www/gitlab-ce: fix regression from 6b48a4fbbed1d124465aa72606b03e6ab559817c --- www/gitlab-ce/Makefile | 4 ++-- www/gitlab-ce/files/patch-Gemfile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 6ad64fef40a6..619d7f2fd843 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.8.3 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -112,7 +112,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gitlab-fog-azure-rm>=1.8.0<1.9:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-apis-storage_v1>=0.29<1:devel/rubygem-google-apis-storage_v1 \ rubygem-google-cloud-storage145>=1.45.0<1.46:net/rubygem-google-cloud-storage145 \ - rubygem-google-apis-core011>=0.11.2<0.12:devel/rubygem-google-apis-core011 \ + rubygem-google-apis-core>=0.11.2<2:devel/rubygem-google-apis-core \ rubygem-google-apis-compute_v1_057>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1_057 \ rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \ rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index e950aad1385d..19f968ceecac 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -29,6 +29,15 @@ gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -185,7 +185,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a + gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory + # We need >= 0.11.1 because that's when match_glob support is added to list_objects +-gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'google-apis-core', '~> 0.11', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -203,9 +203,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory