Date: Wed, 28 Apr 2021 21:57:51 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a90f2f815473 - main - www/gitlab-ce: Security update to 13.11.2. Message-ID: <202104282157.13SLvpsY050666@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a90f2f815473dea018ab5a9e4a1235b5c34936cb commit a90f2f815473dea018ab5a9e4a1235b5c34936cb Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-04-28 21:05:47 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2021-04-28 21:57:39 +0000 www/gitlab-ce: Security update to 13.11.2. Changelog: https://about.gitlab.com/releases/2021/04/28/security-release-gitlab-13-11-2-released/ Security: 518a119c-a864-11eb-8ddb-001b217b3468 --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 6 +++--- www/gitlab-ce/Makefile | 10 +++++----- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/pkg-plist | 1 + www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 6 +++--- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index a8b8c3bc72b5..aa2facce06b8 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 13.11.1 +DISTVERSION= 13.11.2 PORTREVISION= 0 CATEGORIES= devel @@ -43,7 +43,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 538266fbaefe35385130e0f3c7b1865cec2a57b0 +GL_COMMIT= 32583d86bad131de8405a90407052edc836a0244 # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index b4783b5ba674..856b1ca0bd4f 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1619179548 +TIMESTAMP = 1619641315 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 @@ -169,8 +169,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-538266fbaefe35385130e0f3c7b1865cec2a57b0_GL0.tar.gz) = 733010a94f91466721334683969d253abfa67dbc3d19b09475e99754b99a627a -SIZE (gitlab-org-gitaly-538266fbaefe35385130e0f3c7b1865cec2a57b0_GL0.tar.gz) = 3459810 +SHA256 (gitlab-org-gitaly-32583d86bad131de8405a90407052edc836a0244_GL0.tar.gz) = 76c84bd583747f8f702f405d06fe00bdd1b7bbda69973abbefd429fb6e7db12a +SIZE (gitlab-org-gitaly-32583d86bad131de8405a90407052edc836a0244_GL0.tar.gz) = 3459859 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 a460c93a0db3..72f9b126fffd 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.11.1 +PORTVERSION= 13.11.2 PORTREVISION= 0 CATEGORIES= www devel @@ -16,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.31.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=2.9.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=${PORTVERSION}:net/gitlab-agent \ + gitlab-agent>=13.11.1:net/gitlab-agent \ gitlab-pages>=1.38.0:www/gitlab-pages \ gitlab-shell>=13.17.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ - redis>=4.0.0:databases/redis \ + redis>=6.0.12:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ @@ -90,7 +90,7 @@ MY_DEPENDS= git>=2.31.0:devel/git \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails60>=1.2.1<2.0:www/rubygem-kaminari-rails60 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ - rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \ + rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \ rubygem-fog-aws>=3.9<4.0:net/rubygem-fog-aws \ rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \ @@ -269,7 +269,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?= 2fad41087674984a064cf6a312ac34c16bb2a1aa +GL_COMMIT?= d8d57a90208c62b29e5218f97525404859232a55 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 755914e95623..7a4e69f0d97d 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619163494 -SHA256 (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 8d177e531830aeac7a94ac53c92222f796b7a5c7d1a3dd6b8a0baafc5e466e60 -SIZE (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 96845275 +TIMESTAMP = 1619640451 +SHA256 (gitlab-org-gitlab-foss-d8d57a90208c62b29e5218f97525404859232a55_GL0.tar.gz) = d2bfe2c41c34587a20fbc043c203f3cade4bee4c52b0902ba02bdb6a760fc058 +SIZE (gitlab-org-gitlab-foss-d8d57a90208c62b29e5218f97525404859232a55_GL0.tar.gz) = 96844994 diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index fcc3c8679528..8dc5e621c8a5 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -20019,6 +20019,7 @@ %%WWWDIR%%/lib/gitlab/auth/saml/identity_linker.rb %%WWWDIR%%/lib/gitlab/auth/saml/origin_validator.rb %%WWWDIR%%/lib/gitlab/auth/saml/user.rb +%%WWWDIR%%/lib/gitlab/auth/scope_validator.rb %%WWWDIR%%/lib/gitlab/auth/too_many_ips.rb %%WWWDIR%%/lib/gitlab/auth/two_factor_auth_verifier.rb %%WWWDIR%%/lib/gitlab/auth/u2f_webauthn_converter.rb diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 1136f3960e31..ac5213cddf97 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.11.1 +PORTVERSION?= 13.11.2 PORTREVISION?= 0 CATEGORIES= www @@ -23,7 +23,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?= 2fad41087674984a064cf6a312ac34c16bb2a1aa +GL_COMMIT?= d8d57a90208c62b29e5218f97525404859232a55 # for go dependencies USE_GITHUB= nodefault diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 5a9bca1772c5..0fdd1e8bd847 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1619183412 +TIMESTAMP = 1619641369 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 @@ -181,8 +181,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-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 8d177e531830aeac7a94ac53c92222f796b7a5c7d1a3dd6b8a0baafc5e466e60 -SIZE (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 96845275 +SHA256 (gitlab-org-gitlab-foss-d8d57a90208c62b29e5218f97525404859232a55_GL0.tar.gz) = d2bfe2c41c34587a20fbc043c203f3cade4bee4c52b0902ba02bdb6a760fc058 +SIZE (gitlab-org-gitlab-foss-d8d57a90208c62b29e5218f97525404859232a55_GL0.tar.gz) = 96844994 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?202104282157.13SLvpsY050666>