Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Oct 2020 07:52:30 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r551751 - in head: devel/gitaly devel/gitaly/files net/rubygem-gitlab-fog-azure-rm www/gitlab-ce www/gitlab-ce/files
Message-ID:  <202010090752.0997qUL7069190@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Fri Oct  9 07:52:29 2020
New Revision: 551751
URL: https://svnweb.freebsd.org/changeset/ports/551751

Log:
  Bugfix update of www/gitlab-ce to 13.4.3.

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/devel/gitaly/files/patch-ruby_Gemfile
  head/net/rubygem-gitlab-fog-azure-rm/Makefile
  head/net/rubygem-gitlab-fog-azure-rm/distinfo
  head/www/gitlab-ce/Makefile
  head/www/gitlab-ce/distinfo
  head/www/gitlab-ce/files/patch-Gemfile

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/devel/gitaly/Makefile	Fri Oct  9 07:52:29 2020	(r551751)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	13.4.2
-PORTREVISION=	1
+DISTVERSION=	13.4.3
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -21,13 +21,13 @@ MY_DEPENDS=	git>=2.28:devel/git \
 		rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.9<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \
+		rubygem-grpc>=1.30.2<1.31: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 \
 		rubygem-gitlab-labkit>=0.12.1<0.13:devel/rubygem-gitlab-labkit \
 		rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
-		rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
+		rubygem-google-protobuf>=3.12.0<4:devel/rubygem-google-protobuf
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		bash>0:shells/bash \
 		${MY_DEPENDS}
@@ -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=	60a08d8121b1019ee7868a9d8e22e6f3d98233ad
+GL_COMMIT=	1719d651e68fb4ed5ac6836dc5410f621f4465c1
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/devel/gitaly/distinfo	Fri Oct  9 07:52:29 2020	(r551751)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1601965152
+TIMESTAMP = 1602228260
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -101,8 +101,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b
 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-60a08d8121b1019ee7868a9d8e22e6f3d98233ad_GL0.tar.gz) = 258d379d5382e49b7a8ccdf9f2f7b6c70727b1fa12f445130fde3a1188006c99
