MFH: r518202 r518521

Update to 1.72.0 which is required for gitlab-ce 12.5.

devel/gitaly: upgrade to 1.72.1 which is required for gitlab-ce 12.5.1.

Approved by:	ports-secteam (joneum)

5 files changed, 46 insertions, 59 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index a5c5ee56e571..6e7f93ba666c 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.67.0
+DISTVERSION=	1.72.1
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -15,19 +15,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 MY_DEPENDS=	git>=2.21:devel/git \
 		rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
 		rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
-		rubygem-github-linguist>=6.1<7.0:textproc/rubygem-github-linguist \
+		rubygem-github-linguist>=7.5<8.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-rdoc>=6.0<7.0:devel/rubygem-rdoc \
 		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-grpc>=1.24.0<1.25.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.5.0<0.6.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
+		rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
@@ -41,32 +41,32 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	ca21a624582be7bcf4d43075be2a7e5981e191fa
+GL_COMMIT=	52a09a56236c4d44bc4cc5865ff58dc2e6fa459f
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
+# 41dd
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
 		beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \
-		certifi:gocertifi:ee1a9a0726d2:certifi_gocertifi/vendor/github.com/certifi/gocertifi \
 		cloudflare:tableflip:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
 		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 \
+		getsentry:sentry-go:v0.3.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
 		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:4def268fd1a4: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:953cdadca894:golang_sys/vendor/golang.org/x/sys \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:fde4db37ae7a: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 \
 		grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
 		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc:grpc-go:v1.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \
@@ -74,17 +74,18 @@ GH_TUPLE=	\
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
-		pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.0.2:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		sirupsen:logrus:v1.2.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \
 		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:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
 
@@ -102,4 +103,3 @@ do-install:
 	cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
 
 .include <bsd.port.mk>
-
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 90e1d77221ec..f7db3e374543 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,32 +1,30 @@
-TIMESTAMP = 1571855950
+TIMESTAMP = 1574880257
 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
 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
 SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc
 SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866
-SHA256 (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = b0b9ac422d6378c82be85f71f206757db24ecad314aca6155e9954363817fae1
-SIZE (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = 143846
 SHA256 (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 0fab510fb61d488f63c59485dadb166d7d5fac5ebbd65e6a3cacfc9fdd1fb6d3
 SIZE (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 12582
 SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0
 SIZE (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 7738
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 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 (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 16907c25fc86802614579a6a8e638fe4bd65ba2c07a18ff5185de14e75bd878f
+SIZE (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 57823
 SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
 SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f
-SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016
+SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
+SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
 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-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f
-SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sys-fde4db37ae7a_GH0.tar.gz) = b6aab4e92d5d8fe85ca0dd229bfb75c91290951a3bf3b95087459e5a4eae86a4
+SIZE (golang-sys-fde4db37ae7a_GH0.tar.gz) = 1455218
 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
@@ -37,8 +35,8 @@ SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2f
 SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
-SHA256 (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a
-SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087
+SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
+SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
 SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd
 SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
@@ -53,8 +51,8 @@ SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7
 SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
 SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
-SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5
-SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344
+SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
+SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
@@ -67,15 +65,15 @@ SHA256 (prometheus-procfs-v0.0.2_GH0.tar.gz) = ad1d1f1328a1c394b30225b939ed39482
 SIZE (prometheus-procfs-v0.0.2_GH0.tar.gz) = 78550
 SHA256 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d
 SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794
-SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
-SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859
+SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
+SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570
 SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923
 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94
 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-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 92d38de0294338d8b9bb27205f799c60b5bed2e0ac651a87029fc203301a688a
-SIZE (gitlab-org-gitaly-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 2772214
+SHA256 (gitlab-org-gitaly-52a09a56236c4d44bc4cc5865ff58dc2e6fa459f_GL0.tar.gz) = 7a74b9c1c605ce28f7744e194273f665f252f6672e65304014a85842433ce72e
+SIZE (gitlab-org-gitaly-52a09a56236c4d44bc4cc5865ff58dc2e6fa459f_GL0.tar.gz) = 2789978
 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-config.toml.example b/devel/gitaly/files/patch-config.toml.example
index 14d7f364003f..595b641659c9 100644
--- a/devel/gitaly/files/patch-config.toml.example
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -1,7 +1,8 @@
---- config.toml.example.orig	2019-07-11 10:11:31 UTC
+--- config.toml.example.orig	2019-11-18 19:41:52 UTC
 +++ config.toml.example
-@@ -1,9 +1,9 @@
- # Example Gitaly configuration file
+@@ -2,10 +2,10 @@
+ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
+ # https://docs.gitlab.com/ee//administration/gitaly/reference
  
 -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
 +socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
@@ -12,7 +13,7 @@
  
  # # Optional: listen on a TCP socket. This is insecure (no authentication)
  # listen_addr = "localhost:9999"
-@@ -22,13 +22,13 @@ bin_dir = "/home/git/gitaly"
+@@ -24,13 +24,13 @@ bin_dir = "/home/git/gitaly"
  # key_path = '/home/git/key.pem'
  
  # # Git settings
@@ -29,7 +30,7 @@
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
-@@ -58,7 +58,7 @@ dir = "/home/git/gitlab/log"
+@@ -60,7 +60,7 @@ dir = "/home/git/gitlab/log"
  
  [gitaly-ruby]
  # The directory where gitaly-ruby is installed
@@ -38,7 +39,7 @@
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 200000000
-@@ -74,7 +74,7 @@ dir = "/home/git/gitaly/ruby"
+@@ -80,7 +80,7 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 5cef30dfff83..80db04779aba 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,17 +1,8 @@
---- ruby/Gemfile.orig	2019-08-22 16:24:24 UTC
+--- ruby/Gemfile.orig	2019-11-22 14:21:07 UTC
 +++ ruby/Gemfile
-@@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28'
- gem 'github-linguist', '~> 6.1', require: 'linguist'
- gem 'gitlab-markup', '~> 1.7.0'
- gem 'activesupport', '~> 5.2.3'
--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.19.0'
 @@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
  
- gem 'google-protobuf', '~> 3.7.1'
+ gem 'google-protobuf', '~> 3.8.0'
  
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist
index 78b7b7a4cf2f..4ff0124f3403 100644
--- a/devel/gitaly/pkg-plist
+++ b/devel/gitaly/pkg-plist
@@ -9,8 +9,6 @@
 %%DATADIR%%/ruby/git-hooks/update
 %%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml
 %%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml
-%%DATADIR%%/ruby/gitlab-shell/.rubocop.yml
-%%DATADIR%%/ruby/gitlab-shell/.ruby-version
 %%DATADIR%%/ruby/gitlab-shell/CHANGELOG
 %%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md
 %%DATADIR%%/ruby/gitlab-shell/Gemfile
@@ -89,7 +87,6 @@
 %%DATADIR%%/ruby/lib/gitaly_server/client.rb
 %%DATADIR%%/ruby/lib/gitaly_server/commit_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb
-%%DATADIR%%/ruby/lib/gitaly_server/diff_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb
 %%DATADIR%%/ruby/lib/gitaly_server/health_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/operations_service.rb
@@ -155,6 +152,8 @@
 %%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/hook_pb.rb
+%%DATADIR%%/ruby/proto/gitaly/hook_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
@@ -174,8 +173,6 @@
 %%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