Hello community,
here is the log from the commit of package rubygem-eventmachine for
openSUSE:Factory checked in at 2017-09-26 21:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-eventmachine (Old)
and /work/SRC/openSUSE:Factory/.rubygem-eventmachine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-eventmachine"
Tue Sep 26 21:13:34 2017 rev:18 rq:514968 version:1.2.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-eventmachine/rubygem-eventmachine.changes
2017-04-11 09:32:25.489048654 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-eventmachine.new/rubygem-eventmachine.changes
2017-09-26 21:13:41.904504401 +0200
@@ -1,0 +2,15 @@
+Thu Aug 3 19:11:42 UTC 2017 - [email protected]
+
+- updated to version 1.2.5
+ see installed CHANGELOG.md
+
+ ## 1.2.5 (July 27, 2017)
+ * Java: Use long for larger values in oneshot timer intervals [#784, #794]
+
+ ## 1.2.4 (July 27, 2017)
+ * Java: Add EM_PROTO_SSL/TLS definitions [#773, #791]
+ * Fix IPv6 UDP get_peername [#788]
+ * Allow for larger values in oneshot timer intervals [#784, #793]
+ * Update extconf.rb to allow MinGW builds with OpenSSL 1.1.0 [#785]
+
+-------------------------------------------------------------------
Old:
----
eventmachine-1.2.3.gem
New:
----
eventmachine-1.2.5.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-eventmachine.spec ++++++
--- /var/tmp/diff_new_pack.f75nxF/_old 2017-09-26 21:13:42.412432977 +0200
+++ /var/tmp/diff_new_pack.f75nxF/_new 2017-09-26 21:13:42.416432415 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-eventmachine
-Version: 1.2.3
+Version: 1.2.5
Release: 0
%define mod_name eventmachine
%define mod_full_name %{mod_name}-%{version}
++++++ eventmachine-1.2.3.gem -> eventmachine-1.2.5.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2017-02-23 06:31:15.000000000 +0100
+++ new/CHANGELOG.md 2017-07-28 08:45:28.000000000 +0200
@@ -1,5 +1,14 @@
# Changelog
+## 1.2.5 (July 27, 2017)
+* Java: Use long for larger values in oneshot timer intervals [#784, #794]
+
+## 1.2.4 (July 27, 2017)
+* Java: Add EM_PROTO_SSL/TLS definitions [#773, #791]
+* Fix IPv6 UDP get_peername [#788]
+* Allow for larger values in oneshot timer intervals [#784, #793]
+* Update extconf.rb to allow MinGW builds with OpenSSL 1.1.0 [#785]
+
## 1.2.3 (February 22, 2017)
* Pure Ruby: Add get_sockname [#308, #772]
* Fix segfault when an Exception is raised from unbind callback [#765, #766]
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/cmain.cpp new/ext/cmain.cpp
--- old/ext/cmain.cpp 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/cmain.cpp 2017-07-28 08:45:28.000000000 +0200
@@ -100,10 +100,10 @@
evma_install_oneshot_timer
**************************/
-extern "C" const uintptr_t evma_install_oneshot_timer (int seconds)
+extern "C" const uintptr_t evma_install_oneshot_timer (uint64_t milliseconds)
{
ensure_eventmachine("evma_install_oneshot_timer");
- return EventMachine->InstallOneshotTimer (seconds);
+ return EventMachine->InstallOneshotTimer (milliseconds);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/ed.cpp new/ext/ed.cpp
--- old/ext/ed.cpp 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/ed.cpp 2017-07-28 08:45:28.000000000 +0200
@@ -2002,8 +2002,8 @@
{
bool ok = false;
if (s) {
- *len = sizeof(struct sockaddr);
- memset (s, 0, sizeof(struct sockaddr));
+ *len = sizeof(ReturnAddress);
+ memset (s, 0, sizeof(ReturnAddress));
memcpy (s, &ReturnAddress, sizeof(ReturnAddress));
ok = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/em.cpp new/ext/em.cpp
--- old/ext/em.cpp 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/em.cpp 2017-07-28 08:45:28.000000000 +0200
@@ -1151,7 +1151,7 @@
EventMachine_t::InstallOneshotTimer
***********************************/
-const uintptr_t EventMachine_t::InstallOneshotTimer (int milliseconds)
+const uintptr_t EventMachine_t::InstallOneshotTimer (uint64_t milliseconds)
{
if (Timers.size() > MaxOutstandingTimers)
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/em.h new/ext/em.h
--- old/ext/em.h 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/em.h 2017-07-28 08:45:28.000000000 +0200
@@ -142,7 +142,7 @@
void ScheduleHalt();
bool Stopping();
void SignalLoopBreaker();
- const uintptr_t InstallOneshotTimer (int);
+ const uintptr_t InstallOneshotTimer (uint64_t);
const uintptr_t ConnectToServer (const char *, int, const char
*, int);
const uintptr_t ConnectToUnixServer (const char *);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/eventmachine.h new/ext/eventmachine.h
--- old/ext/eventmachine.h 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/eventmachine.h 2017-07-28 08:45:28.000000000 +0200
@@ -51,7 +51,7 @@
bool evma_run_machine_once();
void evma_run_machine();
void evma_release_library();
- const uintptr_t evma_install_oneshot_timer (int seconds);
+ const uintptr_t evma_install_oneshot_timer (uint64_t milliseconds);
const uintptr_t evma_connect_to_server (const char *bind_addr, int
bind_port, const char *server, int port);
const uintptr_t evma_connect_to_unix_server (const char *server);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/extconf.rb new/ext/extconf.rb
--- old/ext/extconf.rb 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/extconf.rb 2017-07-28 08:45:28.000000000 +0200
@@ -26,10 +26,10 @@
end
SSL_HEADS = %w(openssl/ssl.h openssl/err.h)
-SSL_LIBS = case RUBY_PLATFORM
-when /mswin|mingw|bccwin/ ; %w(ssleay32 libeay32)
-else ; %w(crypto ssl)
-end
+SSL_LIBS = %w(crypto ssl)
+# OpenSSL 1.1.0 and above for Windows use the Unix library names
+# OpenSSL 0.9.8 and 1.0.x for Windows use the *eay32 library names
+SSL_LIBS_WIN = RUBY_PLATFORM =~ /mswin|mingw|bccwin/ ? %w(ssleay32 libeay32) :
[]
def dir_config_wrapper(pretty_name, name, idefault=nil, ldefault=nil)
inc, lib = dir_config(name, idefault, ldefault)
@@ -88,15 +88,15 @@
end
elsif dir_config_wrapper('OpenSSL', 'ssl')
# If the user has provided a --with-ssl-dir argument, we must respect it or
fail.
- add_define 'WITH_SSL' if check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+ add_define 'WITH_SSL' if (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN))
&& check_heads(SSL_HEADS)
elsif pkg_config_wrapper('OpenSSL', 'openssl')
# If we can detect OpenSSL by pkg-config, use it as the next-best option
- add_define 'WITH_SSL' if check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
-elsif check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+ add_define 'WITH_SSL' if (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN))
&& check_heads(SSL_HEADS)
+elsif (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) &&
check_heads(SSL_HEADS)
# If we don't even need any options to find a usable OpenSSL, go with it
add_define 'WITH_SSL'
elsif dir_config_search('OpenSSL', 'ssl', ['/usr/local', '/opt/local',
'/usr/local/opt/openssl']) do
- check_libs(SSL_LIBS) && check_heads(SSL_HEADS)
+ (check_libs(SSL_LIBS) || check_libs(SSL_LIBS_WIN)) &&
check_heads(SSL_HEADS)
end
# Finally, look for OpenSSL in alternate locations including MacPorts and
HomeBrew
add_define 'WITH_SSL'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/rubymain.cpp new/ext/rubymain.cpp
--- old/ext/rubymain.cpp 2017-02-23 06:31:15.000000000 +0100
+++ new/ext/rubymain.cpp 2017-07-28 08:45:29.000000000 +0200
@@ -262,7 +262,7 @@
static VALUE t_add_oneshot_timer (VALUE self UNUSED, VALUE interval)
{
- const uintptr_t f = evma_install_oneshot_timer (FIX2INT (interval));
+ const uintptr_t f = evma_install_oneshot_timer (FIX2LONG (interval));
if (!f)
rb_raise (rb_eRuntimeError, "%s", "ran out of timers; use
#set_max_timers to increase limit");
return BSIG2NUM (f);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/java/src/com/rubyeventmachine/EmReactor.java
new/java/src/com/rubyeventmachine/EmReactor.java
--- old/java/src/com/rubyeventmachine/EmReactor.java 2017-02-23
06:31:15.000000000 +0100
+++ new/java/src/com/rubyeventmachine/EmReactor.java 2017-07-28
08:45:29.000000000 +0200
@@ -48,7 +48,13 @@
public final int EM_SSL_HANDSHAKE_COMPLETED = 108;
public final int EM_SSL_VERIFY = 109;
public final int EM_PROXY_TARGET_UNBOUND = 110;
- public final int EM_PROXY_COMPLETED = 111;
+ public final int EM_PROXY_COMPLETED = 111;
+
+ public final int EM_PROTO_SSLv2 = 2;
+ public final int EM_PROTO_SSLv3 = 4;
+ public final int EM_PROTO_TLSv1 = 8;
+ public final int EM_PROTO_TLSv1_1 = 16;
+ public final int EM_PROTO_TLSv1_2 = 32;
private Selector mySelector;
private TreeMap<Long, ArrayList<Long>> Timers;
@@ -373,7 +379,7 @@
}
}
- public long installOneshotTimer (int milliseconds) {
+ public long installOneshotTimer (long milliseconds) {
long s = createBinding();
long deadline = new Date().getTime() + milliseconds;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/em/version.rb new/lib/em/version.rb
--- old/lib/em/version.rb 2017-02-23 06:31:16.000000000 +0100
+++ new/lib/em/version.rb 2017-07-28 08:45:29.000000000 +0200
@@ -1,3 +1,3 @@
module EventMachine
- VERSION = "1.2.3"
+ VERSION = "1.2.5"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-02-23 06:31:15.000000000 +0100
+++ new/metadata 2017-07-28 08:45:28.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: eventmachine
version: !ruby/object:Gem::Version
- version: 1.2.3
+ version: 1.2.5
platform: ruby
authors:
- Francis Cianfrocca
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
requirement: !ruby/object:Gem::Requirement
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_ipv6.rb new/tests/test_ipv6.rb
--- old/tests/test_ipv6.rb 2017-02-23 06:31:16.000000000 +0100
+++ new/tests/test_ipv6.rb 2017-07-28 08:45:29.000000000 +0200
@@ -35,11 +35,13 @@
def test_ipv6_udp_local_server
@@received_data = nil
@local_port = next_port
+ @@remote_ip = nil
setup_timeout(2)
EM.run do
EM.open_datagram_socket(@@public_ipv6, @local_port) do |s|
def s.receive_data data
+ _port, @@remote_ip = Socket.unpack_sockaddr_in(s.get_peername)
@@received_data = data
EM.stop
end
@@ -49,7 +51,7 @@
c.send_datagram "ipv6/udp", @@public_ipv6, @local_port
end
end
-
+ assert_equal @@remote_ip, @@public_ipv6
assert_equal "ipv6/udp", @@received_data
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_threaded_resource.rb
new/tests/test_threaded_resource.rb
--- old/tests/test_threaded_resource.rb 2017-02-23 06:31:16.000000000 +0100
+++ new/tests/test_threaded_resource.rb 2017-07-28 08:45:29.000000000 +0200
@@ -1,3 +1,5 @@
+require 'em_test_helper'
+
class TestThreadedResource < Test::Unit::TestCase
def object
@object ||= {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_timers.rb new/tests/test_timers.rb
--- old/tests/test_timers.rb 2017-02-23 06:31:16.000000000 +0100
+++ new/tests/test_timers.rb 2017-07-28 08:45:29.000000000 +0200
@@ -93,6 +93,13 @@
assert_equal 4, x
end
+ def test_oneshot_timer_large_future_value
+ large_value = 11948602000
+ EM.run {
+ EM.add_timer(large_value) { EM.stop }
+ EM.add_timer(0.02) { EM.stop }
+ }
+ end
# This test is only applicable to compiled versions of the reactor.
# Pure ruby and java versions have no built-in limit on the number of
outstanding timers.
