Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jul 2021 06:05:40 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: e98b6d8455a8 - main - www/gitlab-ce: Patch update to 14.0.1.
Message-ID:  <202107030605.16365eEu049288@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=e98b6d8455a815d1bd6099e58a727b1cc24ee083

commit e98b6d8455a815d1bd6099e58a727b1cc24ee083
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-06-28 06:38:32 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-07-03 06:03:23 +0000

    www/gitlab-ce: Patch update to 14.0.1.
    
    Changelog:
    https://about.gitlab.com/releases/2021/06/24/gitlab-14-0-1-released/
---
 devel/gitaly/Makefile         |  5 +++--
 devel/gitaly/distinfo         |  6 +++---
 www/gitlab-ce/Makefile        |  6 +++---
 www/gitlab-ce/distinfo        |  6 +++---
 www/gitlab-ce/pkg-plist       | 15 ++++++---------
 www/gitlab-workhorse/Makefile |  5 ++---
 www/gitlab-workhorse/distinfo |  6 +++---
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 709310a3a191..c3de4c37e8b7 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.0.0
+DISTVERSION=	14.0.1
 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=	48a15899b20abb635e95707a6dd10b3fa9cdddf1
+GL_COMMIT=	57b0466e140a3e5b35805e54a769c9da17aab0f1
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -161,3 +161,4 @@ do-install:
 	cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
 
 .include <bsd.port.mk>
+
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 232b2c532550..bbc4b1448907 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1624340765
+TIMESTAMP = 1624861534
 SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a59979255de116686479816a80ff067531f141dc
 SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175
 SHA256 (DataDog-dd-trace-go-v1.30.0_GH0.tar.gz) = a739f6c2c20cfa8ffe427451c9eeea3b369fd7bf1334507eef2b8d60088974a2
@@ -185,8 +185,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5
 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitaly-48a15899b20abb635e95707a6dd10b3fa9cdddf1_GL0.tar.gz) = de2306900efa4a7af4d46ac78e465cac5dabdba35306881e19299d1615d67919
-SIZE (gitlab-org-gitaly-48a15899b20abb635e95707a6dd10b3fa9cdddf1_GL0.tar.gz) = 3525422
+SHA256 (gitlab-org-gitaly-57b0466e140a3e5b35805e54a769c9da17aab0f1_GL0.tar.gz) = 169804f8163d40c162d5fef7ac45574329da8862b735ee3e112cb26cf7e03cb0
+SIZE (gitlab-org-gitaly-57b0466e140a3e5b35805e54a769c9da17aab0f1_GL0.tar.gz) = 3525346
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
 SHA256 (gitlab-org-labkit-bdc29f9e957c46d7b0a4747a4662879c7189bf08_GL0.tar.gz) = 89f9ff3689f9338379e62abda71c678e6ff1a65f7d67392c284941678dc90c7e
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 4750022e6f5a..47531a4b071c 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=	14.0.0
+PORTVERSION=	14.0.1
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # which makes maintaining this long list much easier!
 MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
-	gitlab-agent>=14.0.0:net/gitlab-agent \
+	gitlab-agent>=14.0.1:net/gitlab-agent \
 	gitlab-elasticsearch-indexer>=2.12.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-pages>=1.40.0:www/gitlab-pages \
 	gitlab-shell>=13.19.0:devel/gitlab-shell \
