git: a1ac153501d2 - main - www/gitlab: fix regression from 0cd77d5e59481973c44a127c62331d8ff41350f8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 04 Oct 2024 10:20:42 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a1ac153501d2430a02703c0f6344df188bde477f
commit a1ac153501d2430a02703c0f6344df188bde477f
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-10-04 08:16:02 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-10-04 10:20:35 +0000
www/gitlab: fix regression from 0cd77d5e59481973c44a127c62331d8ff41350f8
Sprockets detected. This patch can likely be removed."}
bundler: failed to load command: puma (/usr/local/bin/puma)
/usr/local/www/gitlab/config/initializers/sprockets_patch.rb:12:in `<top (required)>': New version of Sprockets detected. This patch can likely be removed. (RuntimeError)
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:667:in `load'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:667:in `block in load_config_initializer'
from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.4/lib/active_support/notifications.rb:208:in `instrument'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:666:in `load_config_initializer'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:620:in `block (2 levels) in <class:Engine>'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:619:in `each'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/engine.rb:619:in `block in <class:Engine>'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:32:in `instance_exec'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:32:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:61:in `block in run_initializers'
from /usr/local/lib/ruby/3.2/tsort.rb:228:in `block in tsort_each'
from /usr/local/lib/ruby/3.2/tsort.rb:350:in `block (2 levels) in each_strongly_connected_component'
from /usr/local/lib/ruby/3.2/tsort.rb:422:in `block (2 levels) in each_strongly_connected_component_from'
from /usr/local/lib/ruby/3.2/tsort.rb:431:in `each_strongly_connected_component_from'
from /usr/local/lib/ruby/3.2/tsort.rb:421:in `block in each_strongly_connected_component_from'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:50:in `each'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:50:in `tsort_each_child'
from /usr/local/lib/ruby/3.2/tsort.rb:415:in `call'
from /usr/local/lib/ruby/3.2/tsort.rb:415:in `each_strongly_connected_component_from'
from /usr/local/lib/ruby/3.2/tsort.rb:349:in `block in each_strongly_connected_component'
from /usr/local/lib/ruby/3.2/tsort.rb:347:in `each'
from /usr/local/lib/ruby/3.2/tsort.rb:347:in `call'
from /usr/local/lib/ruby/3.2/tsort.rb:347:in `each_strongly_connected_component'
from /usr/local/lib/ruby/3.2/tsort.rb:226:in `tsort_each'
from /usr/local/lib/ruby/3.2/tsort.rb:205:in `tsort_each'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/initializable.rb:60:in `run_initializers'
from /usr/local/lib/ruby/gems/3.2/gems/railties-7.0.8.4/lib/rails/application.rb:372:in `initialize!'
from /usr/local/www/gitlab/config/environment.rb:7:in `<top (required)>'
from <internal:/usr/local/lib/ruby/site_ruby/3.2/rubygems/core_ext/kernel_require.rb>:37:in `require'
from <internal:/usr/local/lib/ruby/site_ruby/3.2/rubygems/core_ext/kernel_require.rb>:37:in `require'
from config.ru:5:in `block in <main>'
from /usr/local/lib/ruby/gems/3.2/gems/rack-2.2.9/lib/rack/builder.rb:116:in `eval'
from /usr/local/lib/ruby/gems/3.2/gems/rack-2.2.9/lib/rack/builder.rb:116:in `new_from_string'
from /usr/local/lib/ruby/gems/3.2/gems/rack-2.2.9/lib/rack/builder.rb:105:in `load_file'
from /usr/local/lib/ruby/gems/3.2/gems/rack-2.2.9/lib/rack/builder.rb:66:in `parse_file'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/configuration.rb:368:in `load_rackup'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/configuration.rb:290:in `app'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/runner.rb:162:in `load_and_bind'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/cluster.rb:371:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/launcher.rb:194:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/lib/puma/cli.rb:75:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/puma-6.4.3/bin/puma:10:in `<top (required)>'
from /usr/local/bin/puma:25:in `load'
from /usr/local/bin/puma:25:in `<top (required)>'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli/exec.rb:58:in `load'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli/exec.rb:58:in `kernel_load'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli/exec.rb:23:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli.rb:455:in `exec'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/vendor/thor/lib/thor/command.rb:28:in `run'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/vendor/thor/lib/thor/invocation.rb:127:in `invoke_command'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/vendor/thor/lib/thor.rb:527:in `dispatch'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli.rb:35:in `dispatch'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/vendor/thor/lib/thor/base.rb:584:in `start'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/cli.rb:29:in `start'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/exe/bundle:28:in `block in <top (required)>'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/lib/bundler/friendly_errors.rb:117:in `with_friendly_errors'
from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.5.19/exe/bundle:20:in `<top (required)>'
from /usr/local/bin/bundle:25:in `load'
from /usr/local/bin/bundle:25:in `<main>'
---
www/gitlab/Makefile | 1 +
www/gitlab/files/patch-config_initializers_sprockets__patch.rb | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 00b022cb8eb7..c60824c2bf33 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -5,6 +5,7 @@ DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
.endif
+PORTREVISION= 1
CATEGORIES= www devel
# include patch to fix database migration
diff --git a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb b/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
index 9bfd6a79642f..8b031049c646 100644
--- a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
+++ b/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
@@ -1,11 +1,11 @@
---- config/initializers/sprockets_patch.rb.orig 2024-04-02 08:17:37 UTC
+--- config/initializers/sprockets_patch.rb.orig 2024-09-24 23:32:11 UTC
+++ config/initializers/sprockets_patch.rb
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ require 'sprockets/utils'
require 'sprockets/utils'
-unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
-+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.4')
++unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.5')
raise 'New version of Sprockets detected. This patch can likely be removed.'
end