Apply patches cleanly. fed_hash: 6beb732b5c
This commit is contained in:
parent
7a02390aaf
commit
491bcd7a5e
|
@ -1 +1 @@
|
||||||
/ruby-2.4.1.tar.xz
|
/ruby-2.4.2.tar.xz
|
||||||
|
|
|
@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index 0e371e2..d4f1dcb 100644
|
index 0e371e2..d4f1dcb 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -4536,6 +4536,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
@@ -4563,6 +4563,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
||||||
AC_SUBST(sitearchhdrdir)dnl
|
AC_SUBST(sitearchhdrdir)dnl
|
||||||
AC_SUBST(vendorarchhdrdir)dnl
|
AC_SUBST(vendorarchhdrdir)dnl
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index 37d9a62..553d4d0 100644
|
index 37d9a62..553d4d0 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -3790,6 +3790,11 @@ if test ${multiarch+set}; then
|
@@ -3823,6 +3823,11 @@ if test ${multiarch+set}; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
archlibdir='${libdir}/${arch}'
|
archlibdir='${libdir}/${arch}'
|
||||||
|
|
|
@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index db37cd6..ce8d149 100644
|
index db37cd6..ce8d149 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -4390,7 +4390,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
@@ -4417,7 +4417,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||||
ruby_version_dir=/'${ruby_version_dir_name}'
|
ruby_version_dir=/'${ruby_version_dir_name}'
|
||||||
|
|
||||||
if test -z "${ruby_version_dir_name}"; then
|
if test -z "${ruby_version_dir_name}"; then
|
||||||
|
|
|
@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index 553d4d0..03a4152 100644
|
index 553d4d0..03a4152 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -4454,6 +4454,8 @@ AC_SUBST(vendorarchdir)dnl
|
@@ -4481,6 +4481,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||||
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
|
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
|
||||||
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
|
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index 03a4152..0e371e2 100644
|
index 03a4152..0e371e2 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -4426,6 +4426,10 @@ AC_ARG_WITH(vendorarchdir,
|
@@ -4453,6 +4453,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||||
[vendorarchdir=$withval],
|
[vendorarchdir=$withval],
|
||||||
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
|
||||||
if test "${LOAD_RELATIVE+set}"; then
|
if test "${LOAD_RELATIVE+set}"; then
|
||||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||||
RUBY_EXEC_PREFIX=''
|
RUBY_EXEC_PREFIX=''
|
||||||
@@ -4450,6 +4454,7 @@ AC_SUBST(sitearchdir)dnl
|
@@ -4477,6 +4481,7 @@ AC_SUBST(sitearchdir)dnl
|
||||||
AC_SUBST(vendordir)dnl
|
AC_SUBST(vendordir)dnl
|
||||||
AC_SUBST(vendorlibdir)dnl
|
AC_SUBST(vendorlibdir)dnl
|
||||||
AC_SUBST(vendorarchdir)dnl
|
AC_SUBST(vendorarchdir)dnl
|
||||||
|
|
|
@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in
|
||||||
index db37cd6..6e73fae 100644
|
index db37cd6..6e73fae 100644
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -4341,9 +4341,6 @@ AS_CASE(["$target_os"],
|
@@ -4368,9 +4368,6 @@ AS_CASE(["$target_os"],
|
||||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644
|
||||||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||||
AC_ARG_WITH(rubyarchprefix,
|
AC_ARG_WITH(rubyarchprefix,
|
||||||
AS_HELP_STRING([--with-rubyarchprefix=DIR],
|
AS_HELP_STRING([--with-rubyarchprefix=DIR],
|
||||||
@@ -4366,56 +4363,62 @@ AC_ARG_WITH(ridir,
|
@@ -4393,56 +4390,62 @@ AC_ARG_WITH(ridir,
|
||||||
AC_SUBST(ridir)
|
AC_SUBST(ridir)
|
||||||
AC_SUBST(RI_BASE_NAME)
|
AC_SUBST(RI_BASE_NAME)
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644
|
||||||
|
|
||||||
if test "${LOAD_RELATIVE+set}"; then
|
if test "${LOAD_RELATIVE+set}"; then
|
||||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||||
@@ -4432,6 +4435,7 @@ AC_SUBST(sitearchincludedir)dnl
|
@@ -4459,6 +4462,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||||
AC_SUBST(arch)dnl
|
AC_SUBST(arch)dnl
|
||||||
AC_SUBST(sitearch)dnl
|
AC_SUBST(sitearch)dnl
|
||||||
AC_SUBST(ruby_version)dnl
|
AC_SUBST(ruby_version)dnl
|
||||||
|
@ -245,7 +245,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
|
||||||
index 0428bea..b6e090e 100644
|
index 0428bea..b6e090e 100644
|
||||||
--- a/test/rubygems/test_gem.rb
|
--- a/test/rubygems/test_gem.rb
|
||||||
+++ b/test/rubygems/test_gem.rb
|
+++ b/test/rubygems/test_gem.rb
|
||||||
@@ -1101,7 +1101,8 @@ def test_self_use_paths
|
@@ -1124,7 +1124,8 @@ def test_self_use_paths
|
||||||
|
|
||||||
def test_self_user_dir
|
def test_self_user_dir
|
||||||
parts = [@userhome, '.gem', Gem.ruby_engine]
|
parts = [@userhome, '.gem', Gem.ruby_engine]
|
||||||
|
@ -255,7 +255,7 @@ index 0428bea..b6e090e 100644
|
||||||
|
|
||||||
assert_equal File.join(parts), Gem.user_dir
|
assert_equal File.join(parts), Gem.user_dir
|
||||||
end
|
end
|
||||||
@@ -1228,7 +1229,7 @@ def test_self_user_home_user_drive_and_path
|
@@ -1251,7 +1252,7 @@ def test_self_user_home_user_drive_and_path
|
||||||
def test_self_vendor_dir
|
def test_self_vendor_dir
|
||||||
expected =
|
expected =
|
||||||
File.join RbConfig::CONFIG['vendordir'], 'gems',
|
File.join RbConfig::CONFIG['vendordir'], 'gems',
|
||||||
|
|
|
@ -1,241 +0,0 @@
|
||||||
From 27251312111b7e25e347773e5777ee6072f9289b Mon Sep 17 00:00:00 2001
|
|
||||||
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
|
||||||
Date: Sat, 8 Jul 2017 02:21:36 +0000
|
|
||||||
Subject: [PATCH] merge revision(s) 58284,58812,59028: [Backport #13632]
|
|
||||||
|
|
||||||
vm_core.h: ruby_error_stream_closed
|
|
||||||
|
|
||||||
* vm_core.h (ruby_special_exceptions): renamed
|
|
||||||
ruby_error_closed_stream as ruby_error_stream_closed, like the
|
|
||||||
message.
|
|
||||||
speed up IO#close with many threads
|
|
||||||
|
|
||||||
Today, it increases IO#close performance with many threads:
|
|
||||||
|
|
||||||
Execution time (sec)
|
|
||||||
name trunk after
|
|
||||||
vm_thread_close 4.276 3.018
|
|
||||||
|
|
||||||
Speedup ratio: compare with the result of `trunk' (greater is better)
|
|
||||||
name after
|
|
||||||
vm_thread_close 1.417
|
|
||||||
|
|
||||||
This speedup comes because rb_notify_fd_close only scans threads
|
|
||||||
inside rb_thread_io_blocking_region, not all threads in the VM.
|
|
||||||
|
|
||||||
In the future, this type data structure may allow us to notify
|
|
||||||
waiters of multiple FDs on a single thread (when using
|
|
||||||
Fibers).
|
|
||||||
|
|
||||||
* thread.c (struct waiting_fd): declare
|
|
||||||
(rb_thread_io_blocking_region): use on-stack list waiter
|
|
||||||
(rb_notify_fd_close): walk vm->waiting_fds instead
|
|
||||||
(call_without_gvl): remove old field setting
|
|
||||||
(th_init): ditto
|
|
||||||
* vm_core.h (typedef struct rb_vm_struct): add waiting_fds list
|
|
||||||
* (typedef struct rb_thread_struct): remove waiting_fd field
|
|
||||||
(rb_vm_living_threads_init): initialize waiting_fds list
|
|
||||||
|
|
||||||
I am now kicking myself for not thinking about this 3 years ago
|
|
||||||
when I introduced ccan/list in [Feature #9632] to optimize this
|
|
||||||
same function :<
|
|
||||||
IO#close: do not enqueue redundant interrupts (take #2)
|
|
||||||
|
|
||||||
Enqueuing multiple errors for one event causes spurious errors
|
|
||||||
down the line, as reported by Nikolay Vashchenko in
|
|
||||||
https://bugs.ruby-lang.org/issues/13632
|
|
||||||
|
|
||||||
This should fix bad interactions with test_race_gets_and_close
|
|
||||||
in test/ruby/test_io.rb since we ensure rb_notify_fd_close
|
|
||||||
continues returning the busy flag after enqueuing the interrupt.
|
|
||||||
|
|
||||||
Backporting changes to 2.4 and earlier releases will be more
|
|
||||||
challenging...
|
|
||||||
|
|
||||||
* thread.c (rb_notify_fd_close): do not enqueue multiple interrupts
|
|
||||||
[ruby-core:81581] [Bug #13632]
|
|
||||||
* test/ruby/test_io.rb (test_single_exception_on_close):
|
|
||||||
new test based on script from Nikolay
|
|
||||||
|
|
||||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
|
||||||
---
|
|
||||||
test/ruby/test_io.rb | 22 ++++++++++++++++++++++
|
|
||||||
thread.c | 36 +++++++++++++++++++++++++-----------
|
|
||||||
vm.c | 1 -
|
|
||||||
vm_core.h | 6 +++---
|
|
||||||
4 files changed, 50 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
|
|
||||||
index 61dfba318042..034dac570ce4 100644
|
|
||||||
--- a/test/ruby/test_io.rb
|
|
||||||
+++ b/test/ruby/test_io.rb
|
|
||||||
@@ -2809,6 +2809,28 @@ def test_cross_thread_close_stdio
|
|
||||||
end;
|
|
||||||
end
|
|
||||||
|
|
||||||
+ def test_single_exception_on_close
|
|
||||||
+ a = []
|
|
||||||
+ t = []
|
|
||||||
+ 10.times do
|
|
||||||
+ r, w = IO.pipe
|
|
||||||
+ a << [r, w]
|
|
||||||
+ t << Thread.new do
|
|
||||||
+ while r.gets
|
|
||||||
+ end rescue IOError
|
|
||||||
+ Thread.current.pending_interrupt?
|
|
||||||
+ end
|
|
||||||
+ end
|
|
||||||
+ a.each do |r, w|
|
|
||||||
+ w.write -"\n"
|
|
||||||
+ w.close
|
|
||||||
+ r.close
|
|
||||||
+ end
|
|
||||||
+ t.each do |th|
|
|
||||||
+ assert_equal false, th.value, '[ruby-core:81581] [Bug #13632]'
|
|
||||||
+ end
|
|
||||||
+ end
|
|
||||||
+
|
|
||||||
def test_open_mode
|
|
||||||
feature4742 = "[ruby-core:36338]"
|
|
||||||
bug6055 = '[ruby-dev:45268]'
|
|
||||||
diff --git a/thread.c b/thread.c
|
|
||||||
index 7391cf96d284..2691fd835de4 100644
|
|
||||||
--- a/thread.c
|
|
||||||
+++ b/thread.c
|
|
||||||
@@ -95,7 +95,11 @@ static int rb_threadptr_pending_interrupt_empty_p(rb_thread_t *th);
|
|
||||||
#define eTerminateSignal INT2FIX(1)
|
|
||||||
static volatile int system_working = 1;
|
|
||||||
|
|
||||||
-#define closed_stream_error GET_VM()->special_exceptions[ruby_error_closed_stream]
|
|
||||||
+struct waiting_fd {
|
|
||||||
+ struct list_node wfd_node; /* <=> vm.waiting_fds */
|
|
||||||
+ rb_thread_t *th;
|
|
||||||
+ int fd;
|
|
||||||
+};
|
|
||||||
|
|
||||||
inline static void
|
|
||||||
st_delete_wrap(st_table *table, st_data_t key)
|
|
||||||
@@ -1310,7 +1314,6 @@ call_without_gvl(void *(*func)(void *), void *data1,
|
|
||||||
rb_thread_t *th = GET_THREAD();
|
|
||||||
int saved_errno = 0;
|
|
||||||
|
|
||||||
- th->waiting_fd = -1;
|
|
||||||
if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) {
|
|
||||||
ubf = ubf_select;
|
|
||||||
data2 = th;
|
|
||||||
@@ -1433,11 +1436,15 @@ VALUE
|
|
||||||
rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
|
|
||||||
{
|
|
||||||
volatile VALUE val = Qundef; /* shouldn't be used */
|
|
||||||
+ rb_vm_t *vm = GET_VM();
|
|
||||||
rb_thread_t *th = GET_THREAD();
|
|
||||||
volatile int saved_errno = 0;
|
|
||||||
int state;
|
|
||||||
+ struct waiting_fd wfd;
|
|
||||||
|
|
||||||
- th->waiting_fd = fd;
|
|
||||||
+ wfd.fd = fd;
|
|
||||||
+ wfd.th = th;
|
|
||||||
+ list_add(&vm->waiting_fds, &wfd.wfd_node);
|
|
||||||
|
|
||||||
TH_PUSH_TAG(th);
|
|
||||||
if ((state = EXEC_TAG()) == 0) {
|
|
||||||
@@ -1448,8 +1455,8 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
|
|
||||||
}
|
|
||||||
TH_POP_TAG();
|
|
||||||
|
|
||||||
- /* clear waiting_fd anytime */
|
|
||||||
- th->waiting_fd = -1;
|
|
||||||
+ /* must be deleted before jump */
|
|
||||||
+ list_del(&wfd.wfd_node);
|
|
||||||
|
|
||||||
if (state) {
|
|
||||||
TH_JUMP_TAG(th, state);
|
|
||||||
@@ -2195,16 +2202,23 @@ int
|
|
||||||
rb_notify_fd_close(int fd)
|
|
||||||
{
|
|
||||||
rb_vm_t *vm = GET_THREAD()->vm;
|
|
||||||
- rb_thread_t *th = 0;
|
|
||||||
+ struct waiting_fd *wfd = 0;
|
|
||||||
int busy;
|
|
||||||
|
|
||||||
busy = 0;
|
|
||||||
- list_for_each(&vm->living_threads, th, vmlt_node) {
|
|
||||||
- if (th->waiting_fd == fd) {
|
|
||||||
- VALUE err = th->vm->special_exceptions[ruby_error_closed_stream];
|
|
||||||
+ list_for_each(&vm->waiting_fds, wfd, wfd_node) {
|
|
||||||
+ if (wfd->fd == fd) {
|
|
||||||
+ rb_thread_t *th = wfd->th;
|
|
||||||
+ VALUE err;
|
|
||||||
+
|
|
||||||
+ busy = 1;
|
|
||||||
+ if (!th) {
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+ wfd->th = 0;
|
|
||||||
+ err = th->vm->special_exceptions[ruby_error_stream_closed];
|
|
||||||
rb_threadptr_pending_interrupt_enque(th, err);
|
|
||||||
rb_threadptr_interrupt(th);
|
|
||||||
- busy = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return busy;
|
|
||||||
@@ -4839,7 +4853,7 @@ Init_Thread(void)
|
|
||||||
rb_define_method(rb_cThread, "name=", rb_thread_setname, 1);
|
|
||||||
rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
|
|
||||||
|
|
||||||
- rb_vm_register_special_exception(ruby_error_closed_stream, rb_eIOError, "stream closed");
|
|
||||||
+ rb_vm_register_special_exception(ruby_error_stream_closed, rb_eIOError, "stream closed");
|
|
||||||
|
|
||||||
cThGroup = rb_define_class("ThreadGroup", rb_cObject);
|
|
||||||
rb_define_alloc_func(cThGroup, thgroup_s_alloc);
|
|
||||||
diff --git a/vm.c b/vm.c
|
|
||||||
index 0544bcc4e573..c8ed39ad1e47 100644
|
|
||||||
--- a/vm.c
|
|
||||||
+++ b/vm.c
|
|
||||||
@@ -2477,7 +2477,6 @@ th_init(rb_thread_t *th, VALUE self)
|
|
||||||
th->status = THREAD_RUNNABLE;
|
|
||||||
th->errinfo = Qnil;
|
|
||||||
th->last_status = Qnil;
|
|
||||||
- th->waiting_fd = -1;
|
|
||||||
th->root_svar = Qfalse;
|
|
||||||
th->local_storage_recursive_hash = Qnil;
|
|
||||||
th->local_storage_recursive_hash_for_trace = Qnil;
|
|
||||||
diff --git a/vm_core.h b/vm_core.h
|
|
||||||
index d0385d219f82..8e2b93d8e9b2 100644
|
|
||||||
--- a/vm_core.h
|
|
||||||
+++ b/vm_core.h
|
|
||||||
@@ -427,7 +427,7 @@ enum ruby_special_exceptions {
|
|
||||||
ruby_error_reenter,
|
|
||||||
ruby_error_nomemory,
|
|
||||||
ruby_error_sysstack,
|
|
||||||
- ruby_error_closed_stream,
|
|
||||||
+ ruby_error_stream_closed,
|
|
||||||
ruby_special_error_count
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -490,6 +490,7 @@ typedef struct rb_vm_struct {
|
|
||||||
struct rb_thread_struct *main_thread;
|
|
||||||
struct rb_thread_struct *running_thread;
|
|
||||||
|
|
||||||
+ struct list_head waiting_fds; /* <=> struct waiting_fd */
|
|
||||||
struct list_head living_threads;
|
|
||||||
size_t living_thread_num;
|
|
||||||
VALUE thgroup_default;
|
|
||||||
@@ -712,8 +713,6 @@ typedef struct rb_thread_struct {
|
|
||||||
/* passing state */
|
|
||||||
int state;
|
|
||||||
|
|
||||||
- int waiting_fd;
|
|
||||||
-
|
|
||||||
/* for rb_iterate */
|
|
||||||
VALUE passed_block_handler;
|
|
||||||
|
|
||||||
@@ -1445,6 +1444,7 @@ void rb_thread_wakeup_timer_thread(void);
|
|
||||||
static inline void
|
|
||||||
rb_vm_living_threads_init(rb_vm_t *vm)
|
|
||||||
{
|
|
||||||
+ list_head_init(&vm->waiting_fds);
|
|
||||||
list_head_init(&vm->living_threads);
|
|
||||||
vm->living_thread_num = 0;
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
From 261353a42d0dc0e7bf73e5a8fb8ecffd04249d42 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kazuki Yamaguchi <k@rhe.jp>
|
|
||||||
Date: Tue, 27 Jun 2017 14:31:09 +0900
|
|
||||||
Subject: [PATCH] test/test_ssl: allow 3DES cipher suites in
|
|
||||||
test_sslctx_set_params
|
|
||||||
|
|
||||||
Fedora's OpenSSL seems to enable 3DES cipher suites by DEFAULT.
|
|
||||||
|
|
||||||
Fixes: https://github.com/ruby/openssl/issues/127
|
|
||||||
---
|
|
||||||
test/test_ssl.rb | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
|
|
||||||
index 19066566..b3efe95a 100644
|
|
||||||
--- a/test/openssl/test_ssl.rb
|
|
||||||
+++ b/test/openssl/test_ssl.rb
|
|
||||||
@@ -350,7 +350,7 @@ def test_sslctx_set_params
|
|
||||||
assert_equal OpenSSL::SSL::VERIFY_PEER, ctx.verify_mode
|
|
||||||
ciphers_names = ctx.ciphers.collect{|v, _, _, _| v }
|
|
||||||
assert ciphers_names.all?{|v| /A(EC)?DH/ !~ v }, "anon ciphers are disabled"
|
|
||||||
- assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES)/ !~ v }, "weak ciphers are disabled"
|
|
||||||
+ assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES(?!-EDE|-CBC3))/ !~ v }, "weak ciphers are disabled"
|
|
||||||
assert_equal 0, ctx.options & OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
|
|
||||||
if defined?(OpenSSL::SSL::OP_NO_COMPRESSION) # >= 1.0.0
|
|
||||||
assert_equal OpenSSL::SSL::OP_NO_COMPRESSION,
|
|
28
ruby.spec
28
ruby.spec
|
@ -1,6 +1,6 @@
|
||||||
%global major_version 2
|
%global major_version 2
|
||||||
%global minor_version 4
|
%global minor_version 4
|
||||||
%global teeny_version 1
|
%global teeny_version 2
|
||||||
%global major_minor_version %{major_version}.%{minor_version}
|
%global major_minor_version %{major_version}.%{minor_version}
|
||||||
|
|
||||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%global release 83
|
%global release 84
|
||||||
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
||||||
|
|
||||||
# The RubyGems library has to stay out of Ruby directory three, since the
|
# The RubyGems library has to stay out of Ruby directory three, since the
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
%global rubygems_dir %{_datadir}/rubygems
|
%global rubygems_dir %{_datadir}/rubygems
|
||||||
|
|
||||||
# Bundled libraries versions
|
# Bundled libraries versions
|
||||||
%global rubygems_version 2.6.11
|
%global rubygems_version 2.6.13
|
||||||
%global molinillo_version 0.5.7
|
%global molinillo_version 0.5.7
|
||||||
|
|
||||||
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
|
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
|
||||||
|
@ -39,10 +39,10 @@
|
||||||
%global bigdecimal_version 1.3.0
|
%global bigdecimal_version 1.3.0
|
||||||
%global did_you_mean_version 1.1.0
|
%global did_you_mean_version 1.1.0
|
||||||
%global io_console_version 0.4.6
|
%global io_console_version 0.4.6
|
||||||
%global json_version 2.0.2
|
%global json_version 2.0.4
|
||||||
%global minitest_version 5.10.1
|
%global minitest_version 5.10.1
|
||||||
%global net_telnet_version 0.1.1
|
%global net_telnet_version 0.1.1
|
||||||
%global openssl_version 2.0.3
|
%global openssl_version 2.0.5
|
||||||
%global power_assert_version 0.4.1
|
%global power_assert_version 0.4.1
|
||||||
%global psych_version 2.2.2
|
%global psych_version 2.2.2
|
||||||
%global rake_version 12.0.0
|
%global rake_version 12.0.0
|
||||||
|
@ -128,13 +128,6 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
|
||||||
# hardening features of glibc (rhbz#1361037).
|
# hardening features of glibc (rhbz#1361037).
|
||||||
# https://bugs.ruby-lang.org/issues/12666
|
# https://bugs.ruby-lang.org/issues/12666
|
||||||
Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
|
Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
|
||||||
# Fix OpenSSL::TestSSL#test_sslctx_set_params failures due to recent changes in
|
|
||||||
# OpenSSL.
|
|
||||||
# https://github.com/ruby/openssl/issues/127
|
|
||||||
Patch10: ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch
|
|
||||||
# Fix "IOError: stream closed" errors affecting Puma.
|
|
||||||
# https://bugs.ruby-lang.org/issues/13632
|
|
||||||
Patch11: ruby-2.4.2-IO-close-do-not-enqueue-redundant-interrupts.patch
|
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Suggests: rubypick
|
Suggests: rubypick
|
||||||
|
@ -174,7 +167,8 @@ straight-forward, and extensible.
|
||||||
Summary: A Ruby development environment
|
Summary: A Ruby development environment
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: rubypick
|
# This would not be needed if ~50 packages depending on -devel used
|
||||||
|
# --disable-gems
|
||||||
Requires: rubygems
|
Requires: rubygems
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
|
@ -514,8 +508,6 @@ rm -rf ext/fiddle/libffi*
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
|
||||||
%patch11 -p1
|
|
||||||
|
|
||||||
# Provide an example of usage of the tapset:
|
# Provide an example of usage of the tapset:
|
||||||
cp -a %{SOURCE3} .
|
cp -a %{SOURCE3} .
|
||||||
|
@ -1038,6 +1030,12 @@ make check TESTS="-v $DISABLE_TESTS"
|
||||||
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
|
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 18 2017 Pavel Valena <pvalena@redhat.com> - 2.4.2-84
|
||||||
|
- Update to Ruby 2.4.2.
|
||||||
|
|
||||||
|
* Fri Sep 08 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.1-84
|
||||||
|
- Drop ruby-devel dependency on rubypick, which is pulled in transtitively.
|
||||||
|
|
||||||
* Fri Aug 11 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.1-83
|
* Fri Aug 11 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.1-83
|
||||||
- Fix "IOError: stream closed" errors affecting Puma.
|
- Fix "IOError: stream closed" errors affecting Puma.
|
||||||
- Temporary disable checksec on PPC64LE (rhbz#1479302).
|
- Temporary disable checksec on PPC64LE (rhbz#1479302).
|
||||||
|
|
Loading…
Reference in New Issue