From nobody Tue Apr 02 09:32:39 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 4V82jN01nzz5G7vC; Tue, 2 Apr 2024 09:32:40 +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 4V82jM4CmVz4YyQ; Tue, 2 Apr 2024 09:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712050359; 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=vxSd7CzzlMMzBOSbOkYwhhU+TEGbFsYCZ5JSFD05m7Y=; b=C7wq0BmHxfiVUthShjkGPczoMU/8AeHSrzjJ+Eocu5u40PdBFCs1Re/Vs2XFrjVwVMicyp Ewy4V920YS8zrQzdt2hf3HM9th/uSaNhUyA+8d10iEQfRisz0T+rL/rs/ZOxdy3yvxwtGb I1tlIC4XocL/zmHnLY00vmoD2gR1TDoX0/dGRy9nO4PVYlV6mrbBddJ7x0LqHgPGnlK2iJ z/8fmdivmBpQbdlrd7w3iVemvSQ0xCPMjTnNDcTGJCmO+S/9RI9TR0xSveCKLEwolojskK X9mwG09eowUpxjVdvqmMkp8vDMLV1eSE9x6NAVn9kwzzM4vUXNkIOwfyfuUmbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712050359; a=rsa-sha256; cv=none; b=jmhqDtG5aGslFLQXPEvwv/Dy6PEcincA9OhUfSOeUe3pjFe8/dANUxfcDBhz/HdvvlTET/ gAUnut11szHbDoIBcH5AFcLwjdVvD0PgHS412XvjYYZO0ZuJRkodOSXDmcqubKosZQ5cGk lGw2v6soCz5sPwJNrQh51S+0AYxD0+EVFoZDLMKd3SR+Qodan7Yll3n5lDIrGiXG/JymPg Ga2I8CdRVylPM+Y9KARBXE9yrHcLMxTTVXaeV/tHrD/1BZI8vWlJj2fHUolhyeA2WHfCt6 Djituyx1zRlfzvYFFj7VMP50IuArYvtycZ7ywDJ639cj6r5lJreCy8lPWyEUMg== 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=1712050359; 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=vxSd7CzzlMMzBOSbOkYwhhU+TEGbFsYCZ5JSFD05m7Y=; b=Rmc1S6PHWEMKOQPOEBWOON7EL709oofAT0NliUqcgYbOCrvyzqCqEgq58UWlDjsw/ARTzn aThb4grALe/095/LG8polfEEvPAp1D513TmdtjEUmjBg5gGk6s848/urs40uMwzbTj/Kbn /rg8y3wyA4mTYgAKR+DW7UDI/qf5YtHSoaDyRLsPMBPboETJDnFE9CJkZORs+nmTfllcvQ UeTgjvSFcyYveWdhvcx3KU3MXnCGTkTIzFFhRO9k36nGpuckYSLaDbOskZWtWMEjHNqQZ7 fpgiqTxJocOPJNQBJfqnmfnpZfXCANO1AVRmXu2dyB22m+ox+GD4d/6dwyNp3w== 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 4V82jM3bKHzkZp; Tue, 2 Apr 2024 09:32:39 +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 4329WdEQ081962; Tue, 2 Apr 2024 09:32:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4329WdjT081959; Tue, 2 Apr 2024 09:32:39 GMT (envelope-from git) Date: Tue, 2 Apr 2024 09:32:39 GMT Message-Id: <202404020932.4329WdjT081959@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: 8c5b73b52ebb - main - www/gitlab-ce: fix regression 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff commit 8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff Author: Matthias Fechner AuthorDate: 2024-04-01 04:42:41 +0000 Commit: Matthias Fechner CommitDate: 2024-04-02 09:32:09 +0000 www/gitlab-ce: fix regression 987cdaf724929857c6e2199513121ddea3dcaf83 gitlab expects rack version 2.2.8.1, see also attach PR. PR: 277982 --- www/gitlab-ce/files/patch-Gemfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 74417b44eeea..ce181c3a12c6 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-03-20 12:36:02 UTC +--- Gemfile.orig 2024-03-27 08:20:26 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss @@ -59,7 +59,13 @@ gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory -@@ -245,7 +245,7 @@ gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/Missin +@@ -240,12 +240,12 @@ gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFe + gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning + + # Application server +-gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'rack', '~> 2.2.8', '>= 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory + # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do