From cd1b3d5ac5fa2429d27323c119b8e6d75f23edba Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Mon, 30 Dec 2019 17:36:08 +0530
Subject: [PATCH] Relax dependency on grpc and google-protobuf gems

---
 debian/control                                |  4 ++--
 debian/patches/0486-relax-grpc-protobuf.patch | 14 ++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/0486-relax-grpc-protobuf.patch

diff --git a/debian/control b/debian/control
index c3f851b1f4..0efd331c23 100644
--- a/debian/control
+++ b/debian/control
@@ -312,7 +312,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-bcrypt-pbkdf (>= 1.0~),
 # Gitaly GRPC client
  ruby-gitaly (>= 1.70+dfsg~),
- ruby-grpc (>= 1.24~),
+ ruby-grpc (>= 1.19~),
  ruby-google-protobuf (>= 3.7~),
 #
  ruby-toml-rb (>= 1.0.0-2~),
@@ -396,7 +396,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # gitlab-sidekiq was failing without puma
  puma
 Recommends: certbot,
- gitaly (>= 1.67.1+dfsg~)
+ gitaly (>= 1.72.1+dfsg-2~)
 Conflicts: libruby2.3
 Description: git powered software platform to collaborate on code (non-omnibus)
  gitlab provides web based interface to host source code and track issues.
diff --git a/debian/patches/0486-relax-grpc-protobuf.patch b/debian/patches/0486-relax-grpc-protobuf.patch
new file mode 100644
index 0000000000..d6700c87db
--- /dev/null
+++ b/debian/patches/0486-relax-grpc-protobuf.patch
@@ -0,0 +1,14 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -420,9 +420,9 @@
+ # Gitaly GRPC protocol definitions
+ gem 'gitaly', '~> 1.70'
+ 
+-gem 'grpc', '~> 1.24'
++gem 'grpc', '~> 1.19'
+ 
+-gem 'google-protobuf', '~> 3.8'
++gem 'google-protobuf', '~> 3.7'
+ 
+ gem 'toml-rb', '~> 1.0', require: false
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b65229c3a..98a757c873 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@
 0482-remove-ee-only-gems.patch
 0484-relax-asciidoctor-plantuml.patch
 0485-relax-responders.patch
+0486-relax-grpc-protobuf.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch