From nobody Sun Jan 01 05:57:42 2023 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 4Nl7ZG2y4nz2njp3; Sun, 1 Jan 2023 05:57:42 +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 4Nl7ZG2QZrz3NdB; Sun, 1 Jan 2023 05:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672552662; 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=A1hL76p+hATPVLckWA1sYGmvXrKOZTnYUhDwrJYDLhs=; b=w4PGxDr6qrbOyGCv3hpnl21An2ZGGJ+GBm+oG8g7Zddo6HkNzOWiSIhFfunyTEpzxc8H0d p50MPGYTAXwWY7N5x+kGqAvEakurcIgZhF9DpS93MnnDUPZXZHdp+GA/omNHEuC6yH5dht tx7uL40R7YDM8mWaOniIdQHMnF0cAi7EMIG9mFrmAmDl6KhUKTUzT01we8yLlzYtXVViP6 8ps3ystRD6nW/xTJD5OzCVNHFQR2lTwbZNkM/V17FCoz+fcxP+D+UpVdOopid0KGbxZyLm 2trLt5TFfn1iKeoPIcTuPvgxXjECW03PcNi6v+T7oEivBYdr+0Gw1mKSeMoDTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672552662; 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=A1hL76p+hATPVLckWA1sYGmvXrKOZTnYUhDwrJYDLhs=; b=Fkbb2bbQm7/IVkexjIouN5DM/ZmNwVzqisFozBlp/twR+IHIo8ZtrhV/cyJBl7OwoQa6T2 nje4m1Y+JZRSx+NqeO1vwGNuwatvlylzVChzeetBznk2mDHKIZuHDZ+lEblREzMjT0VjnK ekGRrMUifnj1v/Zam6jP+u6IbOGXt4nTbMylxsos4L0GBLwvRF2SvDCeZ4pD02LvCVKt3q qvmTzEDBjaXSHIMEjZAc4/n8bTvY5AfwUMQSEb3NuM5REmesmfso63MnxGXUKq9y550JJX 1frsCX9oTFmsVqzhdTmI7tLLBRn3lUo1lUfIX3mcF7qOy1GF+zvttlcCyjw7og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672552662; a=rsa-sha256; cv=none; b=fmN2wAsGLR2KmrtGxF5W50PzrcNQJcKPGN3zovtSJnd1oXjWgt0k0rDwKYNQLl1znDXtaa IfngT3lYs+sB/8gms6+dwj5G5hIZg+46Vkkep/gcVXET2E7Uh4OA7+fGf/jeEKg0uVJ7N/ fMReDSaISyWHrttgUarkgvM30oF/O1WuK1XXpDfB6my+aJGw2woIG9iu23tvMJ7rUuMXg6 mfUOv0NDq1Eg5aF1XxXGaqlDQgQlv0ob8NAsOmz4+FaCbHigYLp3mqeJpXeVbUucrFXh3J s3cbYSQD33rjiRNrgD35pZS6Ckmjo9xcF1+L+FQaTJEDg/0tEh6eYtWjzx/Bzw== 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 4Nl7ZG1V2GzHVD; Sun, 1 Jan 2023 05:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3015vgYb071237; Sun, 1 Jan 2023 05:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3015vgVB071236; Sun, 1 Jan 2023 05:57:42 GMT (envelope-from git) Date: Sun, 1 Jan 2023 05:57:42 GMT Message-Id: <202301010557.3015vgVB071236@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: 7c011c9c337c - main - devel/gitaly: allow usage of newer rubygem-activesupport61 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: 7c011c9c337c6e3af8781fedb28573cc57ca07f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c011c9c337c6e3af8781fedb28573cc57ca07f3 commit 7c011c9c337c6e3af8781fedb28573cc57ca07f3 Author: Matthias Fechner AuthorDate: 2023-01-01 05:52:43 +0000 Commit: Matthias Fechner CommitDate: 2023-01-01 05:57:37 +0000 devel/gitaly: allow usage of newer rubygem-activesupport61 Fixes change introduced in 338a2b2b8a93eceba61d440dadbe9a1923617254 --- devel/gitaly/Makefile | 6 +++--- devel/gitaly/files/patch-ruby_Gemfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 4bc751259bfc..f80061a2a519 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly DISTVERSION= 15.5.6 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -19,9 +19,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.36.1:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ - rubygem-github-linguist>=7.20<8:textproc/rubygem-github-linguist \ + rubygem-github-linguist>=7.23<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport61>=6.1.6.1<6.1.7:devel/rubygem-activesupport61 \ + rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index a9090f3b7ff5..3a4b1615b6d8 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2022-11-11 19:21:41 UTC +--- ruby/Gemfile.orig 2022-12-07 19:19:46 UTC +++ ruby/Gemfile @@ -1,15 +1,15 @@ source 'https://rubygems.org' @@ -7,7 +7,7 @@ -gem 'github-linguist', '~> 7.20.0', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.6.1' -+gem 'github-linguist', '~> 7.23.0', require: 'linguist' ++gem 'github-linguist', '~> 7.23', require: 'linguist' +gem 'gitlab-markup', '~> 1.8.0' +gem 'activesupport', '~> 6.1.6' gem 'rdoc', '~> 6.0'