Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2020 07:19:41 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536742 - in head: devel/gitaly www/gitlab-ce www/gitlab-workhorse
Message-ID:  <202005280719.04S7JfXo037051@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Thu May 28 07:19:40 2020
New Revision: 536742
URL: https://svnweb.freebsd.org/changeset/ports/536742

Log:
  Security update www/gitlab-ce to 12.10.7.
  Changelog:
  https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
  
  Security:	69cf62a8-a0aa-11ea-9ea5-001b217b3468

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/www/gitlab-ce/Makefile
  head/www/gitlab-ce/distinfo
  head/www/gitlab-ce/pkg-plist
  head/www/gitlab-workhorse/Makefile
  head/www/gitlab-workhorse/distinfo

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Thu May 28 06:44:49 2020	(r536741)
+++ head/devel/gitaly/Makefile	Thu May 28 07:19:40 2020	(r536742)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	12.10.6
+DISTVERSION=	12.10.7
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -42,7 +42,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	de65813a201020830bc6da809e5349caf1dac33e
+GL_COMMIT=	a76f4a8740acead12a095db66dc8a22de35906d0
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Thu May 28 06:44:49 2020	(r536741)
+++ head/devel/gitaly/distinfo	Thu May 28 07:19:40 2020	(r536742)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1589649477
+TIMESTAMP = 1590645053
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -99,7 +99,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b
 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-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = f20511fbaced6c2573b266bfe5c2929c7704bee774d5b92bc422d92b2c58c152
