From nobody Sat Feb 08 05:27:57 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 4YqfW16phgz5mLC0; Sat, 08 Feb 2025 05:27:57 +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 4YqfW15pvNz3vNk; Sat, 08 Feb 2025 05:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738992477; 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=MFA7zQ5+fbOKwy44Jrh26OCLXpK5xTfnqxFdY45VLWE=; b=YdTzBJCdWECwU3L5cmXYXdiCX5MMx7JH3gtmHF04tDfseyEG6UOYpwViozbiOLTFnNZLw5 dyATo/26pHBK/dg9dm4HeCmIk0vJcEKGwd5BHuQVpNqBDDd3u9BOxz4jLCVAQP70jZ3nYv CxKT9uOUTN4vsKPTFDgcZ29P1Pt9mNYcY7pxwqVyXgMt9+NxDTkOHFDtZBf5Apf0N/0SDM tdp95GEhPoK1ouaK9tanwa0YN2nUGHpI9LsVmF2cK4totmd+xxDtDLyzQJuLflkofVO/Gh lEKvTl/6wfjIM4MXU2HFEWcJ2H0Xp2vd5lldvBdkyU7vzHZW+PakejQAUqxWBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738992477; 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=MFA7zQ5+fbOKwy44Jrh26OCLXpK5xTfnqxFdY45VLWE=; b=ZzPDM+JcxVRT2hMgyEvdjI2USgrMcEpC/12pSEBifKSTqyXBLXgC7JmCkpjgcH13crQGqz xMiboBkgwlESm3WaUJxcCtpwN6jJgQBRyDBotmq74VEDkd+CItDsZFXGNuBeeUQWtsBGX9 DuC+880Jxtiw8d09QRCW+ehJy5O4zJy1W1WWRlcki/7wvLqwNzcBHAbjBWrK5rfmkY533i 7YNe4SxJ0S9fyOuZUXL6jRFKp1HERnXbK8FqGY2alRSmCf14hpvOEHiktUTR3JEGGK2mME g7PXann5IYh8U3hkZydMFVhgJfbjUprqii5CG8RjGdJJ/IHdaTEMlHz2ol2UAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738992477; a=rsa-sha256; cv=none; b=UuEXMuvPmCvjSmutJb0f4fXrnU8K/QG3r2wYQqquRdChJkbJk1afnpMa+AE5DzU/LF31jp yfVWtjWCYKO9BUcKBLl++OfbpKo/VbHQOMc8C+9RiOiyuA2fLSahHjT5T6kGN+50dB0Wka l+pqVOuKzdo7ilt3mWbjOynqQP1MM1ZBY7q+2lpXzemhOnUCnwbXQMjSI9XGXj0fsholja /+f3ONuYC/7FmQzkGugboxv1OPBC0bCu4Cfnj17/iav7VXt3ruEYqV3a9IEoWxV1uf15uW nGfsCwT8nli6QjToOBUAhWeF8Z4QyJEUHegNiLDZRdBjUCK0lNCdP+MuDI1xvw== 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 4YqfW14lGVzxTX; Sat, 08 Feb 2025 05:27:57 +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 5185RvF5064649; Sat, 8 Feb 2025 05:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5185Rv6P064646; Sat, 8 Feb 2025 05:27:57 GMT (envelope-from git) Date: Sat, 8 Feb 2025 05:27:57 GMT Message-Id: <202502080527.5185Rv6P064646@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: 7be30de92059 - main - www/gitlab: fix problem due to puma upgrade to 6.6.0 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: 7be30de9205977958b8c92157dc31b9f68e1e0e2 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7be30de9205977958b8c92157dc31b9f68e1e0e2 commit 7be30de9205977958b8c92157dc31b9f68e1e0e2 Author: Matthias Fechner AuthorDate: 2025-02-08 05:27:09 +0000 Commit: Matthias Fechner CommitDate: 2025-02-08 05:27:50 +0000 www/gitlab: fix problem due to puma upgrade to 6.6.0 --- www/gitlab/Makefile.common | 2 +- www/gitlab/files/patch-Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 0872936338d9..faaf4720e7eb 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.8.1 -GITLAB_PORTREVISION= 1 +GITLAB_PORTREVISION= 2 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 2a6efd049cd3..3c6fe6426d7a 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-01-15 09:55:34 UTC +--- Gemfile.orig 2025-01-22 04:13:11 UTC +++ Gemfile @@ -164,7 +164,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api @@ -32,7 +32,7 @@ group :puma do - gem 'puma', '= 6.5.0', require: false, feature_category: :shared -+ gem 'puma', '~> 6.5.0', require: false, feature_category: :shared ++ gem 'puma', '~> 6.5', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end