[rubygem-net-ssh] Update to net-ssh 2.6.6.
Vít Ondruch
vondruch at fedoraproject.org
Fri Mar 8 13:52:09 UTC 2013
commit 8c3c50100c55713abadf6b08bf2a104845250907
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Mar 8 14:51:06 2013 +0100
Update to net-ssh 2.6.6.
.gitignore | 1 +
...h-2.6.6-Fix-encoding-issues-with-Ruby-2.0.patch | 154 ++++++++++++++++++++
rubygem-net-ssh.spec | 34 +++--
sources | 2 +-
4 files changed, 175 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ea46cc..be8aa69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
net-ssh-2.0.23.gem
/net-ssh-2.2.1.gem
+/net-ssh-2.6.6.gem
diff --git a/rubygem-net-ssh-2.6.6-Fix-encoding-issues-with-Ruby-2.0.patch b/rubygem-net-ssh-2.6.6-Fix-encoding-issues-with-Ruby-2.0.patch
new file mode 100644
index 0000000..2fcd66f
--- /dev/null
+++ b/rubygem-net-ssh-2.6.6-Fix-encoding-issues-with-Ruby-2.0.patch
@@ -0,0 +1,154 @@
+From f3f09edf94a3930e0ef9b87574f6dbcf2aa1255c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Fri, 8 Mar 2013 14:35:28 +0100
+Subject: [PATCH] Fix encoding issues with Ruby 2.0 (#87).
+
+---
+ test/test_buffer.rb | 2 ++
+ test/transport/hmac/test_md5.rb | 2 ++
+ test/transport/hmac/test_md5_96.rb | 2 ++
+ test/transport/hmac/test_ripemd160.rb | 2 ++
+ test/transport/hmac/test_sha1.rb | 2 ++
+ test/transport/hmac/test_sha1_96.rb | 2 ++
+ test/transport/hmac/test_sha2_256.rb | 2 ++
+ test/transport/hmac/test_sha2_256_96.rb | 2 ++
+ test/transport/hmac/test_sha2_512.rb | 2 ++
+ test/transport/hmac/test_sha2_512_96.rb | 2 ++
+ test/transport/test_cipher_factory.rb | 2 ++
+ test/transport/test_packet_stream.rb | 2 ++
+ test/transport/test_state.rb | 2 ++
+ 13 files changed, 26 insertions(+)
+
+diff --git a/test/test_buffer.rb b/test/test_buffer.rb
+index 840c528..74d40aa 100644
+--- a/test/test_buffer.rb
++++ b/test/test_buffer.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/buffer'
+
+diff --git a/test/transport/hmac/test_md5.rb b/test/transport/hmac/test_md5.rb
+index d7854f2..7cae775 100644
+--- a/test/transport/hmac/test_md5.rb
++++ b/test/transport/hmac/test_md5.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/hmac/md5'
+
+diff --git a/test/transport/hmac/test_md5_96.rb b/test/transport/hmac/test_md5_96.rb
+index 575447b..41c5e11 100644
+--- a/test/transport/hmac/test_md5_96.rb
++++ b/test/transport/hmac/test_md5_96.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'transport/hmac/test_md5'
+ require 'net/ssh/transport/hmac/md5_96'
+diff --git a/test/transport/hmac/test_ripemd160.rb b/test/transport/hmac/test_ripemd160.rb
+index 5210c97..8255a73 100644
+--- a/test/transport/hmac/test_ripemd160.rb
++++ b/test/transport/hmac/test_ripemd160.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/hmac/ripemd160'
+
+diff --git a/test/transport/hmac/test_sha1.rb b/test/transport/hmac/test_sha1.rb
+index 4be100a..1cc133a 100644
+--- a/test/transport/hmac/test_sha1.rb
++++ b/test/transport/hmac/test_sha1.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/hmac/sha1'
+
+diff --git a/test/transport/hmac/test_sha1_96.rb b/test/transport/hmac/test_sha1_96.rb
+index 866e15a..725e7d1 100644
+--- a/test/transport/hmac/test_sha1_96.rb
++++ b/test/transport/hmac/test_sha1_96.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'transport/hmac/test_sha1'
+ require 'net/ssh/transport/hmac/sha1_96'
+diff --git a/test/transport/hmac/test_sha2_256.rb b/test/transport/hmac/test_sha2_256.rb
+index a01fd24..aa6bd6e 100644
+--- a/test/transport/hmac/test_sha2_256.rb
++++ b/test/transport/hmac/test_sha2_256.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/hmac/sha2_256'
+
+diff --git a/test/transport/hmac/test_sha2_256_96.rb b/test/transport/hmac/test_sha2_256_96.rb
+index 8257a43..34105ef 100644
+--- a/test/transport/hmac/test_sha2_256_96.rb
++++ b/test/transport/hmac/test_sha2_256_96.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'transport/hmac/test_sha2_256'
+ require 'net/ssh/transport/hmac/sha2_256_96'
+diff --git a/test/transport/hmac/test_sha2_512.rb b/test/transport/hmac/test_sha2_512.rb
+index 25a92af..7237613 100644
+--- a/test/transport/hmac/test_sha2_512.rb
++++ b/test/transport/hmac/test_sha2_512.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/hmac/sha2_512'
+
+diff --git a/test/transport/hmac/test_sha2_512_96.rb b/test/transport/hmac/test_sha2_512_96.rb
+index 6de7d2f..4a89a53 100644
+--- a/test/transport/hmac/test_sha2_512_96.rb
++++ b/test/transport/hmac/test_sha2_512_96.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'transport/hmac/test_sha2_512'
+ require 'net/ssh/transport/hmac/sha2_512_96'
+diff --git a/test/transport/test_cipher_factory.rb b/test/transport/test_cipher_factory.rb
+index 6261856..0d32447 100644
+--- a/test/transport/test_cipher_factory.rb
++++ b/test/transport/test_cipher_factory.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/cipher_factory'
+
+diff --git a/test/transport/test_packet_stream.rb b/test/transport/test_packet_stream.rb
+index 225927c..c83d9b0 100644
+--- a/test/transport/test_packet_stream.rb
++++ b/test/transport/test_packet_stream.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/packet_stream'
+
+diff --git a/test/transport/test_state.rb b/test/transport/test_state.rb
+index 8785e68..9bfb3f1 100644
+--- a/test/transport/test_state.rb
++++ b/test/transport/test_state.rb
+@@ -1,3 +1,5 @@
++# encoding: ASCII-8BIT
++
+ require 'common'
+ require 'net/ssh/transport/state'
+
+--
+1.8.1.4
+
diff --git a/rubygem-net-ssh.spec b/rubygem-net-ssh.spec
index 39b2514..b4604f1 100644
--- a/rubygem-net-ssh.spec
+++ b/rubygem-net-ssh.spec
@@ -1,21 +1,22 @@
# Generated from net-ssh-2.2.1.gem by gem2rpm -*- rpm-spec -*-
%global gem_name net-ssh
-
Summary: Net::SSH: a pure-Ruby implementation of the SSH2 client protocol
Name: rubygem-%{gem_name}
-Version: 2.2.1
-Release: 6%{?dist}
+Version: 2.6.6
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/net-ssh/net-ssh
Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+# Fixes test errors caused by change in default encoding in Ruby 2.0.0.
+# https://github.com/net-ssh/net-ssh/pull/88
+Patch0: rubygem-net-ssh-2.6.6-Fix-encoding-issues-with-Ruby-2.0.patch
Requires: ruby(release)
Requires: ruby(rubygems)
-Requires: ruby
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
-BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(test-unit)
BuildRequires: rubygem(mocha)
BuildRequires: ruby
BuildArch: noarch
@@ -40,6 +41,10 @@ Documentation for %{name}
%setup -q -c -T
%gem_install -n %{SOURCE0}
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
%build
%install
@@ -55,30 +60,28 @@ touch -r THANKS.rdoc THANKS.rdoc.new && \
mv THANKS.rdoc.new THANKS.rdoc
popd
-# remove gem "test-unit" line
-sed -i -e '/test-unit/, 1d' %{buildroot}%{gem_instdir}/test/common.rb
%check
-
-pushd %{buildroot}%{gem_instdir}
+pushd .%{gem_instdir}
ruby -Ilib -Itest test/test_all.rb
popd
%files
-%defattr(-, root, root, -)
%dir %{gem_instdir}
%{gem_libdir}
%{gem_instdir}/support
%exclude %{gem_instdir}/setup.rb
+%doc %{gem_instdir}/LICENSE.txt
%doc %{gem_instdir}/README.rdoc
-%doc %{gem_instdir}/THANKS.rdoc
-%doc %{gem_instdir}/CHANGELOG.rdoc
-%{gem_cache}
+%doc %{gem_instdir}/THANKS.txt
+%exclude %{gem_instdir}/THANKS.rdoc.new
+%doc %{gem_instdir}/CHANGES.txt
+%{gem_instdir}/gem-public_cert.pem
+%exclude %{gem_cache}
%{gem_spec}
%files doc
-%defattr(-, root, root, -)
%{gem_docdir}
%{gem_instdir}/Manifest
%{gem_instdir}/Rakefile
@@ -88,8 +91,9 @@ popd
%{gem_instdir}/net-ssh.gemspec
%changelog
-* Fri Mar 08 2013 Vít Ondruch <vondruch at redhat.com> - 2.2.1-6
+* Fri Mar 08 2013 Vít Ondruch <vondruch at redhat.com> - 2.6.6-1
- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to net-ssh 2.6.6.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index ccb242e..6b7a574 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36d1cd51af81d50bf5ce05a574417ce8 net-ssh-2.2.1.gem
+1aeaa841f23f8d528ba02c2bedd6f696 net-ssh-2.6.6.gem
More information about the scm-commits
mailing list