Add ruby-ed25519 and remove ruby-rbnacl

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~),

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
+