-SIZE (gitlab-org-gitaly-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = 2958790
+SHA256 (gitlab-org-gitaly-a76f4a8740acead12a095db66dc8a22de35906d0_GL0.tar.gz) = f9a750109152ba19279dfd26dceb3a95bc6d9e3281499279f6c2df3da303ad50
+SIZE (gitlab-org-gitaly-a76f4a8740acead12a095db66dc8a22de35906d0_GL0.tar.gz) = 2958809
 SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7
 SIZE (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 3619731

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Thu May 28 06:44:49 2020	(r536741)
+++ head/www/gitlab-ce/Makefile	Thu May 28 07:19:40 2020	(r536742)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	12.10.6
+PORTVERSION=	12.10.7
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 MY_DEPENDS=	git>=2.24.3:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-shell>=12.2.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.30.1:www/gitlab-workhorse \
+	gitlab-workhorse>=8.30.2:www/gitlab-workhorse \
 	gitlab-pages>=1.17.0:www/gitlab-pages \
 	gitlab-elasticsearch-indexer>=2.2.0:textproc/gitlab-elasticsearch-indexer \
 	redis>=3.2.12:databases/redis \
@@ -251,7 +251,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=	833223f2a7f9b95823f6a570be3e65cd3ecfa71f
+GL_COMMIT=	e5e96554dd73c328b8375e04802f944ab2cab407
 SHEBANG_FILES=	bin/background_* scripts/build_assets_image scripts/clean-old-cached-assets scripts/create_postgres_user.sh scripts/prepare_postgres_fdw.sh scripts/review_apps/gcp_cleanup.sh scripts/rspec_helpers.sh scripts/security-harness
 
 USERS=	git

Modified: head/www/gitlab-ce/distinfo
==============================================================================
--- head/www/gitlab-ce/distinfo	Thu May 28 06:44:49 2020	(r536741)
+++ head/www/gitlab-ce/distinfo	Thu May 28 07:19:40 2020	(r536742)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589649421
-SHA256 (gitlab-org-gitlab-foss-833223f2a7f9b95823f6a570be3e65cd3ecfa71f_GL0.tar.gz) = 10a6dcd8a4b1c4c384f9bb457cf8f96ea3c4685179a3d6bfa3c10afb28c6be6d
-SIZE (gitlab-org-gitlab-foss-833223f2a7f9b95823f6a570be3e65cd3ecfa71f_GL0.tar.gz) = 85959439
+TIMESTAMP = 1590645098
+SHA256 (gitlab-org-gitlab-foss-e5e96554dd73c328b8375e04802f944ab2cab407_GL0.tar.gz) = 1ec0a3b8683220b6896abeb885c33ef5c7c9f9ebff5b2f85de1f6034d35cdd5f
+SIZE (gitlab-org-gitlab-foss-e5e96554dd73c328b8375e04802f944ab2cab407_GL0.tar.gz) = 85965787

Modified: head/www/gitlab-ce/pkg-plist
==============================================================================
--- head/www/gitlab-ce/pkg-plist	Thu May 28 06:44:49 2020	(r536741)
+++ head/www/gitlab-ce/pkg-plist	Thu May 28 07:19:40 2020	(r536742)
@@ -17308,6 +17308,7 @@
 %%WWWDIR%%/spec/features/milestones/user_views_milestone_spec.rb
 %%WWWDIR%%/spec/features/milestones/user_views_milestones_spec.rb
 %%WWWDIR%%/spec/features/oauth_login_spec.rb
+%%WWWDIR%%/spec/features/oauth_provider_authorize_spec.rb
 %%WWWDIR%%/spec/features/participants_autocomplete_spec.rb
 %%WWWDIR%%/spec/features/password_reset_spec.rb
 %%WWWDIR%%/spec/features/populate_new_pipeline_vars_with_params_spec.rb
@@ -18405,6 +18406,7 @@
 %%WWWDIR%%/spec/frontend/fixtures/static/images/red_box.png
 %%WWWDIR%%/spec/frontend/fixtures/static/issuable_filter.html
 %%WWWDIR%%/spec/frontend/fixtures/static/issue_sidebar_label.html
+%%WWWDIR%%/spec/frontend/fixtures/static/issue_with_mermaid_graph.html
 %%WWWDIR%%/spec/frontend/fixtures/static/line_highlighter.html
 %%WWWDIR%%/spec/frontend/fixtures/static/linked_tabs.html
 %%WWWDIR%%/spec/frontend/fixtures/static/merge_requests_show.html
@@ -22718,6 +22720,7 @@
 %%WWWDIR%%/spec/support/shared_examples/features/resolving_discussions_in_issues_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/features/rss_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/features/search_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/features/secure_oauth_authorizations_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/features/showing_user_status_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/features/snippets_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/features/variable_list_shared_examples.rb
@@ -22879,6 +22882,7 @@
 %%WWWDIR%%/spec/support/shared_examples/services/updating_mentions_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/tasks/gitlab/import_export/measurable_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/tasks/gitlab/uploads/migration_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/uncached_response_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/uploaders/gitlab_uploader_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_examples/uploaders/upload_type_shared_examples.rb
@@ -22961,6 +22965,7 @@
 %%WWWDIR%%/spec/validators/system_hook_url_validator_spec.rb
 %%WWWDIR%%/spec/validators/variable_duplicates_validator_spec.rb
 %%WWWDIR%%/spec/validators/x509_certificate_credentials_validator_spec.rb
+%%WWWDIR%%/spec/views/admin/application_settings/_eks.html.haml_spec.rb
 %%WWWDIR%%/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
 %%WWWDIR%%/spec/views/admin/application_settings/general.html.haml_spec.rb
 %%WWWDIR%%/spec/views/admin/dashboard/index.html.haml_spec.rb

Modified: head/www/gitlab-workhorse/Makefile
==============================================================================
--- head/www/gitlab-workhorse/Makefile	Thu May 28 06:44:49 2020	(r536741)
+++ head/www/gitlab-workhorse/Makefile	Thu May 28 07:19:40 2020	(r536742)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	8.30.1
+PORTVERSION=	8.30.2
 PORTREVISION=	0
 CATEGORIES=	www
 
@@ -21,7 +21,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags
-GL_COMMIT=	d0573443810ed08c8425cf771cb0758621ce0baf
+GL_COMMIT=	a6e229008de3927b72af4f011bb0c191ae08b290
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/www/gitlab-workhorse/distinfo
==============================================================================
--- head/www/gitlab-workhorse/distinfo	Thu May 28 06:44:49 2020	(r536741)
+++ head/www/gitlab-workhorse/distinfo	Thu May 28 07:19:40 2020	(r536742)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1587535814
+TIMESTAMP = 1590644871
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -111,8 +111,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b
 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-workhorse-d0573443810ed08c8425cf771cb0758621ce0baf_GL0.tar.gz) = db17774b2c796725f9dfed0fbeaaf73044f1c51c01d30def5edfab63ef5baa3b
-SIZE (gitlab-org-gitlab-workhorse-d0573443810ed08c8425cf771cb0758621ce0baf_GL0.tar.gz) = 216432
+SHA256 (gitlab-org-gitlab-workhorse-a6e229008de3927b72af4f011bb0c191ae08b290_GL0.tar.gz) = c728390bce9cc35d5c267cea6d0283362fb36dc97bc32a994036832d463f5d8a
+SIZE (gitlab-org-gitlab-workhorse-a6e229008de3927b72af4f011bb0c191ae08b290_GL0.tar.gz) = 218117
 SHA256 (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 40decb68620c061cadba556f836ef8efc953372b32903fd90825bb88fa79e943
 SIZE (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 2800331
 SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7



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