From nobody Sun Jul 21 06:57:10 2024 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 4WRZ3B2nMWz5QtJt; Sun, 21 Jul 2024 06:57:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRZ3B0zcDz4b1D; Sun, 21 Jul 2024 06:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545030; 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=vtWwz2JaURb59GVeoCrpkUTXsYBjR0ZFy6sPOhT3I+E=; b=rkQ8EwZp3OpPewul0n7F6hRW56/4u3ZnB+bXdyCU7np6M3ZaYBEC/91iduzPUzOf889PSr Sefe1dcO3SqXQtUcAlFFjvIUuSQLZobTUb++uSNw5CoHEeeqPhNZX6yoYTYj9qwLHCdGTc x2GZvbEWZp1tf8NJ9WXheoHnkG4asUA8qx2n9D2jS7Pwn5BVWVkbPCidDYbs1eUm6jtQ0i VXRBXhmpLBlVrW8oYGkSweUO0kVFsLKwdNsNVQ5aBwrB0c/2fCS+oeIBKaYC6aIy/zvAiK eAKUo+0N0g/75G7rYutYd5VA+1NBxuImWlSaxXuf5blbMT0S7b9hNZKEngRy8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721545030; a=rsa-sha256; cv=none; b=cV9ZZUSdEGDP/el7Cii/A024X8nurLlz1nT/fPBZNnk4pHYPyKQOclce6rkPikMBd1XfB0 qiOHNy//C9hzkFldcWpVYj/kfIe5hg0HHdVyAX4T0EXUZ0e49nqjRMfWZQN1SmqlCtwxJn 4xIk2esDsxrX/48o+AanSDJSQOj+hGrNZb4z7cs1gVHPRhXbOXmMXn3VAfq8seACVVaJ12 OXNtaEEWJvqAjOEbnnYcZdkAjo3E+wvOIzGlyY/vmZEX3/lwAAvtaK5zvisk5GG7zIo1EX r25G7M8Th7etamRCRGQtWqx5YJMATF0h9cbdBs9brJLyGyF6xtKiBaXN9FtqEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545030; 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=vtWwz2JaURb59GVeoCrpkUTXsYBjR0ZFy6sPOhT3I+E=; b=hnWj4hl6sUOEvNIsoLIF5va1aaBaOUKqTiXqyU4+KknkngEmd8ea2FC95yDi4RCSFacMja b5aOuvkoI6iChKgheSziA8GaXPyUBsCC3NUdd27jmoN4yInLDmKPuDeuOk12YQK4AglwGZ MwE2wzBGYdr3w2U++9Gbc6fdjchVPQMt4gpgoo7M7KmdWZWor2kNr/BXrVWC17k/z+/0dT fvBBdZKGmZOZYwT0iQdDP58zUjMo0QRxHrcbmiOdHf3cgJrlzqoBs9HIxnWxJEqnojy6I0 xiX5GHN7RGDBPJKNx9MI3DgkJcroLkJ+QR7E/udCZ/1zoEF9X9NyGytWIBgzvA== 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 4WRZ3B0R75zqXx; Sun, 21 Jul 2024 06:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46L6vAGL070012; Sun, 21 Jul 2024 06:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46L6vAdD070009; Sun, 21 Jul 2024 06:57:10 GMT (envelope-from git) Date: Sun, 21 Jul 2024 06:57:10 GMT Message-Id: <202407210657.46L6vAdD070009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 8920178a1b52 - 2024Q3 - www/gitlab: install local bundle binaries to .bin/ directory 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 8920178a1b5227aecadd1b6b54abc86930247128 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8920178a1b5227aecadd1b6b54abc86930247128 commit 8920178a1b5227aecadd1b6b54abc86930247128 Author: Matthias Fechner AuthorDate: 2024-07-18 06:36:02 +0000 Commit: Matthias Fechner CommitDate: 2024-07-21 05:42:40 +0000 www/gitlab: install local bundle binaries to .bin/ directory PR: 280273 (cherry picked from commit 42492dff41c468055aa39ca0644c530a99c009e1) --- www/gitlab/Makefile | 8 +++++--- www/gitlab/files/gitlab.in | 2 +- ...atch-vendor_gems_bundler-checksum_bundler-checksum.gemspec | 9 +++++---- .../files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec | 11 ----------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index ba9172198ad8..82def5e6cc91 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,6 +4,7 @@ DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif +PORTREVISION= 2 CATEGORIES= www devel # include patch to fix database migration @@ -374,12 +375,13 @@ do-install: # TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed. # As intermediate solution, the binaries are not disabled by patches #(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local) - (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local --binstubs=${WRKSRC}/.bin) - (cd ${WRKSRC} && bundle binstubs --path ${WRKSRC}/.bin --all) + (cd ${WRKSRC} && bundle config set --local bin .bin) + (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local) + (cd ${WRKSRC} && bundle binstubs --all --path .bin) ${RM} -R ${WRKSRC}/workhorse # remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD # See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 - ${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6 + #${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in index 19ccd258e3bb..7887262e0240 100644 --- a/www/gitlab/files/gitlab.in +++ b/www/gitlab/files/gitlab.in @@ -94,7 +94,7 @@ gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd) gitlab_pages_pid_path="$pid_path/gitlab-pages.pid" gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090" gitlab_pages_log="$app_root/log/gitlab-pages.log" -shell_path="/bin/bash" +shell_path="/usr/local/bin/bash" gitaly_enabled=true gitaly_dir="%%PREFIX%%/share/gitaly" gitaly_pid_path="$pid_path/gitaly.pid" diff --git a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec b/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec index fb1f554cb0c8..915cd5764c09 100644 --- a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec +++ b/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec @@ -1,11 +1,12 @@ ---- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig 2022-10-18 20:30:55 UTC +--- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig 2024-07-09 07:11:30 UTC +++ vendor/gems/bundler-checksum/bundler-checksum.gemspec -@@ -15,7 +15,7 @@ Gem::Specification.new do |spec| +@@ -14,8 +14,7 @@ Gem::Specification.new do |spec| + spec.license = 'MIT' spec.files = Dir['bin/*', 'lib/**/*.rb'] - spec.bindir = 'bin' +- spec.bindir = 'bin' - spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } -+# spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } ++ #spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ['lib'] spec.add_dependency 'bundler' diff --git a/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec b/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec deleted file mode 100644 index 7c2c18b9db64..000000000000 --- a/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/gems/sidekiq-7.1.6/sidekiq.gemspec.orig 2024-06-20 13:48:56 UTC -+++ vendor/gems/sidekiq-7.1.6/sidekiq.gemspec -@@ -8,7 +8,7 @@ Gem::Specification.new do |gem| - gem.homepage = "https://sidekiq.org" - gem.license = "LGPL-3.0" - -- gem.executables = ["sidekiq", "sidekiqmon"] -+# gem.executables = ["sidekiq", "sidekiqmon"] - gem.files = %w[ - sidekiq.gemspec - README.md