git: f6f259d2d3ae - 2022Q2 - www/gitlab-ce: security update to 14.9.2

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Mon, 04 Apr 2022 15:41:33 UTC
The branch 2022Q2 has been updated by mfechner:

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

commit f6f259d2d3ae3d9792f72f4fff0b51cca5095da9
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-04-04 15:00:56 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-04-04 15:21:16 +0000

    www/gitlab-ce: security update to 14.9.2
    
    Changelog:
    https://about.gitlab.com/releases/2022/03/31/critical-security-release-gitlab-14-9-2-released/
    
    MFH:            2022Q2
    Security:       8657eedd-b423-11ec-9559-001b217b3468
    (cherry picked from commit f4230594947dce3a85c6fd3391ab3f9492f46872)
---
 devel/gitaly/Makefile         |  6 +++---
 devel/gitaly/distinfo         |  6 +++---
 www/gitlab-ce/Makefile        | 10 +++++-----
 www/gitlab-ce/distinfo        |  6 +++---
 www/gitlab-pages/Makefile     |  4 ++--
 www/gitlab-pages/distinfo     | 10 +++++-----
 www/gitlab-workhorse/Makefile |  6 +++---
 www/gitlab-workhorse/distinfo |  6 +++---
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 8687692f82f1..5175a5768ea0 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.9.1
-PORTREVISION=	1
+DISTVERSION=	14.9.2
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -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=	402944bf57a1edd384e5fed24473f83280979a80
+GL_COMMIT=	8cd7ea86f577e946abb3a8829e56d735b351cc26
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index d0e4d3bd7a67..f154ab499705 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1648219174
+TIMESTAMP = 1649083554
 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
@@ -281,8 +281,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-402944bf57a1edd384e5fed24473f83280979a80_GL0.tar.gz) = 5f5e984242457edab9922df475c2f9b8bbb2e7f5d120789e3baa5de81fc33c9a
-SIZE (gitlab-org-gitaly-402944bf57a1edd384e5fed24473f83280979a80_GL0.tar.gz) = 3850451
+SHA256 (gitlab-org-gitaly-8cd7ea86f577e946abb3a8829e56d735b351cc26_GL0.tar.gz) = a62ba1ab751ad134ebef0cbe3a9584c470b0c5e02fd8ca2c50e5dd64241139cf
+SIZE (gitlab-org-gitaly-8cd7ea86f577e946abb3a8829e56d735b351cc26_GL0.tar.gz) = 3850462
 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 f696d5512cb5..513f0d14778f 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,8 +1,8 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	14.9.1
-PORTREVISION=	1
+PORTVERSION=	14.9.2
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -19,7 +19,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=2.17.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=14.9.0:net/gitlab-agent \
-	gitlab-pages>=1.56.0:www/gitlab-pages \
+	gitlab-pages>=1.56.1:www/gitlab-pages \
 	gitlab-shell>=13.24.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.14:databases/redis \
@@ -70,7 +70,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
 	rubygem-invisible_captcha>=1.1.0<1.2.0:graphics/rubygem-invisible_captcha \
-	rubygem-devise-two-factor-rails61>=4.0.0<4.1:security/rubygem-devise-two-factor-rails61 \
+	rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \
 	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
 	rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
 	rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
@@ -278,7 +278,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=	5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7
+GL_COMMIT=	56bec66a79f1fd82a130cb7963d86b76bd5f9185
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 9f1230cd0300..912430a8590d 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648219074
-SHA256 (gitlab-org-gitlab-foss-5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7_GL0.tar.gz) = 9685e3cb51f4fc0b22ce5a9dc0bf25cc925c269c1346fd45693a3377756cc166
-SIZE (gitlab-org-gitlab-foss-5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7_GL0.tar.gz) = 102356177
+TIMESTAMP = 1649083225
+SHA256 (gitlab-org-gitlab-foss-56bec66a79f1fd82a130cb7963d86b76bd5f9185_GL0.tar.gz) = 6832063f94d10c51160011e985cd65c3525382e62282f7fd41c062b146e29825
+SIZE (gitlab-org-gitlab-foss-56bec66a79f1fd82a130cb7963d86b76bd5f9185_GL0.tar.gz) = 102363158
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 20c3fc1e28ea..c0e96c0b8690 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	1.56.0
+PORTVERSION=	1.56.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 9830725b6595..683fca786eda 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1647950018
-SHA256 (go/www_gitlab-pages/gitlab-pages-v1.56.0/v1.56.0.mod) = 283add63c0a36e9e303f9f520eb37589dedb7591b2df50b29642df3ab15b6422
-SIZE (go/www_gitlab-pages/gitlab-pages-v1.56.0/v1.56.0.mod) = 1265
-SHA256 (go/www_gitlab-pages/gitlab-pages-v1.56.0/v1.56.0.zip) = ba4f3b6027d05493724d25ee293ecb879b177ffef117d467feef4f9134a7cab8
-SIZE (go/www_gitlab-pages/gitlab-pages-v1.56.0/v1.56.0.zip) = 360266
+TIMESTAMP = 1649083620
+SHA256 (go/www_gitlab-pages/gitlab-pages-v1.56.1/v1.56.1.mod) = a74daad009bdf66e0b5ca33acf8243618901478fabbc40caddcae0fd653fc792
+SIZE (go/www_gitlab-pages/gitlab-pages-v1.56.1/v1.56.1.mod) = 1265
+SHA256 (go/www_gitlab-pages/gitlab-pages-v1.56.1/v1.56.1.zip) = c782469d76d740a447e90f13f7f509f17dee1bccbdebac91286d7decb3ef0f9d
+SIZE (go/www_gitlab-pages/gitlab-pages-v1.56.1/v1.56.1.zip) = 361954
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 3c047c014fee..67e176410244 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,8 +1,8 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	14.9.1
-PORTREVISION=	1
+PORTVERSION=	14.9.2
+PORTREVISION=	0
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -25,7 +25,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7
+GL_COMMIT=	56bec66a79f1fd82a130cb7963d86b76bd5f9185
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 08ecf9a844c3..89b9f7342c66 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1648219111
+TIMESTAMP = 1649083207
 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
@@ -199,8 +199,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5
 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitlab-foss-5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7_GL0.tar.gz) = 9685e3cb51f4fc0b22ce5a9dc0bf25cc925c269c1346fd45693a3377756cc166
-SIZE (gitlab-org-gitlab-foss-5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7_GL0.tar.gz) = 102356177
+SHA256 (gitlab-org-gitlab-foss-56bec66a79f1fd82a130cb7963d86b76bd5f9185_GL0.tar.gz) = 6832063f94d10c51160011e985cd65c3525382e62282f7fd41c062b146e29825
+SIZE (gitlab-org-gitlab-foss-56bec66a79f1fd82a130cb7963d86b76bd5f9185_GL0.tar.gz) = 102363158
 SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e
 SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056
 SHA256 (gitlab-org-golang-archive-zip-84007c99e03b62ee4dc62a94048d6e59552299d7_GL0.tar.gz) = 103a3e806657de5e2c7844326146c88490089fa8d07784270c359b5f5a8d06be