Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Apr 2021 07:09:59 GMT
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: a0aac5772461 - 2021Q2 - www/gitlab-ce: Security update to 13.10.3.
Message-ID:  <202104210709.13L79xNQ053110@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by mfechner:

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

commit a0aac5772461f983f0e8190049658d880943161c
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-04-17 06:18:09 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-04-21 06:08:43 +0000

    www/gitlab-ce: Security update to 13.10.3.
    
    Changelog:
    https://about.gitlab.com/releases/2021/04/14/security-release-gitlab-13-10-3-released/
    (cherry picked from commit 77d6936ce6b750acc1503f712be7e507b90b5f47)
---
 devel/gitaly/Makefile         | 4 ++--
 devel/gitaly/distinfo         | 6 +++---
 www/gitlab-ce/Makefile        | 6 ++++--
 www/gitlab-ce/distinfo        | 6 +++---
 www/gitlab-workhorse/Makefile | 4 ++--
 www/gitlab-workhorse/distinfo | 6 +++---
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 500358918d31..ece6da743146 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
 
 PORTNAME=	gitaly
-DISTVERSION=	13.10.2
+DISTVERSION=	13.10.3
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -44,7 +44,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	566d0ed013b36ca369e72fd5d1a9a9cc7606132a
+GL_COMMIT=	80796c538e2c8f45d311914c3d7a6b22866a0758
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index d605a53c49c1..df0ae8e3774c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1617994165
+TIMESTAMP = 1618497419
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
 SHA256 (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df
@@ -161,8 +161,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 32e20b1de98c530a51f2bff821c070474311a53d14006513702ec7c25dd62658
-SIZE (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 3396774
+SHA256 (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 6caa7d7f8ee04b9b455ba84fdd2a04ff16f6b79cd780ae02ac3b4c09c2a3541d
+SIZE (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 3396835
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 52ac13c4d351..669057aaf65a 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=	13.10.2
+PORTVERSION=	13.10.3
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -38,6 +38,8 @@ MY_DEPENDS=	git>=2.29:devel/git \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \
 	rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \
+	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
+	rubygem-ruby-saml>=1.12.1<1.13:security/rubygem-ruby-saml \
 	rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-activedirectory-v2>=0.1<1:net/rubygem-omniauth-azure-activedirectory-v2 \
@@ -269,7 +271,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?=	7efd19e3716ab6f9146052da76d1bd59ec815f2d
+GL_COMMIT?=	b1774ad36a965ba5077db6db11e13f2837284158
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 46dc6048f022..98a639c04dba 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617994217
-SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4
-SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606
+TIMESTAMP = 1618464119
+SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d
+SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 99a61b7c6efc..2b72de95cc7d 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?=	13.10.2
+PORTVERSION?=	13.10.3
 PORTREVISION?=	0
 CATEGORIES=	www
 
@@ -22,7 +22,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?=	7efd19e3716ab6f9146052da76d1bd59ec815f2d
+GL_COMMIT?=	b1774ad36a965ba5077db6db11e13f2837284158
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 9b7a82dbd45c..8a69eee1c6d9 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1617994305
+TIMESTAMP = 1618479411
 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-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7
@@ -179,8 +179,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4
-SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606
+SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d
+SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905
 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 000027af9d1bca6db30bb4e0b27fcb4b6315ae7c0787639c044eaa449fc3d8d0
 SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3145584
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104210709.13L79xNQ053110>