svn commit: r502879 - in head/devel/gitaly: . files

[Matthias Fechner]

Author: mfechner
Date: Tue May 28 10:42:23 2019
New Revision: 502879
URL: https://svnweb.freebsd.org/changeset/ports/502879

Log:
  Upgrade to 1.42.0 which is required by gitlab-ce 11.11 upgrade.

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/devel/gitaly/files/patch-ruby_Gemfile
  head/devel/gitaly/pkg-plist

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Tue May 28 10:41:39 2019	(r502878)
+++ head/devel/gitaly/Makefile	Tue May 28 10:42:23 2019	(r502879)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.34.1
+DISTVERSION=	1.42.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -13,21 +13,21 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.21:devel/git \
-		rubygem-bundler>=1.16.5:sysutils/rubygem-bundler \
+		rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
 		rubygem-rugged>=0.28.0:devel/rubygem-rugged \
 		rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \
 		rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \
-		rubygem-gitaly-proto>=1.22.0:net/rubygem-gitaly-proto \
-		rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \
+		rubygem-activesupport5>=5.1.7:devel/rubygem-activesupport5 \
+		rubygem-gitaly-proto>=1.27.0:net/rubygem-gitaly-proto \
 		rubygem-rdoc>=6.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.15.0:net/rubygem-grpc \
+		rubygem-grpc>=1.19.0:net/rubygem-grpc \
 		rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \
 		rubygem-faraday>=0.12:www/rubygem-faraday \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
 		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
-		rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf
+		rubygem-google-protobuf>=3.7.1:devel/rubygem-google-protobuf
 BUILD_DEPENDS=	go>=1.11:lang/go \
 		gem:devel/ruby-gems \
 		${MY_DEPENDS}
@@ -40,7 +40,7 @@ USE_RUBY=	yes
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	eecc26aa64353daa3d38077251f92dbe77c35c16
+GL_COMMIT=	6f8f5ae53799e8275ed1f83a99cdaa96467125b2
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Tue May 28 10:41:39 2019	(r502878)
+++ head/devel/gitaly/distinfo	Tue May 28 10:42:23 2019	(r502879)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556571177
-SHA256 (gitlab-org-gitaly-eecc26aa64353daa3d38077251f92dbe77c35c16_GL0.tar.gz) = b3488da6f1c9d49b000becc2249887c908b136e9004ece042186f8e121a87bdf
-SIZE (gitlab-org-gitaly-eecc26aa64353daa3d38077251f92dbe77c35c16_GL0.tar.gz) = 8257429
+TIMESTAMP = 1558384783
+SHA256 (gitlab-org-gitaly-6f8f5ae53799e8275ed1f83a99cdaa96467125b2_GL0.tar.gz) = 6a513f47ca530d866a26279d015faa2c49877c61f442b1d132bce122d1d1cf63
+SIZE (gitlab-org-gitaly-6f8f5ae53799e8275ed1f83a99cdaa96467125b2_GL0.tar.gz) = 8282676

Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile	Tue May 28 10:41:39 2019	(r502878)
+++ head/devel/gitaly/files/patch-ruby_Gemfile	Tue May 28 10:42:23 2019	(r502879)
@@ -1,20 +1,20 @@
---- ruby/Gemfile.orig	2019-04-05 16:17:09 UTC
+--- ruby/Gemfile.orig	2019-05-06 14:54:47 UTC
 +++ ruby/Gemfile
 @@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist'
  gem 'gitlab-markup', '~> 1.7.0'
- gem 'gitaly-proto', '~> 1.19.0'
- gem 'activesupport', '~> 5.0.2'
+ gem 'activesupport', '~> 5.1.7'
+ gem 'gitaly-proto', '~> 1.27.0'
 -gem 'rdoc', '~> 4.2'
 +gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
- gem 'grpc', '~> 1.15.0'
+ gem 'grpc', '~> 1.19.0'
 @@ -22,17 +22,3 @@ gem 'licensee', '~> 8.9.0'
  
- gem 'google-protobuf', '~> 3.6'
+ gem 'google-protobuf', '~> 3.7.1'
  
 -group :development, :test do
--  gem 'rubocop', '~> 0.50', require: false
+-  gem 'rubocop', '~> 0.68', require: false
 -  gem 'rspec', require: false
 -  gem 'rspec-parameterized', require: false
 -  gem 'timecop', require: false

Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist	Tue May 28 10:41:39 2019	(r502878)
+++ head/devel/gitaly/pkg-plist	Tue May 28 10:42:23 2019	(r502879)
@@ -116,6 +116,7 @@
 %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb
 %%DATADIR%%/ruby/lib/gitlab/git/hook.rb
 %%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb
+%%DATADIR%%/ruby/lib/gitlab/git/http_auth.rb
 %%DATADIR%%/ruby/lib/gitlab/git/index.rb
 %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb
 %%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb