From nobody Fri Jul 19 05:14:00 2024 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 4WQHs51FmCz5Qvvf; Fri, 19 Jul 2024 05:14:01 +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 4WQHs50krnz4rtk; Fri, 19 Jul 2024 05:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721366041; 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=b+0L4t+DPqJ3Sv6Wyt3ST4D5EQsDajMBx6bpDga0gFY=; b=RwuESzkE45qGkTHa/LiRAkElHMw7vyClQBzKuAa9/DyMZnZJrsnIlqBMGAJLrWexVV97Q3 rYq8Wv60/lH/Rsx5IgHG0Ja4rMw7Q9G1Ap6P+GJHPeY9OaIcEdTcHXiBxugKjc34NypFU0 muC6lkWKkFgwjNI4dQS4ySXj47t9+RT3LjyfTRqX/7vl9/LOsRMaiRkQZl7gDX9+4+3JyV ctkXXnNmIxDoRRtN67ZLmqxl1jjNLanSaRDLditr4/l1uo4Mr7FuH/iS9VfWDRkg3qhk/y X0Op7CcfSDGaEb3P4UAmgNwxb9OBbi0SiCWnVgvcDJ1sR6honiyUWmZcSHXQyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721366041; a=rsa-sha256; cv=none; b=kvE2UpLD6LXxn3GX2OVtoQiEen4xJXO4sSfOQpkrZw6vQmX/lfsiavS0tAhQ4xFXJuPthu 1LGqJ8Voafhq8VJ0ZH3EuQbH0Sxyv9nqgl4K+IIB1s1BEfNEvdXhdTsEwswkgxo2+gOQdy UdM8oFBX8t649bEgoEeqbmp4kqBPrveO2vXiete9J7J6OKUyeiIHsa9hBzaa9J4btjkEdx ct1F2oN8zu8yiQw0lLkWPlsh/kYMQPbA2z5nsGdVNd1waK5+DxaYseMiw9FWNgRxT/MwIE T/nOgj8CK42vq7IlD9Kj2V5KxXVkzkj51rXsATBm7urdskWvWLEU4mqDprFgYw== 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=1721366041; 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=b+0L4t+DPqJ3Sv6Wyt3ST4D5EQsDajMBx6bpDga0gFY=; b=YWBLiwxLMcphK/p4tah/wuMyHl/dCmbR9XHQm8iiZNRzjmr7XqIBD8dvuKy/FDBvMSq1WB 9cyJZuz7LBPVq4MTGrknImExhUz8X10lBkncykYNs2rG5vnO/nfftsmwxUVR1gntpXdNkr BZtgv+UJOyLBmibDNOfCLCThy5BsVQ8mGDFt0qZTy1k0gxbF4sGRK9q2MnDFrSS6W8udcU XaT1YfZu5kC+LDsb0CQhW1dAxCP2HGGnvBLH6+0Iwh7jG5u2OSXxBtuXwwHr/aKfbMWzvk /yIZIExR/URq4Djhn6rc1p550xWBoVrgCBsQec6+ygGP63Rcr0pg86srxFPbmg== 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 4WQHs50L9qzJhn; Fri, 19 Jul 2024 05:14:01 +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 46J5E0iY023988; Fri, 19 Jul 2024 05:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46J5E040023985; Fri, 19 Jul 2024 05:14:00 GMT (envelope-from git) Date: Fri, 19 Jul 2024 05:14:00 GMT Message-Id: <202407190514.46J5E040023985@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: 42492dff41c4 - main - www/gitlab: install local bundle binaries to .bin/ directory 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 42492dff41c468055aa39ca0644c530a99c009e1 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=42492dff41c468055aa39ca0644c530a99c009e1 commit 42492dff41c468055aa39ca0644c530a99c009e1 Author: Matthias Fechner AuthorDate: 2024-07-18 06:36:02 +0000 Commit: Matthias Fechner 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