www/gitlab-ce: Security related update to 13.12.2.

Changelog:
https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/

7 files changed, 24 insertions, 16 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 6f226c8370d5..b4da199aa39d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	13.12.1
+DISTVERSION=	13.12.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=	ae8d1970cf9eb2b46f1453d11292f86b7ab56056
+GL_COMMIT=	57d2b91d24411e773da52eb98d8a473b143c6c95
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index de68c459160b..aa8367ff62ed 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1622303430
+TIMESTAMP = 1622582410
 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-ae8d1970cf9eb2b46f1453d11292f86b7ab56056_GL0.tar.gz) = 09cb8b24ad183865fab8335557f24d29a6d666229b51ea72a23b89e33d0bd373
-SIZE (gitlab-org-gitaly-ae8d1970cf9eb2b46f1453d11292f86b7ab56056_GL0.tar.gz) = 3462676
+SHA256 (gitlab-org-gitaly-57d2b91d24411e773da52eb98d8a473b143c6c95_GL0.tar.gz) = b8dc368223a60b6c3c080fd0112f8f29ab11462fe0a6c4a0ca891059a0c40599
+SIZE (gitlab-org-gitaly-57d2b91d24411e773da52eb98d8a473b143c6c95_GL0.tar.gz) = 3463230
 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 64e8fa39e74e..166302f3fcf5 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=	13.12.1
-PORTREVISION=	1
+PORTVERSION=	13.12.2
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -271,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?=	bec931306a784792a7a1faa44e0db338fa34b3ee
+GL_COMMIT?=	d98457affdf684f129fd52388ac9e290e4d2924f
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 08e571a76a33..b6413c16f1fb 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622303316
-SHA256 (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 4b9c9638b7eaeab39525a7ccbeb35c6da49d0f3cc1348614609960bc1a62638d
-SIZE (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 95965567
+TIMESTAMP = 1622581881
+SHA256 (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 249319c2535d0173d8040c0815f003c981706e2262cfe2c9a398138d343273c7
+SIZE (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 95973110
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index d61836c07e57..33a7be1abb21 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -9302,6 +9302,7 @@
 %%WWWDIR%%/app/views/doorkeeper/applications/show.html.haml
 %%WWWDIR%%/app/views/doorkeeper/authorizations/error.html.haml
 %%WWWDIR%%/app/views/doorkeeper/authorizations/new.html.haml
+%%WWWDIR%%/app/views/doorkeeper/authorizations/redirect.html.haml
 %%WWWDIR%%/app/views/doorkeeper/authorizations/show.html.haml
 %%WWWDIR%%/app/views/doorkeeper/authorized_applications/_delete_form.html.haml
 %%WWWDIR%%/app/views/doorkeeper/authorized_applications/index.html.haml
@@ -14611,6 +14612,7 @@
 %%WWWDIR%%/db/migrate/20210512183309_add_body_to_findings_evidences_response.rb
 %%WWWDIR%%/db/migrate/20210512183310_add_limit_to_findings_evidences_response_body.rb
 %%WWWDIR%%/db/migrate/20210513093418_add_draft_column_to_merge_requests.rb
+%%WWWDIR%%/db/migrate/20210519154058_schedule_update_users_where_two_factor_auth_required_from_group.rb
 %%WWWDIR%%/db/optional_migrations/composite_primary_keys.rb
 %%WWWDIR%%/db/post_migrate/20190102152410_delete_inconsistent_internal_id_records2.rb
 %%WWWDIR%%/db/post_migrate/20190115054215_migrate_delete_container_repository_worker.rb
@@ -17179,6 +17181,7 @@
 %%WWWDIR%%/db/schema_migrations/20210513155635
 %%WWWDIR%%/db/schema_migrations/20210517075444
 %%WWWDIR%%/db/schema_migrations/20210518001450
+%%WWWDIR%%/db/schema_migrations/20210519154058
 %%WWWDIR%%/db/seeds.rb
 %%WWWDIR%%/db/structure.sql
 %%WWWDIR%%/doc/.markdownlint/markdownlint-no-trailing-spaces.yml
@@ -20595,6 +20598,7 @@
 %%WWWDIR%%/lib/gitlab/background_migration/update_existing_users_that_require_two_factor_auth.rb
 %%WWWDIR%%/lib/gitlab/background_migration/update_location_fingerprint_for_container_scanning_findings.rb
 %%WWWDIR%%/lib/gitlab/background_migration/update_timelogs_project_id.rb
+%%WWWDIR%%/lib/gitlab/background_migration/update_users_where_two_factor_auth_required_from_group.rb
 %%WWWDIR%%/lib/gitlab/background_migration/update_vulnerabilities_from_dismissal_feedback.rb
 %%WWWDIR%%/lib/gitlab/background_migration/update_vulnerabilities_to_dismissed.rb
 %%WWWDIR%%/lib/gitlab/background_migration/update_vulnerability_confidence.rb
@@ -22390,6 +22394,7 @@
 %%WWWDIR%%/lib/gitlab/utils/measuring.rb
 %%WWWDIR%%/lib/gitlab/utils/merge_hash.rb
 %%WWWDIR%%/lib/gitlab/utils/mime_type.rb
+%%WWWDIR%%/lib/gitlab/utils/nokogiri.rb
 %%WWWDIR%%/lib/gitlab/utils/override.rb
 %%WWWDIR%%/lib/gitlab/utils/safe_inline_hash.rb
 %%WWWDIR%%/lib/gitlab/utils/sanitize_node_link.rb
@@ -30751,6 +30756,7 @@
 %%WWWDIR%%/spec/lib/gitlab/background_migration/update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/update_existing_users_that_require_two_factor_auth_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/update_timelogs_project_id_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/background_migration/update_users_where_two_factor_auth_required_from_group_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/user_mentions/create_resource_user_mention_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration/wrongfully_confirmed_email_unconfirmer_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/background_migration_spec.rb
@@ -32090,6 +32096,7 @@
 %%WWWDIR%%/spec/lib/gitlab/utils/measuring_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/merge_hash_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/mime_type_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/utils/nokogiri_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/override_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/safe_inline_hash_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/utils/sanitize_node_link_spec.rb
@@ -32415,6 +32422,7 @@
 %%WWWDIR%%/spec/migrations/schedule_update_existing_subgroup_to_match_visibility_level_of_parent_spec.rb
 %%WWWDIR%%/spec/migrations/schedule_update_existing_users_that_require_two_factor_auth_spec.rb
 %%WWWDIR%%/spec/migrations/schedule_update_timelogs_project_id_spec.rb
+%%WWWDIR%%/spec/migrations/schedule_update_users_where_two_factor_auth_required_from_group_spec.rb
 %%WWWDIR%%/spec/migrations/seed_merge_trains_enabled_spec.rb
 %%WWWDIR%%/spec/migrations/seed_repository_storages_weighted_spec.rb
 %%WWWDIR%%/spec/migrations/services_remove_temporary_index_on_project_id_spec.rb
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 2bcdf3c60788..e23400f65252 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.12.1
+PORTVERSION?=	13.12.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?=	bec931306a784792a7a1faa44e0db338fa34b3ee
+GL_COMMIT?=	d98457affdf684f129fd52388ac9e290e4d2924f
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index fc741dd3c4a8..aec647f3934e 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1622303394
+TIMESTAMP = 1622582334
 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-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 4b9c9638b7eaeab39525a7ccbeb35c6da49d0f3cc1348614609960bc1a62638d
-SIZE (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 95965567
+SHA256 (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 249319c2535d0173d8040c0815f003c981706e2262cfe2c9a398138d343273c7
+SIZE (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 95973110
 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