svn commit: r560890 - in head: devel/gitaly sysutils/rubygem-ohai8 www/gitlab-ce www/gitlab-pages www/gitlab-workhorse

Matthias Fechner mfechner at FreeBSD.org
Sat Jan 9 20:32:40 UTC 2021


Author: mfechner
Date: Sat Jan  9 20:32:38 2021
New Revision: 560890
URL: https://svnweb.freebsd.org/changeset/ports/560890

Log:
  Security update to 13.7.2:
  https://about.gitlab.com/releases/2021/01/07/security-release-gitlab-13-7-2-released/
  Bugfix update to 13.7.3:
  https://about.gitlab.com/releases/2021/01/08/gitlab-13-7-3-released/
  
  Security:	a2a2b34d-52b4-11eb-87cb-001b217b3468

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/sysutils/rubygem-ohai8/Makefile
  head/www/gitlab-ce/Makefile
  head/www/gitlab-ce/distinfo
  head/www/gitlab-ce/pkg-plist
  head/www/gitlab-pages/Makefile
  head/www/gitlab-pages/distinfo
  head/www/gitlab-workhorse/Makefile
  head/www/gitlab-workhorse/distinfo

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/devel/gitaly/Makefile	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	13.7.1
+DISTVERSION=	13.7.3
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -43,7 +43,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=	639d0efb14aa42c38ef974002be52deb60a26da9
+GL_COMMIT=	9e7d51bfcd4efeacbb66e3737485ade254bff6d0
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/devel/gitaly/distinfo	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1609076424
+TIMESTAMP = 1610222293
 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-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27
@@ -157,8 +157,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-gitaly-639d0efb14aa42c38ef974002be52deb60a26da9_GL0.tar.gz) = 1b6d1d1b6cc3a24ec5b93227b1c026fb01645e853aa0bbbb449e173312a8d31d
-SIZE (gitlab-org-gitaly-639d0efb14aa42c38ef974002be52deb60a26da9_GL0.tar.gz) = 3286933
+SHA256 (gitlab-org-gitaly-9e7d51bfcd4efeacbb66e3737485ade254bff6d0_GL0.tar.gz) = a53599cdbd994d8a566ca4a236bf836ac91741291dc55abc55b79eac7589034d
+SIZE (gitlab-org-gitaly-9e7d51bfcd4efeacbb66e3737485ade254bff6d0_GL0.tar.gz) = 3287069
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd

Modified: head/sysutils/rubygem-ohai8/Makefile
==============================================================================
--- head/sysutils/rubygem-ohai8/Makefile	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/sysutils/rubygem-ohai8/Makefile	Sat Jan  9 20:32:38 2021	(r560890)
@@ -13,6 +13,9 @@ COMMENT=	Ohai profiles your system and emits JSON
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		Please use sysutils/rubygem-ohai instead
+EXPIRATION_DATE=	2021-01-31
+
 RUN_DEPENDS=	rubygem-chef-config12<14.0:sysutils/rubygem-chef-config12 \
 		rubygem-ffi>=1.9:devel/rubygem-ffi \
 		rubygem-ffi-yajl>=2.2:devel/rubygem-ffi-yajl \

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-ce/Makefile	Sat Jan  9 20:32:38 2021	(r560890)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	gitlab-ce
-PORTVERSION?=	13.7.1
+PORTVERSION?=	13.7.3
 PORTREVISION?=	0
 CATEGORIES=	www devel
 
@@ -18,9 +18,9 @@ MY_DEPENDS=	git>=2.29:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=2.8.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=13.7.0:net/gitlab-agent \
-	gitlab-pages>=1.32.0:www/gitlab-pages \
+	gitlab-pages>=1.34.0:www/gitlab-pages \
 	gitlab-shell>=13.14.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.58.0:www/gitlab-workhorse \
+	gitlab-workhorse>=8.58.2:www/gitlab-workhorse \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	gtar>0:archivers/gtar \
@@ -265,7 +265,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?=	c97c8073a0e63b678c31ebba78ca2867db376c76
+GL_COMMIT?=	1ef3b81f122ba52e955bee694c38d6fb4dae3068
 
 USERS=	git
 GROUPS=	git

