From nobody Wed Feb 05 08:28:09 2025 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 4YntfL3R42z5mNr7; Wed, 05 Feb 2025 08:28: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 4YntfL0bj5z3JmW; Wed, 05 Feb 2025 08:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738744090; 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=JiVGKlFlyrc0WtIHpEDkCTPVp3gumfFphYHvbZUGGQg=; b=Qpfeb11jhA2yfkNAgObK6ruS6HCJ3bIw6L5z8AAu7znJV+Vc4m0QfI0XdN/22IBtquakmj Lsy0FunnNk+m07HDZEkrDvOAD772Vq4jbF5llhU12x2mZihoIgLtbJwo4Trw3xBHOmZLYI aL96j2U0lAMjDiYFRXG3IK4TC7nCk38MyasbZxlCblso3F+ZLA7Zo1CMnOrhSAODZaqwZb wAMP1b3lw+UqmFrAjL9DtSNMpl41W2byjfeur0riPbqs2yGGHPa/T1BFubYwWU9Je+jhF7 OhBvMHOng4ugbgULMpcXjIWa3AW0QHS6I0dds8vsZmBBh5ZFQIQtJ9/GXVHC2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738744090; 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=JiVGKlFlyrc0WtIHpEDkCTPVp3gumfFphYHvbZUGGQg=; b=OhLfImvpewUKpeQwcacpM+uYbfsMF418KG37ifIspSJ8O+0MvbTzXuayZR64WnIPmvD59L JRncXAWzG+HthaesePJQPkeWlAFJAeAWB6yxEcwnNyWwZA11ZkpRIFkhLG1FS9Qsb5WAk9 1yvJ0/Nx/hO6sxO7RBon65pwEj+yPPh97p18MDFc5mrJs3wCfv2eO5wxulNt7dDI4Ti95y jD3pjkBZwdomw40QXJhMemd1gDtyKTUgoDaCFJ9BEwR908uUI48qlGZeP+1WXAgAl2HaHx O6HI6/iSK5WjWbraaCCVYyc6YrWEuVzlcMdsa/D7jjv1rEoU70Q2GjrShsIKmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738744090; a=rsa-sha256; cv=none; b=Ce6UsO6ijvjLz82ITwCZx41amOK4teyUG0WqFC3zURsqjiZCMpc6opPpDKUyOP8IxmVfMc QmuMlCj9hTzfrZAaq0nYm8kQzyQiKU68tfVFN55GIG4WdE6d6DLzb6Qaz1rrQlwahr/sR8 KGS9C7dfefe6nS+hBlYzHNOH/g3pheBifu1U4CQkfzF3Gt0WxX8/hxy/9QFX9eI5xAO99D 8zBKisQrdoFSeTKLija/fV9gh8zHjt3LwdYTtnaVfgm0sDkYDI6BnN0CReHOkOE3wKMb7x JfrSnYTLgAO4thf06EZQH1BaR58/VPTDol68ksucFHOVIvpX80fhGL+PxH4d+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YntfL0BwjzlPX; Wed, 05 Feb 2025 08:28: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 5158S9sc095387; Wed, 5 Feb 2025 08:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5158S9Em095384; Wed, 5 Feb 2025 08:28:09 GMT (envelope-from git) Date: Wed, 5 Feb 2025 08:28:09 GMT Message-Id: <202502050828.5158S9Em095384@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: 7040041239ce - main - www/gitlab: fix error uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger 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/main X-Git-Reftype: branch X-Git-Commit: 7040041239ce22d96504ce6e732b4f45eaedc875 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7040041239ce22d96504ce6e732b4f45eaedc875 commit 7040041239ce22d96504ce6e732b4f45eaedc875 Author: Matthias Fechner AuthorDate: 2025-02-05 08:13:20 +0000 Commit: Matthias Fechner CommitDate: 2025-02-05 08:22:45 +0000 www/gitlab: fix error uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger The upgrade of gem concurrent-ruby to 1.3.5 made a bug in activesupport visible. The bug seems to be fixed for rails 7.1 and 7.2 but not 7.0 which gitlab uses. https://github.com/rails/rails/pull/49372 https://github.com/rails/rails/issues/54260 So we import the Logger to fix the error message: bundler: failed to load command: puma (/usr/local/bin/puma) /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_thread_safe_level.rb:12:in `': uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger (NameError) Logger::Severity.constants.each do |severity| ^^^^^^^^^^ from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_thread_safe_level.rb:9:in `' from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_thread_safe_level.rb:8:in `' from :37:in `require' from :37:in `require' from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_silence.rb:5:in `' from :37:in `require' from :37:in `require' from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger.rb:3:in `' from :37:in `require' from :37:in `require' from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support.rb:29:in `' from :37:in `require' from :37:in `require' from /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/all.rb:3:in `' from :37:in `require' from :37:in `require' from /usr/local/www/gitlab/gems/gitlab-utils/lib/gitlab/utils.rb:4:in `' from /usr/local/www/gitlab/gems/gitlab-utils/lib/gitlab/utils/all.rb:3:in `require_relative' from /usr/local/www/gitlab/gems/gitlab-utils/lib/gitlab/utils/all.rb:3:in `' from :37:in `require' from :37:in `require' from /usr/local/www/gitlab/lib/gitlab/cluster/lifecycle_events.rb:3:in `' from /usr/local/www/gitlab/config/puma.rb:38:in `require_relative' from /usr/local/www/gitlab/config/puma.rb:38:in `_load_from' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/dsl.rb:135:in `instance_eval' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/dsl.rb:135:in `_load_from' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/configuration.rb:246:in `block in load' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/configuration.rb:246:in `each' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/configuration.rb:246:in `load' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/launcher.rb:56:in `initialize' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/cli.rb:66:in `new' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/lib/puma/cli.rb:66:in `initialize' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/bin/puma:8:in `new' from /usr/local/lib/ruby/gems/3.2/gems/puma-6.5.0/bin/puma:8: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.6.3/lib/bundler/cli/exec.rb:59:in `load' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/cli/exec.rb:59:in `kernel_load' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/cli/exec.rb:23:in `run' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/cli.rb:452:in `exec' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/vendor/thor/lib/thor/command.rb:28:in `run' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/vendor/thor/lib/thor/invocation.rb:127:in `invoke_command' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/vendor/thor/lib/thor.rb:538:in `dispatch' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/cli.rb:35:in `dispatch' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/vendor/thor/lib/thor/base.rb:584:in `start' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/cli.rb:29:in `start' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/exe/bundle:28:in `block in ' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/lib/bundler/friendly_errors.rb:117:in `with_friendly_errors' from /usr/local/lib/ruby/gems/3.2/gems/bundler-2.6.3/exe/bundle:20:in `' from /usr/local/bin/bundle:25:in `load' from /usr/local/bin/bundle:25:in `
' --- UPDATING | 13 +++++++++++++ www/gitlab/Makefile.common | 2 +- www/gitlab/files/patch-config_puma.rb.example | 17 +++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/UPDATING b/UPDATING index e73e235184eb..c8f2e8179190 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20250205: + AFFECTS: users of www/gitlab + AUTHOR: mfechner@FreeBSD.org + + Make sure you compare your /usr/local/www/gitlab/config/puma.rb with + /usr/local/www/gitlab/config/puma.rb.sample and make sure you have the: + require "logger" + line in your puma.rb. + This fixes an error: + /usr/local/lib/ruby/gems/3.2/gems/activesupport-7.0.8.7/lib/active_support/logger_thread_safe_level.rb:12:in `': uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger (NameError) + + Logger::Severity.constants.each do |severity| + 20250203: AFFECTS: users of x11/kde5 and x11/kde6 AUTHOR: arrowd@FreeBSD.org diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index e6c4bec98e92..0872936338d9 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.8.1 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/files/patch-config_puma.rb.example b/www/gitlab/files/patch-config_puma.rb.example index a7cf2c2ced7e..b3218c5ffa71 100644 --- a/www/gitlab/files/patch-config_puma.rb.example +++ b/www/gitlab/files/patch-config_puma.rb.example @@ -1,6 +1,15 @@ ---- config/puma.rb.example.orig 2024-04-09 16:46:13 UTC +--- config/puma.rb.example.orig 2025-01-22 04:13:11 UTC +++ config/puma.rb.example -@@ -5,11 +5,11 @@ +@@ -1,15 +1,20 @@ + # frozen_string_literal: true + ++# Required as rubygem-concurrent-ruby version 1.3.5 has remove logger, but is required by active_support ++# The fix has only applied to rails 7.1 and 7.2 ++# https://github.com/rails/rails/pull/49372 ++require "logger" ++ + # Load "path" as a rackup file. + # # The default is "config.ru". # rackup 'config.ru' @@ -16,7 +25,7 @@ true # Configure "min" to be the minimum number of threads to use to answer -@@ -31,11 +31,11 @@ queue_requests false +@@ -31,11 +36,11 @@ queue_requests false # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only # accepted protocols. @@ -30,7 +39,7 @@ on_restart do # Signal application hooks that we're about to restart -@@ -74,14 +74,14 @@ worker_timeout 60 +@@ -74,14 +79,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter