From owner-dev-commits-ports-main@freebsd.org Sat Jul 3 06:05:45 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5AA6064BCD1; Sat, 3 Jul 2021 06:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GH1f02H8Jz3n41; Sat, 3 Jul 2021 06:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D19B2224DC; Sat, 3 Jul 2021 06:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16365hvP049361; Sat, 3 Jul 2021 06:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16365hCq049360; Sat, 3 Jul 2021 06:05:43 GMT (envelope-from git) Date: Sat, 3 Jul 2021 06:05:43 GMT Message-Id: <202107030605.16365hCq049360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: a0e1c4944ab9 - main - www/gitlab-ce: Security update to 14.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0e1c4944ab9197944fe505c000d52bf7a644067 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2021 06:05:45 -0000 The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0e1c4944ab9197944fe505c000d52bf7a644067 commit a0e1c4944ab9197944fe505c000d52bf7a644067 Author: Matthias Fechner AuthorDate: 2021-07-03 06:01:38 +0000 Commit: Matthias Fechner CommitDate: 2021-07-03 06:03:25 +0000 www/gitlab-ce: Security update to 14.0.2 Changelog: https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/ Security: 8ba8278d-db06-11eb-ba49-001b217b3468 --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 6 +++--- www/gitlab-ce/Makefile | 10 +++++----- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/files/patch-Gemfile | 11 +---------- www/gitlab-ce/pkg-plist | 1 + www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 6 +++--- 8 files changed, 20 insertions(+), 28 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index c3de4c37e8b7..8a8d0e493604 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 14.0.1 +DISTVERSION= 14.0.2 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= 57b0466e140a3e5b35805e54a769c9da17aab0f1 +GL_COMMIT= 34dc9341390a799d67b5d0dbc7f0adaf5954f672 # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index bbc4b1448907..82a8c81a9d6c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1624861534 +TIMESTAMP = 1625168047 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-57b0466e140a3e5b35805e54a769c9da17aab0f1_GL0.tar.gz) = 169804f8163d40c162d5fef7ac45574329da8862b735ee3e112cb26cf7e03cb0 -SIZE (gitlab-org-gitaly-57b0466e140a3e5b35805e54a769c9da17aab0f1_GL0.tar.gz) = 3525346 +SHA256 (gitlab-org-gitaly-34dc9341390a799d67b5d0dbc7f0adaf5954f672_GL0.tar.gz) = 3fda3d27973493ecdeb581792cbe01b6a63103eafdf32635eb81456dba72e868 +SIZE (gitlab-org-gitaly-34dc9341390a799d67b5d0dbc7f0adaf5954f672_GL0.tar.gz) = 3525490 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 47531a4b071c..b1d84d407ccf 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 14.0.1 +PORTVERSION= 14.0.2 PORTREVISION= 0 CATEGORIES= www devel @@ -20,7 +20,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ gitlab-pages>=1.40.0:www/gitlab-pages \ gitlab-shell>=13.19.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ - redis>=6.0.12:databases/redis \ + redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ @@ -118,7 +118,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \ rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ - rubygem-rdoc>=6.1.2<7:devel/rubygem-rdoc \ + rubygem-gitlab-rdoc>=6.3.2<7:devel/rubygem-gitlab-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ @@ -129,7 +129,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-rouge>=3.26.0<3.27:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ - rubygem-nokogiri>=1.11.3<1.12:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.11.4<1.12:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.3<4:textproc/rubygem-diffy \ @@ -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?= 76b84b42f64b8009cc181d5da0c656a8a521986d +GL_COMMIT?= bac4ee4a9e2bc845fd5c91240cccaa293cb4f847 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 0e383a5a55a5..d0dbe13c500c 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624861336 -SHA256 (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 7d737cd35eebfae49f3a8410ad804c07c867eb657628ecfb345df375569d9498 -SIZE (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 96589328 +TIMESTAMP = 1625167743 +SHA256 (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 0eefdf83ceca8a7072b906b133d0613bda7cc9c6e83f8972cf23df544acc238b +SIZE (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 96591339 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 48a9feda0a84..a34a04d953af 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2021-06-21 15:55:09 UTC +--- Gemfile.orig 2021-07-01 10:22:34 UTC +++ Gemfile @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes @@ -17,15 +17,6 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -157,7 +156,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark - gem 'commonmarker', '~> 0.21' - gem 'kramdown', '~> 2.3.1' - gem 'RedCloth', '~> 4.3.2' --gem 'rdoc', '~> 6.1.2' -+gem 'rdoc', '~> 6.1' - gem 'org-ruby', '~> 0.9.12' - gem 'creole', '~> 0.5.0' - gem 'wikicloth', '0.8.1' @@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1' # and https://github.com/pganalyze/pg_query/pull/213 are # released. gitlab-labkit will need to be updated to use the pg_query diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index 00462adae997..a2ecdbc4cad8 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -6401,6 +6401,7 @@ %%WWWDIR%%/app/graphql/mutations/design_management/move.rb %%WWWDIR%%/app/graphql/mutations/design_management/upload.rb %%WWWDIR%%/app/graphql/mutations/discussions/toggle_resolve.rb +%%WWWDIR%%/app/graphql/mutations/echo.rb %%WWWDIR%%/app/graphql/mutations/environments/canary_ingress/update.rb %%WWWDIR%%/app/graphql/mutations/issues/base.rb %%WWWDIR%%/app/graphql/mutations/issues/common_mutation_arguments.rb diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 7bf0dd5a0f42..60aaf91a0dc2 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME?= gitlab-workhorse -PORTVERSION?= 14.0.1 +PORTVERSION?= 14.0.2 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?= 76b84b42f64b8009cc181d5da0c656a8a521986d +GL_COMMIT?= bac4ee4a9e2bc845fd5c91240cccaa293cb4f847 # for go dependencies USE_GITHUB= nodefault diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index ba371a3450b6..d1adc6985e6e 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1624861362 +TIMESTAMP = 1625168172 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-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 7d737cd35eebfae49f3a8410ad804c07c867eb657628ecfb345df375569d9498 -SIZE (gitlab-org-gitlab-foss-76b84b42f64b8009cc181d5da0c656a8a521986d_GL0.tar.gz) = 96589328 +SHA256 (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 0eefdf83ceca8a7072b906b133d0613bda7cc9c6e83f8972cf23df544acc238b +SIZE (gitlab-org-gitlab-foss-bac4ee4a9e2bc845fd5c91240cccaa293cb4f847_GL0.tar.gz) = 96591339 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