From e7e1bdf31cfe37a6287a4e9e9d560c152bd52e85 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 13 Oct 2018 22:14:34 +0530
Subject: [PATCH] Add ruby-ed25519 and remove ruby-rbnacl

---
 debian/control                          |  5 ++---
 debian/patches/0510-relax-net-ssh.patch | 11 +++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f380af6425..a6c8d06188 100644
--- a/debian/control
+++ b/debian/control
@@ -274,11 +274,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-vmstat (>= 2.3~),
  ruby-sys-filesystem (>= 1.1.6~),
 # SSH host key support
- ruby-net-ssh (>= 1:4.2~),
+ ruby-net-ssh (>= 1:5.0~),
  ruby-sshkey (>= 1.9~),
 # Required for ED25519 SSH host key support
- ruby-rbnacl-libsodium,
- ruby-rbnacl (>= 5.0~),
+ ruby-ed25519 (>= 1.2~),
  ruby-bcrypt-pbkdf (>= 1.0~),
 # Gitaly GRPC client
  ruby-gitaly (>= 0.96~),
diff --git a/debian/patches/0510-relax-net-ssh.patch b/debian/patches/0510-relax-net-ssh.patch
index 953380ecf7..966c7411ff 100644
--- a/debian/patches/0510-relax-net-ssh.patch
+++ b/debian/patches/0510-relax-net-ssh.patch
@@ -1,11 +1,18 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -386,7 +386,7 @@
+@@ -386,13 +386,12 @@
  gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
  
  # SSH host key support
 -gem 'net-ssh', '~> 4.2'
-+gem 'net-ssh', '>= 4.2'
++gem 'net-ssh', '~> 5.0'
  gem 'sshkey', '~> 1.9'
  
  # Required for ED25519 SSH host key support
+ group :ed25519 do
+-  gem 'rbnacl-libsodium'
+-  gem 'rbnacl', '~> 5.0'
++  gem 'ed25519', '~> 1.2'
+   gem 'bcrypt_pbkdf', '~> 1.0'
+ end
+