@@ -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?=	f1926d2aa6447173a06fee5e0a3141bea27a0d8d
+GL_COMMIT?=	76b84b42f64b8009cc181d5da0c656a8a521986d
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index aeedbb130f0e..0e383a5a55a5 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624340831
-SHA256 (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 2275f7d6bbe66189a2a7531a9feb435661a868a5cc05e002ca11df33ce942563
-SIZE (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 96810736
+TIMESTAMP = 1624861336
+SHA256 (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 7d737cd35eebfae49f3a8410ad804c07c867eb657628ecfb345df375569d9498
+SIZE (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 96589328
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index a859b698b72b..00462adae997 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -13098,6 +13098,7 @@
 %%WWWDIR%%/data/whats_new/202103220001_13_10.yml
 %%WWWDIR%%/data/whats_new/202104220001_13_11.yml
 %%WWWDIR%%/data/whats_new/202105220001_13_12.yml
+%%WWWDIR%%/data/whats_new/202106220001_14_0.yml
 %%WWWDIR%%/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
 %%WWWDIR%%/db/fixtures/development/01_admin.rb
 %%WWWDIR%%/db/fixtures/development/02_application_settings.rb
@@ -17600,11 +17601,9 @@
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/background_verification.md
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/bring_primary_back.md
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png
-%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-projects.png
-%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/replication-status.png
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/img/reverification-interval.png
-%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/verification-status-primary.png
-%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/verification-status-secondary.png
+%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/verification_status_primary_v14_0.png
+%%WWWDIR%%/doc/administration/geo/disaster_recovery/img/verification_status_secondary_v14_0.png
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/index.md
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/planned_failover.md
 %%WWWDIR%%/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
@@ -17620,7 +17619,8 @@
 %%WWWDIR%%/doc/administration/geo/replication/img/adding_a_secondary_node_v13_3.png
 %%WWWDIR%%/doc/administration/geo/replication/img/geo-ha-diagram.png
 %%WWWDIR%%/doc/administration/geo/replication/img/geo_architecture.png
-%%WWWDIR%%/doc/administration/geo/replication/img/geo_node_dashboard.png
+%%WWWDIR%%/doc/administration/geo/replication/img/geo_node_dashboard_v14_0.png
+%%WWWDIR%%/doc/administration/geo/replication/img/geo_node_health_v14_0.png
 %%WWWDIR%%/doc/administration/geo/replication/img/geo_overview.png
 %%WWWDIR%%/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png
 %%WWWDIR%%/doc/administration/geo/replication/img/single_git_add_traffic_policy_endpoints.png
@@ -17658,7 +17658,6 @@
 %%WWWDIR%%/doc/administration/gitaly/reference.md
 %%WWWDIR%%/doc/administration/housekeeping.md
 %%WWWDIR%%/doc/administration/img/audit_log_v13_6.png
-%%WWWDIR%%/doc/administration/img/auditor_access_form.png
 %%WWWDIR%%/doc/administration/img/custom_hooks_error_msg.png
 %%WWWDIR%%/doc/administration/img/db_load_balancing_postgres_stats.png
 %%WWWDIR%%/doc/administration/img/impersonated_audit_events_v13_8.png
@@ -17716,8 +17715,6 @@
 %%WWWDIR%%/doc/administration/operations/extra_sidekiq_routing.md
 %%WWWDIR%%/doc/administration/operations/fast_ssh_key_lookup.md
 %%WWWDIR%%/doc/administration/operations/filesystem_benchmarking.md
-%%WWWDIR%%/doc/administration/operations/img/sidekiq-cluster.png
-%%WWWDIR%%/doc/administration/operations/img/write_to_authorized_keys_setting.png
 %%WWWDIR%%/doc/administration/operations/index.md
 %%WWWDIR%%/doc/administration/operations/moving_repositories.md
 %%WWWDIR%%/doc/administration/operations/puma.md
@@ -20013,7 +20010,6 @@
 %%WWWDIR%%/generator_templates/rails/post_deployment_migration/migration.rb
 %%WWWDIR%%/generator_templates/snowplow_event_definition/event_definition.yml
 %%WWWDIR%%/generator_templates/usage_metric_definition/metric_definition.yml
-%%WWWDIR%%/geo_architecture.png
 %%WWWDIR%%/haml_lint/inline_javascript.rb
 %%WWWDIR%%/haml_lint/linter/documentation_links.rb
 %%WWWDIR%%/haml_lint/linter/no_plain_nodes.rb
@@ -21397,6 +21393,7 @@
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Deploy/EC2.gitlab-ci.yml
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml
+%%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Helm-2to3.gitlab-ci.yml
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/SAST.gitlab-ci.yml
 %%WWWDIR%%/lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 173e5c77ee4d..7bf0dd5a0f42 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?=	14.0.0
+PORTVERSION?=	14.0.1
 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?=	f1926d2aa6447173a06fee5e0a3141bea27a0d8d
+GL_COMMIT?=	76b84b42f64b8009cc181d5da0c656a8a521986d
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -158,4 +158,3 @@ post-install:
 
 .include <bsd.port.mk>
 
-
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index b9d13ece315c..ba371a3450b6 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1624341256
+TIMESTAMP = 1624861362
 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
@@ -195,8 +195,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5
 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 2275f7d6bbe66189a2a7531a9feb435661a868a5cc05e002ca11df33ce942563
-SIZE (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 96810736
+SHA256 (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 7d737cd35eebfae49f3a8410ad804c07c867eb657628ecfb345df375569d9498
+SIZE (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 96589328
 SHA256 (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 31a6c86d809082126e11e98e050749932861297a3d21c8e4756b5618e06ac9fd
 SIZE (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 3465551
 SHA256 (gitlab-org-labkit-bdc29f9e957c46d7b0a4747a4662879c7189bf08_GL0.tar.gz) = 89f9ff3689f9338379e62abda71c678e6ff1a65f7d67392c284941678dc90c7e



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