Merge remote-tracking branch 'upstream/master'

5 files changed, 67 insertions, 40 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 0539db6342a3..f799b8233eb8 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.53.3
+DISTVERSION=	1.59.2
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -14,21 +14,20 @@ 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.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-activesupport52>=5.2.3:devel/rubygem-activesupport52 \
-		rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \
+		rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
+		rubygem-github-linguist>=6.1<7.0:textproc/rubygem-github-linguist \
+		rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
+		rubygem-activesupport52>=5.2.3<5.3.0:devel/rubygem-activesupport52 \
 		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.19.0:net/rubygem-grpc \
-		rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \
-		rubygem-faraday>=0.12:www/rubygem-faraday \
+		rubygem-gitlab-gollum-lib>=4.2.7.7<4.2.8.0: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-grpc>=1.19.0<1.20.0:net/rubygem-grpc \
+		rubygem-sentry-raven>=2.9.0<2.10.0:devel/rubygem-sentry-raven \
+		rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \
-		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
-		rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371
+		rubygem-gitlab-labkit>=0.4.0<0.5.0:devel/rubygem-gitlab-labkit \
+		rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
+		rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
@@ -42,7 +41,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=	37b71fbdfe4375bb8eaf64f855f1182caf066ec7
+GL_COMMIT=	1e7005f12bda1dfd0b724ebc039cca75f1cd38d1
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -56,11 +55,11 @@ GH_TUPLE=	\
 		codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
-		golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:953cdadca894:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
@@ -86,10 +85,8 @@ GH_TUPLE=	\
 		uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 GL_TUPLE=	\
-		gitlab-org:gitaly-proto:f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553:gitlab_org_gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto \
 		gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
 
-
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 057d7439f3c2..6b7fb24b1785 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1566042205
+TIMESTAMP = 1567416269
 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
@@ -15,16 +15,16 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
-SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
-SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
+SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f
+SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016
 SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
 SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
 SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
 SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
 SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10
 SIZE (golang-sync-37e7f081c4d4_GH0.tar.gz) = 16238
-SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c
-SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049
+SHA256 (golang-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f
+SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
@@ -73,9 +73,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 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-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = c069342eb5d1b87fb5bdc5876ede1157c04ec5de0501628813a95c02f2dd34ac
-SIZE (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = 2097542
-SHA256 (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 20befa9ab47936d6a83fd362f5609d293dd4f6a3cb49d5b0049f6c8d6434810a
-SIZE (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 178864
+SHA256 (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 803b300bfb0a7491158ae768b65d6dcd402954a6a24fb663f7f80f8e880485ad
+SIZE (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 2727106
 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e
 SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466
diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_makegen.go
index 14e8815357dc..f4cfcec068a2 100644
--- a/devel/gitaly/files/patch-__support_makegen.go
+++ b/devel/gitaly/files/patch-__support_makegen.go
@@ -1,6 +1,6 @@
---- _support/makegen.go.orig	2019-06-18 09:53:31 UTC
+--- _support/makegen.go.orig	2019-08-22 16:24:24 UTC
 +++ _support/makegen.go
-@@ -282,7 +282,7 @@ var templateText = `
+@@ -320,7 +320,7 @@ var templateText = `
  # These variables may be overridden at runtime by top-level make
  PREFIX ?= /usr/local
  INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/
@@ -9,13 +9,13 @@
  ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly
  BUILD_TAGS := tracer_static tracer_static_jaeger
  
-@@ -330,8 +330,8 @@ build: ../.ruby-bundle
+@@ -368,8 +368,8 @@ build: ../.ruby-bundle
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ../.ruby-bundle:  {{ .GitalyRubyDir }}/Gemfile.lock  {{ .GitalyRubyDir }}/Gemfile
 +	cd  {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
  	cd  {{ .GitalyRubyDir }} && bundle config # for debugging
 -	cd  {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS)
- 	cd  {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check
  	touch $@
  
+ .PHONY: install
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index b1cdb651b810..5cef30dfff83 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,19 +1,15 @@
---- ruby/Gemfile.orig	2019-07-11 10:11:31 UTC
+--- ruby/Gemfile.orig	2019-08-22 16:24:24 UTC
 +++ ruby/Gemfile
-@@ -6,9 +6,9 @@ gem 'bundler', '>= 1.17.3'
- gem 'rugged', '~> 0.28'
+@@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28'
  gem 'github-linguist', '~> 6.1', require: 'linguist'
  gem 'gitlab-markup', '~> 1.7.0'
--gem 'activesupport', '~> 5.1.7'
--gem 'gitaly-proto', '~> 1.36.0'
+ gem 'activesupport', '~> 5.2.3'
 -gem 'rdoc', '~> 4.2'
-+gem 'activesupport', '~> 5.2.3'
-+gem 'gitaly-proto', '~> 1.37.0'
 +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.19.0'
-@@ -25,17 +25,3 @@ gem 'licensee', '~> 8.9.0'
+@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
  
  gem 'google-protobuf', '~> 3.7.1'
  
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index d31c913f40ea..0a2b1a645de4 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -142,6 +142,42 @@
 %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
 %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb
 %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
+%%DATADIR%%/ruby/proto/README.md
+%%DATADIR%%/ruby/proto/gitaly.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/blob_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/cleanup_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/commit_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/conflicts_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/diff_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/namespace_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/objectpool_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/operations_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ref_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/remote_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/repository-service_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/server_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/shared_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/smarthttp_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/ssh_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/storage_services_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/version.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/wiki_services_pb.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb
 %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb
 %%DATADIR%%/ruby/spec/factories/sequences.rb