From nobody Wed Nov 1 05:30:43 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 4SKwZr1jNWz4ym04; Wed, 1 Nov 2023 05:30:44 +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 4SKwZr0Cn8z4cSw; Wed, 1 Nov 2023 05:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698816644; 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=nuyFvMRqs1S5xrn0/2v/usx52aLcX2hpJH4p3HvyKMk=; b=lxpIlP/BmOuRA4pVXUQlhHp3a9eU63bZp5V0IRJmm8Rxh7YhqSb2B1e3quYQtPQVEAeX+W KRE57gzFR7ObMJLcCZixG52NpYvgt9xZIYIlIhUJhJc4+Rk2JS1ZC3bgdgXkv7zJD4ebXB SHs1G/8uIrefsD5h1K4zxDkhSj1X/OV++FFOfe5SVgdVrltpCF79eW8PbW3bVIWXGBLdSr EuxGv99SCut0nyJyKH9SmfX9jKuEsf9hMdf1aDyhyVRk0tHvJdUH8n13oEFDymT0ztDaF1 K+Q+b35We/O8K0IfZ07V1SeEVVKsP45my6d57xox3P2g8Z+3XEqFCZib7K6n3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698816644; 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=nuyFvMRqs1S5xrn0/2v/usx52aLcX2hpJH4p3HvyKMk=; b=jqoAizrUM9qtxKGf34hs/OOA4xYZfEeoHK45XEYCVohpbL79YQNNr/e2SSMotb/8F7ZL+s J+SeVgmO4KzftPuAOvK05pITVV1EO3SILWusZ0benIsYBUaQ9zkax0AJfJXD8rcRsp46QR EWvmtiM/Rg5paP4Y/JFEYeByarLz68jLEihaRCx1ChxE3e5VMYsaryYLDoajQkpDjw8Qwd 70YiNBnoeQEk5yRxohUQbO/sBz5ibBKqoxDUXRLZxGgn/z5PVtGm0jgs0H4x+lNqIeKkwW /UC42apLIgL78I6ERPRr2QsAZAJC+vZu9noj62c6Tgxld0R5ESyVsnA8JKZwgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698816644; a=rsa-sha256; cv=none; b=sfhdmX2WSUjCZ/BgU8/Z8KFVinQaFSzfBiTPn48yTipOkqHkHcLXmVVoGosDTVj+HZV2zy CMZfhIXMnzB8m72Ms7eeEM66Nd7UGOzpHBNgIU9RolthsZF6+xlNEe4qhfEhlorg2Rnkrw JIHr6V+gy9fG6/9jxN4yktMBklffduI5EowFEyyVzVNQwxy00GuWGkV/oy+vZOpQ6VsCC2 NHz813s/DoIJlGyUIeLW0nE8lMFIriF8Owk3HVLpiyKA+7lSnqZ3+mxgB7QdlsY1QQ0P4J y7sSz/qYKdaw6JFtda6mV5M4xrYCJdY3w52m67oWkWM/TFOa5GzxhA5nNKejEQ== 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 4SKwZq676bzZKm; Wed, 1 Nov 2023 05:30:43 +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 3A15UhOi004495; Wed, 1 Nov 2023 05:30:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A15Uhk5004492; Wed, 1 Nov 2023 05:30:43 GMT (envelope-from git) Date: Wed, 1 Nov 2023 05:30:43 GMT Message-Id: <202311010530.3A15Uhk5004492@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: 1745375d9587 - main - www/gitlab-ce: Fix Gemfile to match RUN_DEPENDS 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: 1745375d9587044c1a74e751cd4dac02802fa363 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1745375d9587044c1a74e751cd4dac02802fa363 commit 1745375d9587044c1a74e751cd4dac02802fa363 Author: Po-Chuan Hsieh AuthorDate: 2023-11-01 05:30:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-01 05:30:17 +0000 www/gitlab-ce: Fix Gemfile to match RUN_DEPENDS The error message is as follows: cp -f /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0/config/database.yml.postgresql /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0/config/database.yml.sample (cd /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0 && /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 'grpc (~> 1.58.0)' in cached gems or installed locally. The source contains the following gems matching 'grpc': * grpc-1.59.0 *** Error code 7 Approved by: portmgr (blanket) --- www/gitlab-ce/Makefile | 1 - www/gitlab-ce/files/patch-Gemfile | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 45a5e5aacce8..a3ed69be12c9 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -272,7 +272,6 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-duo_api>=1.3<2:security/rubygem-duo_api \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 - BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index c97f50a4dba2..34c54fa1a116 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -155,6 +155,15 @@ gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -536,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi + # KAS GRPC protocol definitions + gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + +-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory + + gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory + @@ -557,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory