From nobody Thu Feb 22 09:22:25 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 4TgSN173nXz5CG3L; Thu, 22 Feb 2024 09:22:25 +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 4TgSN14lcFz4bHs; Thu, 22 Feb 2024 09:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593745; 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=zIez19dNpW25641Q5k6Nd+Q2vMVHGPh+DqJxheD1DUk=; b=g40GZnzQ/yGIu3AaeUC+ct+bXzL8wBJi9COccIjJea7gNt+IfSzd2DkFQBFaVgrdku7lnv cQU5Iee6Uf6UkcNJfDq2Vaupn5E3DBMR85gsOWWCyz0ZRTi5JT9FxhPrd5p9a4qbTqHu0g hTHPn4dooX4jcnahXESQPolwwB9JcHorWPXugul/2p0YHNvDae0l1UlJxjFMbs+7fCeVDm 5yV8OMhLsVHmBggTLY2tsQrstRzlO39SpW1Ckt5tpt7RQQNmXdblnErF87iH8NPvL3+5zA Rge9YW1bIsAbRmlwHw667JaDXBm3SLIyHy1pi4YZcNeltkIPRzRI2kZMr4g3gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708593745; 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=zIez19dNpW25641Q5k6Nd+Q2vMVHGPh+DqJxheD1DUk=; b=WdYCm+6dsfSxJBEI0Q+wWrST4OrrAU9xjv6Z6hMzbtQMRllscv/+nOUC+vpEXWkFFGrYiy PqHG7/6qlR2xZYBA15aL23c1wK9e32J1rt978jJRra1OnLatZ40bYAG5s2lGT8aNw1jKhp Sz3VHfYdCXf/Zq1iFKe72GgEBnb5WQ9UNpfiaAEVwDrjclsKZJLn4Jz/sAz5hQXbEx/ipn b1zMMjIAgh0PHTC0oVCz9tdyj0UBmeEsp2dQslTCxZuaeZyBUrCR9PeQQwa6xKZvGbGbSG J8/F7vRhnspXCi7mnShQNFz2X/Vti15my8PKaR927YpV96LqenvVq+ddS9HRMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708593745; a=rsa-sha256; cv=none; b=aG1r6dPS0H3EN0Am4JvSrsNT6z/XMh9ItjpmK9FfCU8LKFVNLOolUdkwbdW0++lT9/+VJm p4RlNBYc4cNxzfZkFujm+FSedOyzLkc3n7KxNNuAET8LZ6ZCEPUJ3tUFRcYhNkhXkgE8KI K4C6mQADn21jK3be/9w5UAIpuEXLpCa7XlyKyOM+Esk0jHDQnfHlOZgVHjeEgS5tGrTQMQ X8xfBN6uCb3G6d5oUXrnovvIhFjWcoU+qBhbEV3BCkFsndoZ913wu6CHe48k0MYw2LUbdW eO75C3IunK2mZlhrcSE3GvHl4dJ/PoxDQogWXBKPK4zzNoEy+RyvX++jkI/big== 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 4TgSN13q89zR46; Thu, 22 Feb 2024 09:22:25 +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 41M9MPGu001347; Thu, 22 Feb 2024 09:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M9MPqH001344; Thu, 22 Feb 2024 09:22:25 GMT (envelope-from git) Date: Thu, 22 Feb 2024 09:22:25 GMT Message-Id: <202402220922.41M9MPqH001344@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: ea2f77f9dfc9 - main - www/gitlab-ce: fix regression from bf20249d6dd521089e704bbd4f4cdf497bac5dd6 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: ea2f77f9dfc9f7979b4daee816ca328a20018ae0 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea2f77f9dfc9f7979b4daee816ca328a20018ae0 commit ea2f77f9dfc9f7979b4daee816ca328a20018ae0 Author: Matthias Fechner AuthorDate: 2024-02-22 07:49:38 +0000 Commit: Matthias Fechner CommitDate: 2024-02-22 09:22:11 +0000 www/gitlab-ce: fix regression from bf20249d6dd521089e704bbd4f4cdf497bac5dd6 --- devel/Makefile | 1 + devel/rubygem-request_store15/Makefile | 20 ++++++++++++++++++++ devel/rubygem-request_store15/distinfo | 3 +++ devel/rubygem-request_store15/pkg-descr | 1 + www/gitlab-ce/Makefile | 4 ++-- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index c0920813d4c4..f76bb4c8a584 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7345,6 +7345,7 @@ SUBDIR += rubygem-reline SUBDIR += rubygem-request_store SUBDIR += rubygem-request_store14 + SUBDIR += rubygem-request_store15 SUBDIR += rubygem-require_all SUBDIR += rubygem-resque SUBDIR += rubygem-resque-scheduler diff --git a/devel/rubygem-request_store15/Makefile b/devel/rubygem-request_store15/Makefile new file mode 100644 index 000000000000..0054afc65b6e --- /dev/null +++ b/devel/rubygem-request_store15/Makefile @@ -0,0 +1,20 @@ +PORTNAME= request_store +PORTVERSION= 1.5.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 15 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= RequestStore gives you per-request global storage +WWW= https://github.com/steveklabnik/request_store + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-rack>=1.4:www/rubygem-rack + +USES= gem + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-request_store15/distinfo b/devel/rubygem-request_store15/distinfo new file mode 100644 index 000000000000..23e88f052f8f --- /dev/null +++ b/devel/rubygem-request_store15/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1708587995 +SHA256 (rubygem/request_store-1.5.1.gem) = 07a204d161590789f2b1d27f9f0eadcdecd6d868cb2f03240250e1bc747df78e +SIZE (rubygem/request_store-1.5.1.gem) = 9728 diff --git a/devel/rubygem-request_store15/pkg-descr b/devel/rubygem-request_store15/pkg-descr new file mode 100644 index 000000000000..6428ef761880 --- /dev/null +++ b/devel/rubygem-request_store15/pkg-descr @@ -0,0 +1 @@ +RequestStore gives you per-request global storage. diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 7a2558609854..6ad64fef40a6 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.8.3 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -195,7 +195,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \ rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \ - rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \ + rubygem-request_store15>=1.5.1<1.6:devel/rubygem-request_store15 \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.3<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \