From nobody Thu Feb 22 09:22:24 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 4TgSN05ChRz5CGFM; Thu, 22 Feb 2024 09:22:24 +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 4TgSN03YrCz4bZ1; Thu, 22 Feb 2024 09:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593744; 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=5FAD/5TvBouixKaMSh4YrnJs5iaMhDXiEhZ00Xvob6w=; b=DazR15S/U+JkHF5RnwIDHOVDrS1dWBw4KUJUp3+mWA0k7RjGD5ukOL9ofe50sA+XUdKBkv NufrX3tVxlzLaW3ETTWGhV4UZkc4PGwXlqk7V4dO5ZjSFy40R+kTxGESEkoZxL84AlJS55 sbmAMPJDhsl2xt1oUrQ+y7XZMDMxS6fPWFIJzreIvceSnuiRyaCWVVtwBjNlHeaij7OukJ VhISS4usW6GHO8JbArXVaFEpHVvHaSkNUzO8Rva3RRbRWz5a5H3xcrOwW8lHbPxJDAr4dj DPDsBSLGuoEjZ7ZOnPZXcGw8eSzQisrZer3qC8oWsMOnouPP/t+iAHP6779p5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593744; 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=5FAD/5TvBouixKaMSh4YrnJs5iaMhDXiEhZ00Xvob6w=; b=q7U2GCSc8p9ZfveQXBaTmni9Y6gLpZzX2X7DCNxAh0Ss5KEQYt/4q+mUFs+x3xkT47hfVO ne+jKbMSvV356lQTVYoaXcqxBN9Xz/HfkGp1puAxfOb1zHFv0EWurhyAzakop9KE60Y2rE k2EFUSgdEOYgYf11dVFVMjCyJMa1+EZKyisOfykRMpMWbaRfp5+xujd44QpmWzkES932ud A01aoR6Hsj3OgGBEz0kz6n3wSQN29CQ3LLktSmurl9x/W7UK+i7yGG0OgMQwK726V1qhUa TwyiCk2Lhwyzh/h9t2xtV0sWlBo4vYt9BpUWrAmrNk2ial8NauTwekP46ceDwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708593744; a=rsa-sha256; cv=none; b=X9BOwg3RN8ilB2LjAqYmpeESOOtrddIvEw4wRxfxTipaSJWDW2/M+QtGGRVHrunMRr4bHt 6+M3le5NPCQxmmAFBgm1PSyhYBza45glfhqjEY0UmOs3lB5tx4WOTEbm1NPS7zjTWAJ5Ef W2aYfL52SCmujE/oyZainhLAl0IX+V6a7+JSWXDDzuSXYlAifmuTf+5S5C3YZFy+5y3cVZ +yYC8vXU0mw11PIaSqDtjxq5gZsj77vxRycK9bcEzDNCrw7etyyCpNHQnJDRVx/jlguEiq jkz8Qgx5beW9SajWqT4ig5G4HxC7DOjP6o4kuaZRpDHAxkJtVfSK620/8Q94+A== 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 4TgSN02gjxzQq6; Thu, 22 Feb 2024 09:22:24 +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 41M9MOf0000295; Thu, 22 Feb 2024 09:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M9MOxV000282; Thu, 22 Feb 2024 09:22:24 GMT (envelope-from git) Date: Thu, 22 Feb 2024 09:22:24 GMT Message-Id: <202402220922.41M9MOxV000282@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: 83fd6eb67939 - main - www/gitlab-ce: fix regression from 6ef57459aa715d7be45c21f1b4c6dd9bf30c5811 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6 commit 83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6 Author: Matthias Fechner AuthorDate: 2024-02-22 07:39:40 +0000 Commit: Matthias Fechner CommitDate: 2024-02-22 09:22:11 +0000 www/gitlab-ce: fix regression from 6ef57459aa715d7be45c21f1b4c6dd9bf30c5811 --- www/gitlab-ce/Makefile | 1 + www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 9ad79bd0bb4f..7a2558609854 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.8.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www devel diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 3e6bc6165173..e950aad1385d 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-02-07 07:58:11 UTC +--- Gemfile.orig 2024-02-20 20:25:18 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss @@ -41,6 +41,15 @@ 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 +@@ -241,7 +241,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingF + gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory + + group :puma do +- gem 'puma', '= 6.4.0', require: false, feature_category: :shared ++ gem 'puma', '~> 6.4.0', require: false, feature_category: :shared + gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + end + @@ -252,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory