From nobody Fri Oct 04 10:20:42 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 4XKl1Q6cD7z5YGpy; Fri, 04 Oct 2024 10:20:42 +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 4XKl1Q40gDz4H0M; Fri, 4 Oct 2024 10:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728037242; 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=RSCFmAz/JR476MynK6GSDJnFfk8jH9uN6lMFeZW33HY=; b=oXaQ+JjpktAbXacNQufK40QGu3kIWwQDyh06VfqPDG04Iwm/093zpeQkTYXyMLwxuyMNxv oEkkzquaTo/z/S90PdjkMNhYzxF2yIpfU0dlTiORa/+ny+tGA/tX5P/+LdIJrn9cUvF1Tf Z7MXNGZ7zNhD52B/T5+wUVUdMXLcZwM5SGLRbfDo8AVtBBhJkODh982jEAN8YcONrXnzR2 yc79ug6CE4BdheRDbuI3JQodwxaQR+87Av8+H4ANd1dlSn7w93t3YW3REu6JZpK8TX1sUv pUORs9hf3Kuv7+NIgydtTybQYg1qHL1X8GYWwKFbLeNQXYK4ZuPdslnbCrGTVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728037242; 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=RSCFmAz/JR476MynK6GSDJnFfk8jH9uN6lMFeZW33HY=; b=Hddz0UlYnTdxpp/daevqez47vuBzrMfuW2+kTfDXR6RYXj1Jv4Bj4cwuUWp1qBLnwO4/Y9 wvnwO6mQLFOl2A0h7I4At4ZV7hh/+kkgckWmrHgeeG8+EejRTq7gMj0OkxDlI5gAh42ked z8Ca6Wc+A1Hk+L1unxRDM6Jl9BVL4cSoNfS9TQSYqrvPLA8L1j4EwtSNZSohyudBhJNAnY TixVdiHHYKUO18HmTJHpIXkLJ+seNLfBis/r1Ye1P6XfhNediOIND26Fm0ZPaJ2YUpyuBI 0hyKKxVVzp5FO1E3RJ9J5h/G3qhohtDcSAazW2nZZQZxVjHAUEkll37ctK372Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728037242; a=rsa-sha256; cv=none; b=t6DL839SlhtWem4aw08uOc1pt4aFSbMGfNe6DwAHftQSRJOK6Ss/E4Y5tr5hlGPJJyvde3 HXd2NzVTY0PXUGMKOQXaSPgH4/9zZfTrrTcp1uF/on6/CsLqnvU2n3OY+F8zz2aP5mUtYc aYgZi0K81LQBL2G+0dhrFAKBUJVTKcUHFmJx5sOTFIAdoEsK4y6G65+/Y2IjB85a8LXZed 0klA70GVFYjDj5Xs6eLyavoljYuXHs3JmaY/zazzC/4xbxy0cZJP7YpxLe4c05aQD+iNXw f8DFyXvqTiF3aRPXNQYSMpK9qzrPC9novhWvv0xCEBBG1NXdz27Ys3nxA73sqA== 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 4XKl1Q3brMzVyR; Fri, 4 Oct 2024 10:20:42 +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 494AKg7k083255; Fri, 4 Oct 2024 10:20:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494AKgcH083252; Fri, 4 Oct 2024 10:20:42 GMT (envelope-from git) Date: Fri, 4 Oct 2024 10:20:42 GMT Message-Id: <202410041020.494AKgcH083252@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: a1ac153501d2 - main - www/gitlab: fix regression from 0cd77d5e59481973c44a127c62331d8ff41350f8 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: a1ac153501d2430a02703c0f6344df188bde477f Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1ac153501d2430a02703c0f6344df188bde477f commit a1ac153501d2430a02703c0f6344df188bde477f Author: Matthias Fechner AuthorDate: 2024-10-04 08:16:02 +0000 Commit: Matthias Fechner 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 `': 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 ' 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 ' 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 `' from :37:in `require' from :37:in `require' from config.ru:5:in `block in
' 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 `' from /usr/local/bin/puma:25:in `load' from /usr/local/bin/puma:25:in `' 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 ' 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 `' from /usr/local/bin/bundle:25:in `load' from /usr/local/bin/bundle:25:in `
' --- 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