realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add ruby-ed25519 and remove ruby-rbnacl

Browse source
This commit is contained in:
Pirate Praveen 2018-10-13 22:14:34 +05:30
parent 973d502ef1
commit e7e1bdf31c
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debian/control vendored
View file

@ -274,11 +274,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-vmstat (>= 2.3~), ruby-vmstat (>= 2.3~),
ruby-sys-filesystem (>= 1.1.6~), ruby-sys-filesystem (>= 1.1.6~),
# SSH host key support # SSH host key support
ruby-net-ssh (>= 1:4.2~), ruby-net-ssh (>= 1:5.0~),
ruby-sshkey (>= 1.9~), ruby-sshkey (>= 1.9~),
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
ruby-rbnacl-libsodium, ruby-ed25519 (>= 1.2~),
ruby-rbnacl (>= 5.0~),
ruby-bcrypt-pbkdf (>= 1.0~), ruby-bcrypt-pbkdf (>= 1.0~),
# Gitaly GRPC client # Gitaly GRPC client
ruby-gitaly (>= 0.96~), ruby-gitaly (>= 0.96~),

11
debian/patches/0510-relax-net-ssh.patch vendored
View file

@ -1,11 +1,18 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -386,7 +386,7 @@ @@ -386,13 +386,12 @@
gem 'sys-filesystem', '~> 1.1', '>= 1.1.6' gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
# SSH host key support # SSH host key support
-gem 'net-ssh', '~> 4.2' -gem 'net-ssh', '~> 4.2'
+gem 'net-ssh', '>= 4.2' +gem 'net-ssh', '~> 5.0'
gem 'sshkey', '~> 1.9' gem 'sshkey', '~> 1.9'
# Required for ED25519 SSH host key support # 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