Modified: head/www/gitlab-ce/distinfo
==============================================================================
--- head/www/gitlab-ce/distinfo	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-ce/distinfo	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609076297
-SHA256 (gitlab-org-gitlab-foss-c97c8073a0e63b678c31ebba78ca2867db376c76_GL0.tar.gz) = 2056afe88c01f602a9df5806d94b1a5a279430bc4030be03e48f2de25077fef8
-SIZE (gitlab-org-gitlab-foss-c97c8073a0e63b678c31ebba78ca2867db376c76_GL0.tar.gz) = 95951644
+TIMESTAMP = 1610222178
+SHA256 (gitlab-org-gitlab-foss-1ef3b81f122ba52e955bee694c38d6fb4dae3068_GL0.tar.gz) = 8a58b4a6cc369c5ff014036e1d60e080f174368504f6aa190940f12e5095109a
+SIZE (gitlab-org-gitlab-foss-1ef3b81f122ba52e955bee694c38d6fb4dae3068_GL0.tar.gz) = 95955302

Modified: head/www/gitlab-ce/pkg-plist
==============================================================================
--- head/www/gitlab-ce/pkg-plist	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-ce/pkg-plist	Sat Jan  9 20:32:38 2021	(r560890)
@@ -12035,6 +12035,8 @@
 %%WWWDIR%%/db/migrate/20201214113729_add_custom_mapping_columns_to_http_integrations.rb
 %%WWWDIR%%/db/migrate/20201215084652_delete_mock_deployment_service_records.rb
 %%WWWDIR%%/db/migrate/20201215132151_change_unique_index_on_security_findings.rb
+%%WWWDIR%%/db/migrate/20201217111448_change_pages_deployment_size_to_bigint.rb
+%%WWWDIR%%/db/migrate/20201222151823_update_trusted_apps_to_confidential.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
@@ -12401,6 +12403,7 @@
 %%WWWDIR%%/db/post_migrate/20201130103926_schedule_populate_dismissed_state_for_vulnerabilities.rb
 %%WWWDIR%%/db/post_migrate/20201203123201_remove_orphan_service_hooks.rb
 %%WWWDIR%%/db/post_migrate/20201207151651_truncate_security_findings_table_2.rb
+%%WWWDIR%%/db/post_migrate/20201217112249_change_pages_deployment_size_to_bigint_cleanup.rb
 @(git,,) %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/schema_migrations/20181228175414
 %%WWWDIR%%/db/schema_migrations/20190102152410
@@ -14064,6 +14067,9 @@
 %%WWWDIR%%/db/schema_migrations/20201214113729
 %%WWWDIR%%/db/schema_migrations/20201215084652
 %%WWWDIR%%/db/schema_migrations/20201215132151
+%%WWWDIR%%/db/schema_migrations/20201217111448
+%%WWWDIR%%/db/schema_migrations/20201217112249
+%%WWWDIR%%/db/schema_migrations/20201222151823
 %%WWWDIR%%/db/seeds.rb
 %%WWWDIR%%/db/structure.sql
 %%WWWDIR%%/doc/.vale/gitlab/Acronyms.yml
@@ -30618,6 +30624,7 @@
 %%WWWDIR%%/spec/support/shared_contexts/issuable/merge_request_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/issuable/project_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/json_response_shared_context.rb
+%%WWWDIR%%/spec/support/shared_contexts/lib/container_registry/tags_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/lib/gitlab/git_access_shared_examples.rb
 %%WWWDIR%%/spec/support/shared_contexts/lib/gitlab/import_export/project/rake_task_object_storage_shared_context.rb
 %%WWWDIR%%/spec/support/shared_contexts/lib/gitlab/import_export/relation_tree_restorer_shared_context.rb
@@ -31740,6 +31747,8 @@
 %%WWWDIR%%/workhorse/internal/redis/keywatcher_test.go
 %%WWWDIR%%/workhorse/internal/redis/redis.go
 %%WWWDIR%%/workhorse/internal/redis/redis_test.go
+%%WWWDIR%%/workhorse/internal/rejectmethods/middleware.go
+%%WWWDIR%%/workhorse/internal/rejectmethods/middleware_test.go
 %%WWWDIR%%/workhorse/internal/secret/jwt.go
 %%WWWDIR%%/workhorse/internal/secret/roundtripper.go
 %%WWWDIR%%/workhorse/internal/secret/secret.go

