From 967c19b3e083a2ed6bf3e54a9a18aba162d5bed6 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Wed, 18 Nov 2020 20:26:12 +0000 Subject: [PATCH] Bugfix release to 13.5.4. Changelog: https://about.gitlab.com/releases/2020/11/13/gitlab-13-5-4-released/ --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 6 +++--- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/pkg-plist | 3 +++ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 155425f2514b..821e23b1675a 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.5.3 +DISTVERSION= 13.5.4 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= 25d0a454172ea432033ac266cb2fda1bc0785eba +GL_COMMIT= 17bea8a2e504e3ef94101fe8c9356c7e406c988e # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index ba67767d5e9d..66fd5c5c9ed9 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1605003635 +TIMESTAMP = 1605706287 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 @@ -139,8 +139,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-25d0a454172ea432033ac266cb2fda1bc0785eba_GL0.tar.gz) = 0260d94a26c38a20f6beb4345d37431f7f591a61bfaddf265354b17398242d08 -SIZE (gitlab-org-gitaly-25d0a454172ea432033ac266cb2fda1bc0785eba_GL0.tar.gz) = 3192478 +SHA256 (gitlab-org-gitaly-17bea8a2e504e3ef94101fe8c9356c7e406c988e_GL0.tar.gz) = 4b2d32f14f66ef2e71ab67b890bd9089aa3e6369ef9397dd1f04a7f194f0c497 +SIZE (gitlab-org-gitaly-17bea8a2e504e3ef94101fe8c9356c7e406c988e_GL0.tar.gz) = 3192541 SHA256 (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 1e12b1d55928131ac24d9eae147b98c871f9a9139da5dd8011ce27e42c3083a1 SIZE (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 82494 SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 0e0e07f02c9b..2de879886930 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= gitlab-ce -PORTVERSION?= 13.5.3 -PORTREVISION?= 1 +PORTVERSION?= 13.5.4 +PORTREVISION?= 0 CATEGORIES= www devel MAINTAINER?= mfechner@FreeBSD.org @@ -264,7 +264,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?= eaa194f15e614301d6a513b493bf7b17af65c58d +GL_COMMIT?= 7f5f940041c8d1ee074be96cc64bdccdd95649b1 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 0a5f93c7c904..012a6ad65d4c 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1605003514 -SHA256 (gitlab-org-gitlab-foss-eaa194f15e614301d6a513b493bf7b17af65c58d_GL0.tar.gz) = d931e84d59c2c50afd672c874795f8029c39698624aaa59d26be79edfee704e8 -SIZE (gitlab-org-gitlab-foss-eaa194f15e614301d6a513b493bf7b17af65c58d_GL0.tar.gz) = 107699902 +TIMESTAMP = 1605706339 +SHA256 (gitlab-org-gitlab-foss-7f5f940041c8d1ee074be96cc64bdccdd95649b1_GL0.tar.gz) = 4f4decb41f11313880b203addcd319225405dc2a246d375f670df4cb9471911b +SIZE (gitlab-org-gitlab-foss-7f5f940041c8d1ee074be96cc64bdccdd95649b1_GL0.tar.gz) = 107695184 diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index 1a6f4541877b..42996dfd0041 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -11714,6 +11714,7 @@ %%WWWDIR%%/db/post_migrate/20201014142521_schedule_sync_blocking_issues_count.rb %%WWWDIR%%/db/post_migrate/20201015073808_schedule_blocked_by_links_replacement.rb %%WWWDIR%%/db/post_migrate/20201015154527_add_index_on_services_for_usage_data.rb +%%WWWDIR%%/db/post_migrate/20201104124300_ensure_namespace_settings_creation.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/schema_migrations/20181228175414 %%WWWDIR%%/db/schema_migrations/20190102152410 @@ -13172,6 +13173,7 @@ %%WWWDIR%%/db/schema_migrations/20201014205300 %%WWWDIR%%/db/schema_migrations/20201015073808 %%WWWDIR%%/db/schema_migrations/20201015154527 +%%WWWDIR%%/db/schema_migrations/20201104124300 %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/db/structure.sql %%WWWDIR%%/doc/.vale/gitlab/Acronyms.yml @@ -26900,6 +26902,7 @@ %%WWWDIR%%/spec/migrations/enqueue_reset_merge_status_spec.rb %%WWWDIR%%/spec/migrations/ensure_filled_external_diff_store_on_merge_request_diffs_spec.rb %%WWWDIR%%/spec/migrations/ensure_filled_file_store_on_package_files_spec.rb +%%WWWDIR%%/spec/migrations/ensure_namespace_settings_creation_spec.rb %%WWWDIR%%/spec/migrations/ensure_target_project_id_is_filled_spec.rb %%WWWDIR%%/spec/migrations/fill_file_store_ci_job_artifacts_spec.rb %%WWWDIR%%/spec/migrations/fill_file_store_lfs_objects_spec.rb