Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Aug 2021 21:20:26 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: 4edd9ea5d5ce - main - www/gitlab-ce: Security update to 14.2.2
Message-ID:  <202108312120.17VLKQ7O059215@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=4edd9ea5d5ced64dbefab85fab25db83f914968f

commit 4edd9ea5d5ced64dbefab85fab25db83f914968f
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-08-31 21:10:27 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-08-31 21:20:15 +0000

    www/gitlab-ce: Security update to 14.2.2
    
    Changelog:
    https://about.gitlab.com/releases/2021/08/31/security-release-gitlab-14-2-2-released/
    
    Security:       6c22bb39-0a9a-11ec-a265-001b217b3468
---
 devel/gitaly/Makefile                 |  6 +++---
 devel/gitaly/distinfo                 |  6 +++---
 devel/gitaly/files/patch-ruby_Gemfile | 13 ++++++++++---
 www/gitlab-ce/Makefile                |  6 +++---
 www/gitlab-ce/distinfo                |  6 +++---
 www/gitlab-ce/files/patch-Gemfile     |  4 ++--
 www/gitlab-workhorse/Makefile         |  4 ++--
 www/gitlab-workhorse/distinfo         |  6 +++---
 8 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index dadfdfcb7b30..2af80f61d749 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.2.1
+DISTVERSION=	14.2.2
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -19,7 +19,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 		rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.38.0<2:net/rubygem-grpc \
+		rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
 		rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
 		rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
 		rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
@@ -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=	b01470ef32862f7ef17384b646fc8085e4947988
+GL_COMMIT=	94000ca352ea7d2c730cd913e7365690463a61b6
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index e82ab4a039b3..cc97bab87a64 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1630396879
+TIMESTAMP = 1630441867
 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-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -221,8 +221,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-b01470ef32862f7ef17384b646fc8085e4947988_GL0.tar.gz) = 4d2ad37a974fca7f8aa70508a8fca7eb72ec14d32552d4eb7110baa2debe2ccd
-SIZE (gitlab-org-gitaly-b01470ef32862f7ef17384b646fc8085e4947988_GL0.tar.gz) = 3625470
+SHA256 (gitlab-org-gitaly-94000ca352ea7d2c730cd913e7365690463a61b6_GL0.tar.gz) = b28150d856f186bb80a3e0f7b9275fd2032e346f232d17b588665217cf6b2c8f
+SIZE (gitlab-org-gitaly-94000ca352ea7d2c730cd913e7365690463a61b6_GL0.tar.gz) = 3625321
 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
 SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 34ca5d35e771..2e700525ffc0 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,13 @@
---- ruby/Gemfile.orig	2021-08-23 16:25:31 UTC
+--- ruby/Gemfile.orig	2021-08-31 13:54:28 UTC
 +++ ruby/Gemfile
-@@ -13,21 +13,10 @@ gem 'faraday', '~> 1.0'
+@@ -7,27 +7,16 @@ gem 'activesupport', '~> 6.1.3.2'
+ gem 'rdoc', '~> 6.0'
+ gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
+ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
+-gem 'grpc', '~> 1.30.2'
++gem 'grpc', '~> 1.30'
+ gem 'sentry-raven', '~> 3.0', require: false
+ gem 'faraday', '~> 1.0'
  gem 'rbtrace', require: false
  
  # Labkit provides observability functionality
@@ -21,6 +28,6 @@
 -  gem 'factory_bot', require: false
 -  gem 'pry', '~> 0.12.2', require: false
 -
--  gem 'grpc-tools', '= 1.38.0'
+-  gem 'grpc-tools', '= 1.30.2'
 -end
 +gem 'google-protobuf', '~> 3.17.3'
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 02d9adec7fd6..b397f1158399 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.2.1
+PORTVERSION=	14.2.2
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -84,7 +84,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \
 	rubygem-graphql>=1.11.8<1.12:devel/rubygem-graphql \
 	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
-	rubygem-apollo_upload_server>=2.0.2<2.1:net/rubygem-apollo_upload_server \
+	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.4.0<0.5:devel/rubygem-graphlient \
 	rubygem-hashie>=4.1.0:devel/rubygem-hashie \
@@ -270,7 +270,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=	2da7c8579601c14a93d4291b8cf5fa39c6eeabd8
+GL_COMMIT=	8d08c6cbe51a88fbdc5065aba6e459768e98e63b
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 2a2c4529edfd..1d395ec50020 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630394518
-SHA256 (gitlab-org-gitlab-foss-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 1c1e4112c79271612ad093f4ca59fc9a60f606be45013724e465d1ab394de326
-SIZE (gitlab-org-gitlab-foss-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 94809131
+TIMESTAMP = 1630441634
+SHA256 (gitlab-org-gitlab-foss-8d08c6cbe51a88fbdc5065aba6e459768e98e63b_GL0.tar.gz) = 43ae952fc8ba070ec18f24e6a6b00c07ade8f3e4a5b5016e1a511c1a1b5a5414
+SIZE (gitlab-org-gitlab-foss-8d08c6cbe51a88fbdc5065aba6e459768e98e63b_GL0.tar.gz) = 94812882
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index c3b55831d7e6..a943c286e3d3 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2021-08-23 16:27:44 UTC
+--- Gemfile.orig	2021-08-31 13:57: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
@@ -12,7 +12,7 @@
 @@ -102,7 +102,6 @@ gem 'graphql', '~> 1.11.8'
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4.10'
- gem 'apollo_upload_server', '~> 2.0.2'
+ gem 'apollo_upload_server', '~> 2.1.0'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 93e6bdbae1da..651d09dd4f95 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.2.1
+PORTVERSION=	14.2.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=	2da7c8579601c14a93d4291b8cf5fa39c6eeabd8
+GL_COMMIT=	8d08c6cbe51a88fbdc5065aba6e459768e98e63b
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 4ae877a40083..d74a28ab16eb 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1630396010
+TIMESTAMP = 1630441659
 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
@@ -203,8 +203,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-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 1c1e4112c79271612ad093f4ca59fc9a60f606be45013724e465d1ab394de326
-SIZE (gitlab-org-gitlab-foss-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8_GL0.tar.gz) = 94809131
+SHA256 (gitlab-org-gitlab-foss-8d08c6cbe51a88fbdc5065aba6e459768e98e63b_GL0.tar.gz) = 43ae952fc8ba070ec18f24e6a6b00c07ade8f3e4a5b5016e1a511c1a1b5a5414
+SIZE (gitlab-org-gitlab-foss-8d08c6cbe51a88fbdc5065aba6e459768e98e63b_GL0.tar.gz) = 94812882
 SHA256 (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 31a6c86d809082126e11e98e050749932861297a3d21c8e4756b5618e06ac9fd
 SIZE (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 3465551
 SHA256 (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = c957c444298dd0f9ade07cb643d03e455dcc28d24bd203ead8d241bf50c6df57



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