git: 42492dff41c4 - main - www/gitlab: install local bundle binaries to .bin/ directory

The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=42492dff41c468055aa39ca0644c530a99c009e1

commit 42492dff41c468055aa39ca0644c530a99c009e1
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-07-18 06:36:02 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-07-19 05:13:34 +0000

    www/gitlab: install local bundle binaries to .bin/ directory
    
    PR:             280273
---
 www/gitlab/Makefile                                           |  9 +++++----
 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(+), 20 deletions(-)

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index e0706b6bb2f0..6fb0d15de9e4 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX=	v
 .if ${FLAVOR:U} == ee
 DISTVERSIONSUFFIX=	-ee
 .endif
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 # include patch to fix database migration
@@ -375,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