Update to ruby-net-ssh-1.1.2.

"ok, if it works for you" jcs@
This commit is contained in:
bernd 2008-01-12 14:57:16 +00:00
parent e146e44d41
commit d66d88205c
4 changed files with 56 additions and 70 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2007/09/15 22:36:59 merdely Exp $
# $OpenBSD: Makefile,v 1.4 2008/01/12 14:57:16 bernd Exp $
COMMENT= pure-ruby implementation of the SSH2 client protocol
DISTNAME= net-ssh-1.1.1
DISTNAME= net-ssh-1.1.2
PKGNAME= ruby-${DISTNAME}
CATEGORIES= net

View File

@ -1,5 +1,5 @@
MD5 (net-ssh-1.1.1.gem) = 4XT9YPEoIONQOIkYWVNQpg==
RMD160 (net-ssh-1.1.1.gem) = cOgYF0Ouniezga+WVjCvVLzJSbQ=
SHA1 (net-ssh-1.1.1.gem) = FRr5TE9SEk0hq0UZhTg+s3vBBAw=
SHA256 (net-ssh-1.1.1.gem) = AdH7KHSgSNJ44qgLt73WwcZkQ6kE8U1BcJ8Yo7sIFR8=
SIZE (net-ssh-1.1.1.gem) = 157184
MD5 (net-ssh-1.1.2.gem) = cfFfQKY5ze+5igpO91nr1w==
RMD160 (net-ssh-1.1.2.gem) = xJjYdh0jTD52NU6/GjCqvzFUTgc=
SHA1 (net-ssh-1.1.2.gem) = V+BBEmuTUoab0Vt416TBcvXAAmo=
SHA256 (net-ssh-1.1.2.gem) = 9UwUvshzud18MltejILcNjYtOuBPvBSmbFFDGQDv8Jo=
SIZE (net-ssh-1.1.2.gem) = 164352

View File

@ -1,46 +0,0 @@
# grok empty or commented ssh_known_hosts lines, and handle different key types
$OpenBSD: patch-lib_net_ssh_host-key-verifier_rb,v 1.1.1.1 2007/05/31 03:45:52 jcs Exp $
--- lib/net/ssh/host-key-verifier.rb.orig Wed Dec 31 17:00:00 1969
+++ lib/net/ssh/host-key-verifier.rb Wed May 30 21:36:49 2007
@@ -10,10 +10,12 @@ module Net
host = item[:host] || arguments[:peer][:host]
ip = item[:ip] || arguments[:peer][:ip]
port = item[:port] || arguments[:peer][:port]
+ type = item[:type] || arguments[:peer][:type]
host == arguments[:peer][:host] &&
ip == arguments[:peer][:ip] &&
- port == arguments[:peer][:port]
+ port == arguments[:peer][:port] &&
+ type == arguments[:key].ssh_type
end
# we've never seen this host before, so just automatically add the key.
@@ -84,7 +86,10 @@ module Net
end
def load_keys_from(path)
- File.readlines(path).map do |line|
+ keys = []
+ File.readlines(path).each do |line|
+ next if line.chomp.empty? || line =~ /^#/
+
host, type, key = line.chomp.split
host, address = host.split(/,/)
@@ -99,10 +104,11 @@ module Net
key = key.unpack("m*").first
- { :host => host, :ip => address, :port => port, :type => type, :key => key }
+ keys.push({ :host => host, :ip => address, :port => port, :type => type, :key => key })
end
+ keys
end
end
end
-end
\ No newline at end of file
+end

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/31 03:45:52 jcs Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/01/12 14:57:16 bernd Exp $
bin/rb-keygen
lib/ruby/gems/${MODRUBY_REV}/cache/${DISTNAME}.gem
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/
@ -89,22 +89,33 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Connection/Ter
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Exception.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000323.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000324.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000325.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000326.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000327.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000328.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000329.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000332.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000333.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000334.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000335.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000336.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000337.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyMismatch.src/M000338.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyVerifier.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyVerifier.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyVerifier.src/M000322.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/HostKeyVerifier.src/M000331.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000314.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000315.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000316.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000317.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000318.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000319.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000320.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000321.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/KnownHosts.src/M000322.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/LenientHostKeyVerifier.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/LenientHostKeyVerifier.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/LenientHostKeyVerifier.src/M000320.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/LenientHostKeyVerifier.src/M000329.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/NullHostKeyVerifier.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/NullHostKeyVerifier.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/NullHostKeyVerifier.src/M000321.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/NullHostKeyVerifier.src/M000330.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Proxy/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Proxy.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Proxy/ConnectError.html
@ -226,6 +237,7 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Driver.src/M000285.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Driver.src/M000286.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Driver.src/M000287.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/OpenFailed.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Shell.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Shell.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/Shell.src/M000276.html
@ -247,12 +259,12 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Service/Shell/SyncShell.src/M000293.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000314.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000315.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000316.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000317.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000318.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000319.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000323.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000324.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000325.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000326.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000327.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Session.src/M000328.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Transport/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Transport.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Net/SSH/Transport.src/
@ -559,6 +571,7 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/connection/s
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/connection/term_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/errors_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/host-key-verifier_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/known-hosts_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/lenient-host-key-verifier_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/null-host-key-verifier_rb.html
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/net/ssh/proxy/
@ -744,6 +757,17 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/HostKeyMismatch/remember
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/HostKeyVerifier/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/HostKeyVerifier/cdesc-HostKeyVerifier.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/HostKeyVerifier/verify-i.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/add-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/add-i.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/canonize-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/cdesc-KnownHosts.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/home_directory-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/hostfile_locations-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/keys_for-i.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/new-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/search_for-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/KnownHosts/search_in-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/LenientHostKeyVerifier/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/LenientHostKeyVerifier/cdesc-LenientHostKeyVerifier.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/LenientHostKeyVerifier/verify-i.yaml
@ -864,6 +888,8 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Driver/cde
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Driver/new-c.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Driver/open-i.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Driver/sync-i.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/OpenFailed/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/OpenFailed/cdesc-OpenFailed.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Shell/
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Shell/cdesc-Shell.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Net/SSH/Service/Shell/Shell/method_missing-i.yaml
@ -1204,6 +1230,11 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/OpenSSL/PKey/cdesc-PKey.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/OpenSSL/cdesc-OpenSSL.yaml
lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/created.rid
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/ChangeLog
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/LICENSE
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/NEWS
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/README
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/THANKS
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/rb-keygen
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/doc/
@ -1289,6 +1320,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/connection/services.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/connection/term.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/errors.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/host-key-verifier.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/known-hosts.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/lenient-host-key-verifier.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/null-host-key-verifier.rb
lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/net/ssh/proxy/