From nobody Thu Feb 13 07:39:37 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 4YtnBf3ZF8z5n6pP; Thu, 13 Feb 2025 07:39:38 +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 4YtnBd5fXDz3Lrj; Thu, 13 Feb 2025 07:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739432377; 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=XkpgiTxMXsgDbgBq/nE+ZK5Jfhk+lWRQTWdSvT+GyA0=; b=TD10Td+Ra0JcLLZ+Wi+KJczRTVESNknhvBk8y0ODMWFYzeoLELOyn9upE0nUpqta2bGp4G 41byXrwjNfSsOZdhN/uxv1tZjQFuU+ryZeCpeSvfvwa+TkZEV2mWNvY/NRO1TBrSF10xct 91WIflysb4qbGZtxK98Z/gGtWUDZgQC4a+U09jhHAR1SCKgzu4Cz8H5aLb/p40BSAeoJzr ZQhBDvy3RT83SNmMWj4ZmAYH2iU9zFh71LI51hC4xvj+LHrd/LvSQw0S4Z66HMoKlOjin/ 9HMXJtScnOY8W7Hs0/sUqPwB3xI54PDvib+2RfrNM3LzrK9FYWDLODAvTbAVWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739432377; 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=XkpgiTxMXsgDbgBq/nE+ZK5Jfhk+lWRQTWdSvT+GyA0=; b=yv/ixT29k7237+WOKdQd6IX+82s62WKZGKF3dhTQA5V+SCyik3Cx1/kAUV7HCLHTqwLvrj 7w6D8U5nXF4pvc/qbdAj6VASBFjN1OY3THjIph7jPK4E0I4RzLzdnfhhkkshXylTL5NKCg h5fWEJV9jBlTcFVWY07PnYg839lwemid87r2wguubixUXOjNB7I3B+ax6I3RyibkbEQy6A IuN4oc6U4mnt+B2HkKzpLYMFkzNPbfuagFagSfbk9SUxLHqId/EXtG9tlCMQzXb0Hfwjhz tD0xPY7I19F17iwcVR9zDoycFjS6CXH/m2iWrgCxkL86X4bx063izlvcX0FyvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739432377; a=rsa-sha256; cv=none; b=g4DCOuEzgT3BKDGyUxJqmzjmLVPo+RcWwPlw/WKEE+IWQcsG4FtbPOVnYr2OvNo8Lvfb/q Z4RaqmLZDs5rikaK/1EclHW/puOxbGPWdlhkZXYezLetu3s3NoYmd7WveClcjEAi/+WpyS FNPrIs250Ai7EYJ8VBm3FKw0Lsi4I+lFl1EjaWjioCa4v/1pp3n+EpA7uNx6roSQAgbcvk 97HNUYTH8DAGLSpgHHDgne5kapT2ooPVQKuXeMqWQaAlLZJah/AzJk6aJaEmshldqmTmNA E2jEXcVL6RsnvFWqzJmt68+xFMRPNWSBeFqOxb2kJqmgbWktBGJlsf1LVi9thg== 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 4YtnBd4BMHzbv1; Thu, 13 Feb 2025 07:39:37 +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 51D7dbZC012045; Thu, 13 Feb 2025 07:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D7dbtm012042; Thu, 13 Feb 2025 07:39:37 GMT (envelope-from git) Date: Thu, 13 Feb 2025 07:39:37 GMT Message-Id: <202502130739.51D7dbtm012042@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 339371a56928 - 2025Q1 - 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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 339371a5692832b51a7cc391a3982a10512dd907 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=339371a5692832b51a7cc391a3982a10512dd907 commit 339371a5692832b51a7cc391a3982a10512dd907 Author: Matthias Fechner AuthorDate: 2025-02-08 05:27:09 +0000 Commit: Matthias Fechner CommitDate: 2025-02-13 07:11:12 +0000 www/gitlab: fix problem due to puma upgrade to 6.6.0 (cherry picked from commit 7be30de9205977958b8c92157dc31b9f68e1e0e2) --- 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