rpms/ruby
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Ruby 2.3.0 (r51650).

Browse source
This commit is contained in:
Vít Ondruch 2015-08-21 11:57:19 +02:00
commit 4c8987c685
3 changed files with 3 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ruby-2.3.0-Don-t-force-SSLv3-in-test-as-it-is-insecure-and-may-.patch
View file

@ -1,35 +0,0 @@
From b9fa5fc9a14e6c889c9a0fa9c9386b2018f2314c Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Fri, 17 Jul 2015 11:25:09 -0600
Subject: [PATCH 4/8] Don't force SSLv3 in test, as it is insecure and may not
be supported
LibreSSL disables SSLv3 by default, and there's no reason this code
should require SSLv3.
diff --git test/openssl/test_ssl_session.rb test/openssl/test_ssl_session.rb
index 0c384c7..d4713d9 100644
--- test/openssl/test_ssl_session.rb
+++ test/openssl/test_ssl_session.rb
@@ -312,9 +312,6 @@
end
def test_ctx_server_session_cb
- method = "SSLv3"
- assert_include(OpenSSL::SSL::SSLContext::METHODS.map(&:to_s), method)
-
called = {}
ctx_proc = Proc.new { |ctx, ssl|
@@ -358,7 +355,7 @@
3.times do
sock = TCPSocket.new("127.0.0.1", port)
begin
- ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new(method))
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new())
ssl.sync_close = true
ssl.session = last_client_session if last_client_session
ssl.connect
--
2.4.5

23
ruby-2.3.0-Use-OP_NO_TICKET-when-testing-SSL-session-cache-call.patch
View file

@ -1,23 +0,0 @@
From fb08c34eee2c883a01ab0dda2a2e34a290516a2a Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Fri, 17 Jul 2015 11:31:45 -0600
Subject: [PATCH 5/8] Use OP_NO_TICKET when testing SSL session cache callbacks
This fixes the test when using LibreSSL and possibly some
configurations of OpenSSL.
diff --git test/openssl/test_ssl_session.rb test/openssl/test_ssl_session.rb
index d4713d9..58fa20b 100644
--- test/openssl/test_ssl_session.rb
+++ test/openssl/test_ssl_session.rb
@@ -316,6 +316,7 @@ __EOS__
ctx_proc = Proc.new { |ctx, ssl|
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER
+ ctx.options = OpenSSL::SSL::OP_NO_TICKET
last_server_session = nil
# get_cb is called whenever a client proposed to resume a session but
--
2.4.5

12
ruby.spec
View file

@ -10,7 +10,7 @@
#%%global milestone rc1
# Keep the revision enabled for pre-releases from SVN.
%global revision 51643
%global revision 51650
%global ruby_archive %{name}-%{ruby_version}
@ -112,10 +112,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
# in support for ABRT.
# http://bugs.ruby-lang.org/issues/8566
Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
# Don't use SSLv3 for tests.
# https://bugs.ruby-lang.org/issues/10046
Patch10: ruby-2.3.0-Don-t-force-SSLv3-in-test-as-it-is-insecure-and-may-.patch
Patch11: ruby-2.3.0-Use-OP_NO_TICKET-when-testing-SSL-session-cache-call.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
@ -434,8 +430,6 @@ rm -rf ext/fiddle/libffi*
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch10
%patch11
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@ -893,8 +887,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r51643
- Upgrade to Ruby 2.3.0 (r51643).
* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r51650
- Upgrade to Ruby 2.3.0 (r51650).
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.
- Fix the git BR following the git package split.