-SIZE (gitlab-org-gitaly-60a08d8121b1019ee7868a9d8e22e6f3d98233ad_GL0.tar.gz) = 3134465
+SHA256 (gitlab-org-gitaly-1719d651e68fb4ed5ac6836dc5410f621f4465c1_GL0.tar.gz) = 3e9806d213e2dd316cbd68695cd0ad0cf011e1b85af8155e1ff6d6bed3c07d76
+SIZE (gitlab-org-gitaly-1719d651e68fb4ed5ac6836dc5410f621f4465c1_GL0.tar.gz) = 3134466
 SHA256 (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = f2cf085e3ce5f5b36efe70270a523c30eac56b61443d61786130082a136457e6
 SIZE (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = 82364
 SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011

Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/devel/gitaly/files/patch-ruby_Gemfile	Fri Oct  9 07:52:29 2020	(r551751)
@@ -1,6 +1,6 @@
---- ruby/Gemfile.orig	2020-09-21 16:21:08 UTC
+--- ruby/Gemfile.orig	2020-10-01 12:46:36 UTC
 +++ ruby/Gemfile
-@@ -3,14 +3,14 @@ source 'https://rubygems.org'
+@@ -3,7 +3,7 @@ source 'https://rubygems.org'
  # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
  gem 'bundler', '>= 1.17.3'
  
@@ -9,20 +9,9 @@
  gem 'github-linguist', '~> 7.9', require: 'linguist'
  gem 'gitlab-markup', '~> 1.7.1'
  gem 'activesupport', '~> 6.0.3.1'
- gem 'rdoc', '~> 6.0'
- gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
- gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.24.0'
- gem 'sentry-raven', '~> 3.0', require: false
- gem 'faraday', '~> 1.0'
- gem 'rbtrace', require: false
-@@ -22,21 +22,5 @@ gem 'gitlab-labkit', '~> 0.12.0'
- # This version needs to be in sync with GitLab CE/EE
- gem 'licensee', '~> 8.9.0'
+@@ -24,19 +24,3 @@ gem 'licensee', '~> 8.9.0'
  
--gem 'google-protobuf', '~> 3.12'
-+gem 'google-protobuf', '~> 3.8.0'
+ gem 'google-protobuf', '~> 3.12'
  
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false

Modified: head/net/rubygem-gitlab-fog-azure-rm/Makefile
==============================================================================
--- head/net/rubygem-gitlab-fog-azure-rm/Makefile	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/net/rubygem-gitlab-fog-azure-rm/Makefile	Fri Oct  9 07:52:29 2020	(r551751)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-fog-azure-rm
-PORTVERSION=	0.9.0
+PORTVERSION=	1.0.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 

Modified: head/net/rubygem-gitlab-fog-azure-rm/distinfo
==============================================================================
--- head/net/rubygem-gitlab-fog-azure-rm/distinfo	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/net/rubygem-gitlab-fog-azure-rm/distinfo	Fri Oct  9 07:52:29 2020	(r551751)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600783788
-SHA256 (rubygem/gitlab-fog-azure-rm-0.9.0.gem) = 43fe76190f19e2b8dad18cf6d6ab1985cf3df9c8217a94ce542a877f6c7a9f80
-SIZE (rubygem/gitlab-fog-azure-rm-0.9.0.gem) = 61952
+TIMESTAMP = 1602228045
+SHA256 (rubygem/gitlab-fog-azure-rm-1.0.0.gem) = 2fde24fd62c133c68b833a587d6870c8212bfc172c1e5c444418e7bd81be8712
+SIZE (rubygem/gitlab-fog-azure-rm-1.0.0.gem) = 60928

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/www/gitlab-ce/Makefile	Fri Oct  9 07:52:29 2020	(r551751)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	gitlab-ce
-PORTVERSION?=	13.4.2
-PORTREVISION?=	1
+PORTVERSION?=	13.4.3
+PORTREVISION?=	0
 CATEGORIES=	www devel
 
 MAINTAINER?=	mfechner@FreeBSD.org
@@ -95,7 +95,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
 	rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
 	rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \
-	rubygem-gitlab-fog-azure-rm>=0.9<1:net/rubygem-gitlab-fog-azure-rm \
+	rubygem-gitlab-fog-azure-rm>=1.0<2:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \
 	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
@@ -218,8 +218,8 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
 	rubygem-gitaly>=13.3.0.p.r1<13.4.0:net/rubygem-gitaly \
-	rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \
-	rubygem-google-protobuf38>=3.8.:devel/rubygem-google-protobuf38 \
+	rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
+	rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
 	rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \
 	rubygem-flipper-active_record017>=0.17.1<0.18.0:databases/rubygem-flipper-active_record017 \
@@ -262,7 +262,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?=	b08b36dccc3857641fe4e170b11c30cfb47c49e1
+GL_COMMIT?=	6689552c4793623a9d47986328a0379ab215f9bc
 
 USERS=	git
 GROUPS=	git

Modified: head/www/gitlab-ce/distinfo
==============================================================================
--- head/www/gitlab-ce/distinfo	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/www/gitlab-ce/distinfo	Fri Oct  9 07:52:29 2020	(r551751)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601623891
-SHA256 (gitlab-org-gitlab-foss-b08b36dccc3857641fe4e170b11c30cfb47c49e1_GL0.tar.gz) = 5d95be61ce633e474633a461c9944a6700ac92c0874d50099748cfcbe03ab70d
-SIZE (gitlab-org-gitlab-foss-b08b36dccc3857641fe4e170b11c30cfb47c49e1_GL0.tar.gz) = 101210634
+TIMESTAMP = 1602228056
+SHA256 (gitlab-org-gitlab-foss-6689552c4793623a9d47986328a0379ab215f9bc_GL0.tar.gz) = 700770d480da2b2ebfff01aeca946e8c3a27667821c9e89a782028131da6f4e2
+SIZE (gitlab-org-gitlab-foss-6689552c4793623a9d47986328a0379ab215f9bc_GL0.tar.gz) = 101208401

Modified: head/www/gitlab-ce/files/patch-Gemfile
==============================================================================
--- head/www/gitlab-ce/files/patch-Gemfile	Fri Oct  9 07:49:59 2020	(r551750)
+++ head/www/gitlab-ce/files/patch-Gemfile	Fri Oct  9 07:52:29 2020	(r551751)
@@ -35,10 +35,12 @@
  
  # Jira integration
  gem 'jira-ruby', '~> 2.0.0'
-@@ -334,94 +333,6 @@ group :metrics do
+@@ -332,94 +331,6 @@ group :metrics do
+   # Prometheus
+   gem 'prometheus-client-mmap', '~> 0.11.0'
    gem 'raindrops', '~> 0.18'
- end
- 
+-end
+-
 -group :development do
 -  gem 'brakeman', '~> 4.2', require: false
 -  gem 'danger', '~> 8.0', require: false
@@ -125,20 +127,6 @@
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
--end
--
- gem 'octokit', '~> 4.15'
+ end
  
- # https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -463,9 +374,9 @@ end
- # Gitaly GRPC protocol definitions
- gem 'gitaly', '~> 13.3.0-rc1'
- 
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.24.0'
- 
--gem 'google-protobuf', '~> 3.12'
-+gem 'google-protobuf', '~> 3.8'
- 
- gem 'toml-rb', '~> 1.0.0'
- 
+ gem 'octokit', '~> 4.15'



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