From nobody Tue Nov 28 06:00:37 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 4SfWyt1nB6z52k1n; Tue, 28 Nov 2023 06:00:38 +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 4SfWyt1DkJz3S4Q; Tue, 28 Nov 2023 06:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701151238; 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=TNF2kInFzCjl1Whj71kNaBhkHQmOPwxM2xLtjF9LGY4=; b=AbciclfNLn+1q6CTIr6yeph/cmUxdKXoZ4bDz92MmMkmCgDVSAB7Wf1CEqAG1OZd95LMvQ XXft/i9NdUTLaeH3seIkAbIWuJo4gdiBq+uONnZUA+HFPNZEjcuv53fPX5XP/LfzLJGwUF ItqH1Lu3D5HUoD6Hj6yS79GiQzPul6VwrKMCb8H/VgxcN5cxUDtcfwmCwQpYIBMn5AlWMq 4fGLuw2ztd+ZJ+8NWGBTn7UZrNnHjAfn4EcleRhMZ9zvRCzrI+60xO2dxxJgvJuthfz2sj h0OKdlqhi7Hd4iErKqANd9V1uWEqOVzv2z2rjRnSaZxVuuWmNieYZhfqT+kC9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701151238; 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=TNF2kInFzCjl1Whj71kNaBhkHQmOPwxM2xLtjF9LGY4=; b=MluBa/UG2xD6oF1vbZ6qe8Urf1tuKyqEJovLXJPMJqf2tXJeAkdUZNXqpbOZkEdnb1hs2T 0puDurssKyXJdR1MNE7R49m59hGMfcKUIoV44+C5QWczJAiwUnlxBCZvulwroXOuz6P7YE R3yXdLNdOCCia4uadyxqfHkYrr8kMT8cZSj4uSbvcffF75T+basIzD3nAo9ZZ+AwsRqKKR DtZjgMrqrmi0eSeruf+MvzgMzhBsrlJq6tS8tN7tl2DW0Ahb+QySrSmpAHeT6KwDB9eeCI ejMyz8EJazF/s7G+nH6csn7Z0YLd8uMWGhG6hIPkliw6WdeJgBQt1Gi1hLYh1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701151238; a=rsa-sha256; cv=none; b=V/G/szUFrrkjTgJI3xblRApCddUcj3WhhQN+Ah96MvmJZFjd8hhhmvnW/flnssO5IZ6t6Y H08jCRnfclmzywC8qqfuMST6TQQ6kU659423cpu5NQTIIC6SHZGGjPHEw/rra5xeiy9xCb eL7mEyJO7F12FAUGoywyfHVOI6QKvROboxrlf0YdqbaWtNk9DC6ASlLqsL5wp7Z2zQ7HTS VtEt4BDxiEPA4eJWjNw7ndCn2VpSPdl1EuDtM5mRgcjfGY/tkDoeWkMGHRasplKk99JEgQ 1S7RshDaCYvyPKFYSFKwYz9iKz4AlV10pOwPY/HPp6Ex69vWyJeFQCY58Mh3KQ== 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 4SfWyt0Jshz18rm; Tue, 28 Nov 2023 06:00:38 +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 3AS60bHq064365; Tue, 28 Nov 2023 06:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS60bS7064362; Tue, 28 Nov 2023 06:00:37 GMT (envelope-from git) Date: Tue, 28 Nov 2023 06:00:37 GMT Message-Id: <202311280600.3AS60bS7064362@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: 20268617649e - main - www/gitlab-ce: fix build problem due to dependency change 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: 20268617649e05fbaa7b396b93c2df5367ddef5f Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=20268617649e05fbaa7b396b93c2df5367ddef5f commit 20268617649e05fbaa7b396b93c2df5367ddef5f Author: Matthias Fechner AuthorDate: 2023-11-28 05:28:24 +0000 Commit: Matthias Fechner CommitDate: 2023-11-28 06:00:21 +0000 www/gitlab-ce: fix build problem due to dependency change Relaxe the version restriction for aws-sdk-s3. This fixes regression from 69027ee7a067d387ebc78fdfae2be8aec385330a --- www/gitlab-ce/files/patch-Gemfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index e45a53a12844..093ff686fa1b 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -38,15 +38,18 @@ 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 -@@ -196,7 +196,7 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi +@@ -196,9 +196,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 gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.185.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.185' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-s3', '~> 1.136' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory + @@ -385,80 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory