devel/gitaly: update to 14.6.0

Required for gitlab-ce 14.6.
freebsd · Dec 22, 2021 · 1cd6234 · 1cd6234
1 parent f0d9d67
commit 1cd6234
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 63 deletions.
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.5.2
+DISTVERSION=	14.6.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -18,7 +18,7 @@ MY_DEPENDS=	git>=2.33.0:devel/git \
 		rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
 		rubygem-rugged>=1.2<2:devel/rubygem-rugged \
 		rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
-		rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
+		rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
 		rubygem-activesupport61>=6.1.4.1<6.1.4.2:devel/rubygem-activesupport61 \
 		rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
@@ -34,7 +34,7 @@ BUILD_DEPENDS=	gem:devel/ruby-gems \
 		bash>0:shells/bash \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
-		gitlab-shell>=9.3.0:devel/gitlab-shell
+		gitlab-shell>=13.22.1:devel/gitlab-shell
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		cpe gmake go:modules,no_targets pkgconfig
@@ -49,12 +49,12 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	5d5df6138d9bc6b93503ee529a5b099ea8e5e839
+GL_COMMIT=	b7ed739365ce6c15aad81faaf6367151d701ce85
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 138dd
+# 137dd
 GH_TUPLE=	\
 		Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
 		Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
@@ -231,3 +231,4 @@ post-install:
 
 .include <bsd.port.mk>
 
+
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1638857864
+TIMESTAMP = 1640119532
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -265,8 +265,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
-SHA256 (gitlab-org-gitaly-5d5df6138d9bc6b93503ee529a5b099ea8e5e839_GL0.tar.gz) = cef6581f8c979f1fb90d7d6fcf71b5a341e23a1e2aa21c75345358ec4abbee29
-SIZE (gitlab-org-gitaly-5d5df6138d9bc6b93503ee529a5b099ea8e5e839_GL0.tar.gz) = 3719989
+SHA256 (gitlab-org-gitaly-b7ed739365ce6c15aad81faaf6367151d701ce85_GL0.tar.gz) = d56df7db1f7deadc51180479cc2cfa5833d6a542de5cffba75d1b185b43a1103
+SIZE (gitlab-org-gitaly-b7ed739365ce6c15aad81faaf6367151d701ce85_GL0.tar.gz) = 3761596
 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
 SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb