Upgrade to 1.34.0 which is required for Gitlab 11.10.1 upgrade.

3 files changed, 7 insertions, 37 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 34ae46c9dc58..2af3ee7fc17c 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.33.0
-PORTREVISION=	1
+DISTVERSION=	1.34.0
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -17,7 +17,7 @@ MY_DEPENDS=	git>=2.21:devel/git \
 		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.19.0:net/rubygem-gitaly-proto \
+		rubygem-gitaly-proto>=1.22.0:net/rubygem-gitaly-proto \
 		rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \
 		rubygem-rdoc>=6.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \
@@ -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=	800f4ff3272bc519b71cbc7b95d937978d2c53aa
+GL_COMMIT=	5f16a6cdac906d5aa0c375f408fad4a4aef5bcc7
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 4a6028f69dc2..23f9423dcadc 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555691732
-SHA256 (gitlab-org-gitaly-800f4ff3272bc519b71cbc7b95d937978d2c53aa_GL0.tar.gz) = d38236048e19128ee5ddde0d9c4e2189851e89ebe18bc8ec0c1439286a5b3a25
-SIZE (gitlab-org-gitaly-800f4ff3272bc519b71cbc7b95d937978d2c53aa_GL0.tar.gz) = 4713844
+TIMESTAMP = 1556204225
+SHA256 (gitlab-org-gitaly-5f16a6cdac906d5aa0c375f408fad4a4aef5bcc7_GL0.tar.gz) = d517256c9e4f1909ee5361e2a3d0a79409dfe703bf8ab6b2e3b7f2667ee4a914
+SIZE (gitlab-org-gitaly-5f16a6cdac906d5aa0c375f408fad4a4aef5bcc7_GL0.tar.gz) = 8257646
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index fb81e1e6d11f..1642c207491e 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -18,32 +18,19 @@
 %%DATADIR%%/ruby/gitlab-shell/README.md
 %%DATADIR%%/ruby/gitlab-shell/README.orig.md
 %%DATADIR%%/ruby/gitlab-shell/VERSION
-%%DATADIR%%/ruby/gitlab-shell/bin/authorized_keys
 %%DATADIR%%/ruby/gitlab-shell/bin/check
-%%DATADIR%%/ruby/gitlab-shell/bin/compile
-%%DATADIR%%/ruby/gitlab-shell/bin/create-hooks
-%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-keys
-%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-authorized-keys-check
-%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-authorized-principals-check
-%%DATADIR%%/ruby/gitlab-shell/bin/gitlab-shell-ruby
-%%DATADIR%%/ruby/gitlab-shell/bin/install
 %%DATADIR%%/ruby/gitlab-shell/bin/test-logger
 %%DATADIR%%/ruby/gitlab-shell/config.yml.example
-%%DATADIR%%/ruby/gitlab-shell/lib/action.rb
-%%DATADIR%%/ruby/gitlab-shell/lib/action/custom.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access_status.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_config.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_custom_hook.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_init.rb
-%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_keys.rb
-%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_lfs_authentication.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_logger.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_metrics.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net/errors.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_post_receive.rb
-%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_shell.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb
 %%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb
@@ -51,14 +38,10 @@
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb
-%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_keys_spec.rb
-%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_lfs_authentication_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_logger_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_net_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb
-%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_shell_authorized_keys_check_spec.rb
-%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_shell_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/hooks_utils_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/httpunix_spec.rb
 %%DATADIR%%/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb
@@ -81,24 +64,13 @@
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-json.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-not-ok-not-json.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-not-json.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok-with-message.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/custom-action-ok.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/discover-ok.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-download.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/lfs-authenticate-ok-upload.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-found.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-not-implemented.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-key-ok.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml
@@ -110,8 +82,6 @@
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml
 %%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
-%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/two-factor-recovery-codes.yml
 %%DATADIR%%/ruby/lib/gitaly_server.rb
 %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/client.rb