[DRE-commits] [ruby-net-ssh] 05/06: d/p/newer_rbnacl.patch: Allow use of newer rbnacl versions.

Unit 193 unit193-guest at moszumanska.debian.org
Wed Jul 19 07:15:09 UTC 2017


This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository ruby-net-ssh.

commit 8b04968b79142b064720563504ece8fbb5b67474
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Tue Jul 4 03:51:14 2017 -0400

    d/p/newer_rbnacl.patch: Allow use of newer rbnacl versions.
---
 debian/patches/newer_rbnacl.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/newer_rbnacl.patch b/debian/patches/newer_rbnacl.patch
new file mode 100644
index 0000000..c954444
--- /dev/null
+++ b/debian/patches/newer_rbnacl.patch
@@ -0,0 +1,37 @@
+Description: Work with newer releases of rbnacl.
+Author: Unit 193 <unit193 at ubuntu.com>
+
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-06-16
+
+--- ruby-net-ssh-4.1.0.orig/lib/net/ssh/authentication/ed25519.rb
++++ ruby-net-ssh-4.1.0/lib/net/ssh/authentication/ed25519.rb
+@@ -1,4 +1,4 @@
+-gem 'rbnacl', '>= 3.2.0', '< 5.0'
++gem 'rbnacl', '>= 3.2.0', '< 6.0'
+ gem 'bcrypt_pbkdf', '~> 1.0' unless RUBY_PLATFORM == "java"
+ 
+ begin
+--- ruby-net-ssh-4.1.0.orig/lib/net/ssh/authentication/ed25519_loader.rb
++++ ruby-net-ssh-4.1.0/lib/net/ssh/authentication/ed25519_loader.rb
+@@ -21,7 +21,7 @@ end
+ 
+ def self.dependenciesRequiredForED25519
+   result = "net-ssh requires the following gems for ed25519 support:\n"
+-  result << " * rbnacl (>= 3.2, < 5.0)\n"
++  result << " * rbnacl (>= 3.2, < 6.0)\n"
+   result << " * rbnacl-libsodium, if your system doesn't have libsodium installed.\n"
+   result << " * bcrypt_pbkdf (>= 1.0, < 2.0)\n" unless RUBY_PLATFORM == "java"
+   result << "See https://github.com/net-ssh/net-ssh/issues/478 for more information\n"
+--- ruby-net-ssh-4.1.0.orig/net-ssh.gemspec
++++ ruby-net-ssh-4.1.0/net-ssh.gemspec
+@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
+ 
+   unless ENV['NET_SSH_NO_RBNACL']
+     spec.add_development_dependency("rbnacl-libsodium", "~> 1.0.11")
+-    spec.add_development_dependency("rbnacl", ['>= 3.2.0','< 5.0'])
++    spec.add_development_dependency("rbnacl", ['>= 3.2.0','< 6.0'])
+     spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0") unless RUBY_PLATFORM == "java"
+   end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3011afc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+newer_rbnacl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-net-ssh.git



More information about the Pkg-ruby-extras-commits mailing list