From nobody Tue Nov 14 21:24:25 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 4SVK7G0JH2z50trh; Tue, 14 Nov 2023 21:24:26 +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 4SVK7F4ppjz3KS1; Tue, 14 Nov 2023 21:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699997065; 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=bVcshA1UtlqasB3TLe96cgctNWeLZ1BmoBlcYTn8jus=; b=KmCjU1YqgBw6ToXels4uW1n8j1Bza+uTNC2NE/hd14uBdmdaanh1xd3sjpiFyKAWmmRelX N9gdHc9It3V5gujAv3AbeVIX5H7KmoNtviDHbjrirMnm4rU6hPCc+g1ek37oUMoZzpdkaO s7XP9WWBVGlBEjeymlys9cZ4NkxIO6gr7mM5L0bKGaww3wkUhB/tizTuJFhRneCevPdlCI GJmg+PjF/VTHcq+idMwqAVdperVPCs9XvRr9vvxoISrM/ztC7G6b24Joogk+2nEgoiYGsb FBBgR2WOTiiO1O/RzSjHOPXYB4wyUTwYpCdQ6sDIZ7S3zWUPRovnwcBbM4Xkog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699997065; 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=bVcshA1UtlqasB3TLe96cgctNWeLZ1BmoBlcYTn8jus=; b=dGtxyBzEvWX06EdHx8evvEpJgG6PXXB8wUAVRG1vFv/tHcT0IaiKRNOUF0x8YNhd1v8yee pIuFWdYfuIVnbvxYR9Ezf391wmbpdXtrowxdmh1I07MQPMC2S/dG6h8MZfbwAVeEOgcrgW XTnFwD/IUivaVEeLhJ+eCeJyax3fAUgFf5jRofX9ZBi7uVa+wS8A/aOwlDF/Yab/8AKUq7 /1iuLQu51bkTWQxIw0pxj2+wfb5CEADtk7AP2sniBwD+5UqEVRonoF/g9BrRxUSGfYYUqj r+mnlQKhecIc4ssW85+vehyEB9B5A2GDDVI9lyyZZwA+Fjc+IoZV+LzjtPpXjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699997065; a=rsa-sha256; cv=none; b=N8a76YP9FP+ZlnLF1HcJ/nuoTFG2Xmj2DsjZo64cWoIqcyBqVsDV6iKTGYK/G9fgnjnDua NLkQuPP257hUaWEx5EdlELWaSDTery5fLpyBynCTZU26Nkmz5EzK2qZp/PGEswI9tqSKv+ M0Tfkf0KLNp1WOoMnzQOr6s55N2KILi5+5vgABL8unXdMG5gYQbxyK4HCUny6vjpy+FbIC 4cNw/RdwGx8usrqHAM9me0o7SADNP33IC4o2naEKAOvBH9ORkBlvNfuLah3X16nzYnSWXZ /OnaT5XZn/Zps+mjN2+jVza9UyIGuablCESPtSc9aGwtc/hLX4tGwy8VJAK1ig== 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 4SVK7F3cG2z14Sj; Tue, 14 Nov 2023 21:24:25 +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 3AELOPUg092304; Tue, 14 Nov 2023 21:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AELOPnb092301; Tue, 14 Nov 2023 21:24:25 GMT (envelope-from git) Date: Tue, 14 Nov 2023 21:24:25 GMT Message-Id: <202311142124.3AELOPnb092301@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: 907cb05fadf0 - main - www/gitlab-ce: Fix Gemfile 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: 907cb05fadf051442d63013db4bb625aeb49d3e9 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=907cb05fadf051442d63013db4bb625aeb49d3e9 commit 907cb05fadf051442d63013db4bb625aeb49d3e9 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 21:17:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-14 21:22:20 +0000 www/gitlab-ce: Fix Gemfile The (similar) fix for Gemfile was already committed [1] but being removed later during gitlab-ce updates. (cd /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.1 && /bin/rm -f Gemfile.lock && bundle install --local) Don't run Bundler as root. Installing your bundle as root will break this application for all non-root users on this machine. Could not find gem 'aws-sdk-core (~> 3.185.1)' in cached gems or installed locally. The source contains the following gems matching 'aws-sdk-core': * aws-sdk-core-3.186.0 *** Error code 7 Reference: https://cgit.freebsd.org/ports/commit/www/gitlab-ce?id=cd3ccf5407757430ac5899a4ba0fecd61992a431 [1] --- www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 34c54fa1a116..e45a53a12844 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-10-20 08:41:39 UTC +--- Gemfile.orig 2023-10-30 16:33:01 UTC +++ Gemfile @@ -56,7 +56,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss @@ -38,6 +38,15 @@ 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 + 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 'faraday_middleware-aws-sigv4', '~>0.3.0' # 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