Modified: head/www/gitlab-pages/Makefile
==============================================================================
--- head/www/gitlab-pages/Makefile	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-pages/Makefile	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-pages
-PORTVERSION=	1.32.0
+PORTVERSION=	1.34.0
 CATEGORIES=	www
 
 MAINTAINER=	swills at FreeBSD.org
@@ -17,7 +17,7 @@ USE_GITHUB=	nodefault
 
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
-GL_COMMIT=	21066de52d7f7af759bdf2395694c935110da1bb
+GL_COMMIT=	e4ddf96500cab8587671147848e51da91ff6e300
 
 # Build with: make gomod-vendor
 # 62dd

Modified: head/www/gitlab-pages/distinfo
==============================================================================
--- head/www/gitlab-pages/distinfo	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-pages/distinfo	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1608587130
+TIMESTAMP = 1610139344
 SHA256 (andybalholm-brotli-v1.0.1_GH0.tar.gz) = f14b686896b3bae2782350bbaf2aadfb9c6a4916e54beb28b393e592aa4af48e
 SIZE (andybalholm-brotli-v1.0.1_GH0.tar.gz) = 593298
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
@@ -115,8 +115,8 @@ SHA256 (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 030d
 SIZE (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 3126
 SHA256 (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 0f865bd53c02e7d89115aaa60ce8b8147b1f71238f2cf33a6593465f845703cb
 SIZE (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 2309
-SHA256 (gitlab-org-gitlab-pages-21066de52d7f7af759bdf2395694c935110da1bb_GL0.tar.gz) = d4de7ca7f2210f6b749a2cb618b557df6ddf64746d751ed1cf98613443762748
-SIZE (gitlab-org-gitlab-pages-21066de52d7f7af759bdf2395694c935110da1bb_GL0.tar.gz) = 189287
+SHA256 (gitlab-org-gitlab-pages-e4ddf96500cab8587671147848e51da91ff6e300_GL0.tar.gz) = 66d7020ae67b82f4c43918dfbf07e2addd5a11c532a9c3e6cd31ef2d9fbe1c01
+SIZE (gitlab-org-gitlab-pages-e4ddf96500cab8587671147848e51da91ff6e300_GL0.tar.gz) = 193243
 SHA256 (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 726285dab86f2c912b1bd7c9909d904189c9b890284c10bc1cc19e30a14de917
 SIZE (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 18000
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd

Modified: head/www/gitlab-workhorse/Makefile
==============================================================================
--- head/www/gitlab-workhorse/Makefile	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-workhorse/Makefile	Sat Jan  9 20:32:38 2021	(r560890)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	gitlab-workhorse
-PORTVERSION?=	8.58.0
+PORTVERSION?=	8.58.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?=	2a3bc8abcac36ebb7ec09683edb101c50ef91976
+GL_COMMIT?=	82771e31648f912b1c617f5360a0d5a54041bf34
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/www/gitlab-workhorse/distinfo
==============================================================================
--- head/www/gitlab-workhorse/distinfo	Sat Jan  9 20:06:20 2021	(r560889)
+++ head/www/gitlab-workhorse/distinfo	Sat Jan  9 20:32:38 2021	(r560890)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1608591179
+TIMESTAMP = 1610058478
 SHA256 (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
 SIZE (Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
 SHA256 (Azure-azure-storage-blob-go-v0.10.0_GH0.tar.gz) = e3d4304b9fcb7dc5911d648a236fa69c06cb3b33ffb05ac4be6bf3d69125f71e
@@ -163,8 +163,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-2a3bc8abcac36ebb7ec09683edb101c50ef91976_GL0.tar.gz) = eb5dea511346c65be5887080f6350e490f919653186f283bd8d247e6338a39b9
-SIZE (gitlab-org-gitlab-workhorse-2a3bc8abcac36ebb7ec09683edb101c50ef91976_GL0.tar.gz) = 2465288
+SHA256 (gitlab-org-gitlab-workhorse-82771e31648f912b1c617f5360a0d5a54041bf34_GL0.tar.gz) = 8bf5548dbc67c3f6d91e77c89cd41056e4ea1d754e567de8e5e043c5bc309f4a
+SIZE (gitlab-org-gitlab-workhorse-82771e31648f912b1c617f5360a0d5a54041bf34_GL0.tar.gz) = 2467026
 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 98d3cd87fb3feb8a14b5ac9e4a968e7a841cc3b309f997a2ba78aa8fd0b58c2d
 SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3143193
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd


More information about the svn-ports-head mailing list