git: a72302cb2e81 - 2022Q1 - www/gitlab-ce: bugfix update to 14.6.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 21 Jan 2022 14:59:17 UTC
The branch 2022Q1 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a72302cb2e81ffd49ba34acf28f9988487c21e10

commit a72302cb2e81ffd49ba34acf28f9988487c21e10
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-01-21 13:25:52 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-01-21 14:01:19 +0000

    www/gitlab-ce: bugfix update to 14.6.3
    
    Changelog:
    https://about.gitlab.com/releases/2022/01/17/gitlab-14-6-3-released/
    (cherry picked from commit f54e59f3051a7ee6d0a2f9f814f591b38d988642)
---
 devel/gitaly/Makefile         | 4 ++--
 devel/gitaly/distinfo         | 6 +++---
 www/gitlab-ce/Makefile        | 4 ++--
 www/gitlab-ce/distinfo        | 6 +++---
 www/gitlab-workhorse/Makefile | 4 +++-
 www/gitlab-workhorse/distinfo | 2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 2c91e0ea1bcf..2c21444f8319 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.6.2
+DISTVERSION=	14.6.3
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -49,7 +49,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	43df6fe2e2682b48724a274d9f1e643c0689d3cc
+GL_COMMIT=	b16fee14516980fedd9d67d5207cadf2165ab162
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 91137a480025..224918a8f072 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1641936870
+TIMESTAMP = 1642667421
 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-43df6fe2e2682b48724a274d9f1e643c0689d3cc_GL0.tar.gz) = a55ff15f400c0b7693e4e91998bd11262e175a598a244cc0bde55d3d61da9059
-SIZE (gitlab-org-gitaly-43df6fe2e2682b48724a274d9f1e643c0689d3cc_GL0.tar.gz) = 3759544
+SHA256 (gitlab-org-gitaly-b16fee14516980fedd9d67d5207cadf2165ab162_GL0.tar.gz) = 5e8f180f7d6b74d94d068fcce6b2a8fe5bdd18e55cb1212bb5893120d8d547bd
+SIZE (gitlab-org-gitaly-b16fee14516980fedd9d67d5207cadf2165ab162_GL0.tar.gz) = 3759569
 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
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index a5cb7064aa41..cd7ca5304164 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,7 +1,7 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	14.6.2
+PORTVERSION=	14.6.3
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -274,7 +274,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	0a901d60f8ae4a60c04ae82e6e9c3a03e9321417
+GL_COMMIT=	e085746f07774a1050d9fceffa7e17b262f3132d
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 79e60b98c8ef..0b402a8340f5 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641989823
-SHA256 (gitlab-org-gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417_GL0.tar.gz) = 6dc41101331026a8c79b67fd4f64e64913cb80fbf1f5076693cf3464794bdfc3
-SIZE (gitlab-org-gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417_GL0.tar.gz) = 101493694
+TIMESTAMP = 1642666034
+SHA256 (gitlab-org-gitlab-foss-e085746f07774a1050d9fceffa7e17b262f3132d_GL0.tar.gz) = ce834f94c3b5f54e2289f7499126ca3a418932fede39d944d0f0e332d25f897a
+SIZE (gitlab-org-gitlab-foss-e085746f07774a1050d9fceffa7e17b262f3132d_GL0.tar.gz) = 101488010
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 22ddbc7410dd..a382b12f6e20 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	14.6.2
+PORTVERSION=	14.6.3
 PORTREVISION=	0
 CATEGORIES=	www
 
@@ -18,6 +18,8 @@ USES=		gmake go:modules,no_targets
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 MAKE_ENV+=	${GO_ENV}
 WRKSRC_SUBDIR=	workhorse
+# found in work/gitlab-foss*/workhorse/go.mod
+#GO_MODULE=	gitlab.com/gitlab-org/gitlab/workhorse
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index ba2e476f5994..c439b4ea4167 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1641989798
+TIMESTAMP = 1642666936
 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