From nobody Thu May 30 08:53:16 2024 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 4Vqg585F15z5MFlL; Thu, 30 May 2024 08:53:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vqg584kNjz45lr; Thu, 30 May 2024 08:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717059196; 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=FUd3DQ0Okdmy3F9tLnJkuOfyGqcrxfuXnvr4QRF8JmE=; b=URwL9JD3Cq2fmvbKJFc2kVcSCVZARGzjOInKU25O/ir4z7CH7LZ6CVp2gx4dg5l1ttAj9r p/WirhyNTv3w5bcyPbLrRnDv0XgtqLk89rdLC6baRKfrVh2I5tDedMA6E2zcnDigvgUVg4 FxregLQ2NxMz6iLGCGkx7Sz1toMYeKSvVrJN0HHPkg+dNYZIrmrMZuYcpb8DCK3cmRulWR nUurR+30ZRqKfmresbKhXBEKMLfrizm0HCGBm8COBaoinFOiGCJ9ePatfYi6aFKlyMlfP7 t28wApUIpGJMniTiERqU9BjCg6dmbEtj7z6xB86p0pYM6r6K16TK+Y2Ve5ZZpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717059196; a=rsa-sha256; cv=none; b=g+Wcic2PyjYABKx+LCpnRaf+rksceeINId1CG8uiUep5eeoSXuHIhzS2acDl6Gb2TzftIN u9/EHW8NUqGVHt1qXCMOQCJxWoAMn1tnDhAb6hPutZdbFupkh9a3/iwAPlZYMLCEirLYQf XKgTw2YU6H8PfIx3BeqyJy9W67mLw+Mhy5MR/DknbIosgViqdu49rkjBDMBK0Zy9xy+jyp 3FumQfSrHfxz6eMN1+H7h38RiaiKpZEeKy2layhYnm6+npdnvEiK/WIa09BNL31agf0PcJ 1lckkyv0l4UZ/JNbyCV8AWkR3ZDuEGdeHXmw26POyt7j/H1cDYeTFh363atcmA== 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=1717059196; 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=FUd3DQ0Okdmy3F9tLnJkuOfyGqcrxfuXnvr4QRF8JmE=; b=ZV7fCEc3i8O3eR4KHRjNKciVPH34poC8s0/4CMvwYdiRtyCM1ri1rV3nX8kV+5Mpkwr5wB cU+HUtVmcZxZf8TI8ltMkavaSG5EXEiuu2gPwrOaDpvnOzL2g2UWBJgCBbA8ScAdM6G4zL hcz9b8+5Pl669bAxZ4gVWYBP++3lJisW7ASyQNd0WIlmfp3I/gNKyNFQOHLLVvhRIgzTIp aURQILqusV0/vOXI2tds7AJmosUlOlOXe61zxxjSWvAUlzyqhiwL/NTyQQwWqkbyeV2s8f YvcZRcb/hwX6p6UKv/Zhc8Ltht7KN9VvYt48nSFQ4lZyXSUg53O40x80HSlMDw== 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 4Vqg584KVbzZ4d; Thu, 30 May 2024 08:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U8rG87056419; Thu, 30 May 2024 08:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U8rGVu056416; Thu, 30 May 2024 08:53:16 GMT (envelope-from git) Date: Thu, 30 May 2024 08:53:16 GMT Message-Id: <202405300853.44U8rGVu056416@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: 3e88d545dd0a - main - www/gitlab: fix regression from dbc3f874de613640cbc2151dcc4fa39ce6433461 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: 3e88d545dd0adef68f06173cc0a6f9c6e52c15ae Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e88d545dd0adef68f06173cc0a6f9c6e52c15ae commit 3e88d545dd0adef68f06173cc0a6f9c6e52c15ae Author: Matthias Fechner AuthorDate: 2024-05-30 08:42:13 +0000 Commit: Matthias Fechner CommitDate: 2024-05-30 08:42:13 +0000 www/gitlab: fix regression from dbc3f874de613640cbc2151dcc4fa39ce6433461 bundler: failed to load command: puma (/usr/local/bin/puma) /usr/local/www/gitlab/config/initializers/redis_client_patch.rb:8:in `': New version of redis-client detected, please remove this file (RuntimeError) --- www/gitlab/Makefile | 1 + ...tch-config_initializers_redis__client__patch.rb | 78 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 68f27acf8e10..164144f9a535 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,6 +4,7 @@ DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif +PORTREVISION= 1 CATEGORIES= www devel diff --git a/www/gitlab/files/patch-config_initializers_redis__client__patch.rb b/www/gitlab/files/patch-config_initializers_redis__client__patch.rb new file mode 100644 index 000000000000..6d90e4c483b1 --- /dev/null +++ b/www/gitlab/files/patch-config_initializers_redis__client__patch.rb @@ -0,0 +1,78 @@ +--- config/initializers/redis_client_patch.rb.orig 2024-05-30 08:36:06 UTC ++++ config/initializers/redis_client_patch.rb +@@ -1,75 +1,3 @@ + # frozen_string_literal: true +- +-require 'redis-client' +- +-# This patch can be dropped once https://github.com/redis-rb/redis-client/pull/197 +-# is released and merged. +-if Gem::Version.new(RedisClient::VERSION) > Gem::Version.new('0.22.1') # rubocop:disable Style/GuardClause -- This is easier to read +- raise 'New version of redis-client detected, please remove this file' +-end +- +-# rubocop:disable Gitlab/ModuleWithInstanceVariables -- This is an upstream gem +-# rubocop:disable Style/GuardClause -- This is an upstream gem +-class RedisClient +- module ConnectionMixin +- def call(command, timeout) +- @pending_reads += 1 +- write(command) +- result = read(connection_timeout(timeout)) +- @pending_reads -= 1 +- if result.is_a?(Error) +- result._set_command(command) +- result._set_config(config) +- raise result +- else +- result +- end +- end +- +- def call_pipelined(commands, timeouts, exception: true) +- first_exception = nil +- +- size = commands.size +- results = Array.new(commands.size) +- @pending_reads += size +- write_multi(commands) +- +- size.times do |index| +- timeout = timeouts && timeouts[index] +- result = read(connection_timeout(timeout)) +- @pending_reads -= 1 +- +- # A multi/exec command can return an array of results. +- # An error from a multi/exec command is handled in Multi#_coerce!. +- if result.is_a?(Array) +- result.each do |res| +- res._set_config(config) if res.is_a?(Error) +- end +- elsif result.is_a?(Error) +- result._set_command(commands[index]) +- result._set_config(config) +- first_exception ||= result +- end +- +- results[index] = result +- end +- +- if first_exception && exception +- raise first_exception +- else +- results +- end +- end +- +- def connection_timeout(timeout) +- return timeout unless timeout && timeout > 0 +- +- # Can't use the command timeout argument as the connection timeout +- # otherwise it would be very racy. So we add the regular read_timeout on top +- # to account for the network delay. +- timeout + config.read_timeout +- end +- end +-end + # rubocop:enable Gitlab/ModuleWithInstanceVariables + # rubocop:enable Style/GuardClause