aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2021-07-08 06:48:57 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2021-07-08 06:49:58 +0000
commit8d5ba0cec7367f31aeb9eb25dd8804536b0c1c8e (patch)
tree8e4ae3d9a9e4cf50bf206ef1500c36317b1519eb
parentc7ecdccd9607f5d91df72a90eb65e34f83bf6dfc (diff)
downloadports-8d5ba0cec7367f31aeb9eb25dd8804536b0c1c8e.tar.gz
ports-8d5ba0cec7367f31aeb9eb25dd8804536b0c1c8e.zip
www/gitlab-ce: Security update to 14.0.4
-rw-r--r--devel/gitaly/Makefile4
-rw-r--r--devel/gitaly/distinfo6
-rw-r--r--www/gitlab-ce/Makefile6
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/pkg-plist4
-rw-r--r--www/gitlab-workhorse/Makefile4
-rw-r--r--www/gitlab-workhorse/distinfo6
7 files changed, 20 insertions, 16 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 8a8d0e493604..64f6a0f664eb 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 14.0.2
+DISTVERSION= 14.0.4
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= 34dc9341390a799d67b5d0dbc7f0adaf5954f672
+GL_COMMIT= 75cd3edc7b3f592cf0dd6a75fa00e12aafcd72a3
# for go dependencies
USE_GITHUB= nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 82a8c81a9d6c..e4587a991af7 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1625168047
+TIMESTAMP = 1625723983
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-34dc9341390a799d67b5d0dbc7f0adaf5954f672_GL0.tar.gz) = 3fda3d27973493ecdeb581792cbe01b6a63103eafdf32635eb81456dba72e868
-SIZE (gitlab-org-gitaly-34dc9341390a799d67b5d0dbc7f0adaf5954f672_GL0.tar.gz) = 3525490
+SHA256 (gitlab-org-gitaly-75cd3edc7b3f592cf0dd6a75fa00e12aafcd72a3_GL0.tar.gz) = 68ea36e41e916e33210499279e455c5c8412d7dd965cbd81c8a07112adff30ab
+SIZE (gitlab-org-gitaly-75cd3edc7b3f592cf0dd6a75fa00e12aafcd72a3_GL0.tar.gz) = 3528752
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 c65305ed0902..c74f9791eb03 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= 14.0.2
-PORTREVISION= 2
+PORTVERSION= 14.0.4
+PORTREVISION= 0
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@@ -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?= bac4ee4a9e2bc845fd5c91240cccaa293cb4f847
+GL_COMMIT?= 7fd059d6f16ac5af6572303dd21f3c0eca61ad43
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index d0dbe13c500c..e783b21c952e 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625167743
-SHA256 (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 0eefdf83ceca8a7072b906b133d0613bda7cc9c6e83f8972cf23df544acc238b
-SIZE (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 96591339
+TIMESTAMP = 1625723297
+SHA256 (gitlab-org-gitlab-foss-7fd059d6f16ac5af6572303dd21f3c0eca61ad43_GL0.tar.gz) = 8ea16b4d2dc3540ad96005110c9bc78615adf0536709cc719f39f20c9b91193f
+SIZE (gitlab-org-gitlab-foss-7fd059d6f16ac5af6572303dd21f3c0eca61ad43_GL0.tar.gz) = 96590874
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index a2ecdbc4cad8..c8ea542fdba0 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -11414,6 +11414,7 @@
%%WWWDIR%%/config/feature_flags/development/read_container_registry_access_level.yml
%%WWWDIR%%/config/feature_flags/development/real_time_issue_sidebar.yml
%%WWWDIR%%/config/feature_flags/development/rebalance_issues.yml
+%%WWWDIR%%/config/feature_flags/development/recursive_approach_for_all_projects.yml
%%WWWDIR%%/config/feature_flags/development/redirect_to_latest_template_jobs_browser_performance_testing.yml
%%WWWDIR%%/config/feature_flags/development/redirect_to_latest_template_security_api_fuzzing.yml
%%WWWDIR%%/config/feature_flags/development/redirect_to_latest_template_security_dast.yml
@@ -32220,6 +32221,8 @@
%%WWWDIR%%/spec/lib/gitlab/lets_encrypt_spec.rb
%%WWWDIR%%/spec/lib/gitlab/lfs/client_spec.rb
%%WWWDIR%%/spec/lib/gitlab/lfs_token_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/local_and_remote_storage_migration/artifact_migrater_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/local_and_remote_storage_migration/pages_deployment_migrater_spec.rb
%%WWWDIR%%/spec/lib/gitlab/log_timestamp_formatter_spec.rb
%%WWWDIR%%/spec/lib/gitlab/logging/cloudflare_helper_spec.rb
%%WWWDIR%%/spec/lib/gitlab/lograge/custom_options_spec.rb
@@ -35662,6 +35665,7 @@
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/jwt_token_shared_examples.rb
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/ldap_shared_examples.rb
+%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/local_and_remote_storage_migration_shared_examples.rb
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/malicious_regexp_shared_examples.rb
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/middleware/multipart_shared_examples.rb
%%WWWDIR%%/spec/support/shared_examples/lib/gitlab/middleware/read_only_gitlab_instance_shared_examples.rb
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 60aaf91a0dc2..17e92e4a7552 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.2
+PORTVERSION?= 14.0.4
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?= bac4ee4a9e2bc845fd5c91240cccaa293cb4f847
+GL_COMMIT?= 7fd059d6f16ac5af6572303dd21f3c0eca61ad43
# for go dependencies
USE_GITHUB= nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index d1adc6985e6e..3ff10ca15a18 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1625168172
+TIMESTAMP = 1625723318
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-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 0eefdf83ceca8a7072b906b133d0613bda7cc9c6e83f8972cf23df544acc238b
-SIZE (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 96591339
+SHA256 (gitlab-org-gitlab-foss-7fd059d6f16ac5af6572303dd21f3c0eca61ad43_GL0.tar.gz) = 8ea16b4d2dc3540ad96005110c9bc78615adf0536709cc719f39f20c9b91193f
+SIZE (gitlab-org-gitlab-foss-7fd059d6f16ac5af6572303dd21f3c0eca61ad43_GL0.tar.gz) = 96590874
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