Hello community,
here is the log from the commit of package rubygem-bunny for openSUSE:Factory
checked in at 2017-01-31 12:47:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-bunny (Old)
and /work/SRC/openSUSE:Factory/.rubygem-bunny.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bunny"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-bunny/rubygem-bunny.changes
2016-12-29 22:46:58.702091881 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-bunny.new/rubygem-bunny.changes
2017-02-03 20:00:09.128210721 +0100
@@ -1,0 +2,12 @@
+Mon Jan 30 10:48:28 UTC 2017 - co...@suse.com
+
+- updated to version 2.6.3
+ see installed ChangeLog.md
+
+-------------------------------------------------------------------
+Mon Jan 30 10:47:40 UTC 2017 - co...@suse.com
+
+- add bunny-2.6.2-set-default-paths.diff to fix handling default
+ certificates
+
+-------------------------------------------------------------------
Old:
----
bunny-2.6.2.gem
New:
----
bunny-2.6.2-set-default-paths.diff
bunny-2.6.3.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-bunny.spec ++++++
--- /var/tmp/diff_new_pack.CvV9w2/_old 2017-02-03 20:00:09.872106015 +0100
+++ /var/tmp/diff_new_pack.CvV9w2/_new 2017-02-03 20:00:09.876105452 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-bunny
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-bunny
-Version: 2.6.2
+Version: 2.6.3
Release: 0
%define mod_name bunny
%define mod_full_name %{mod_name}-%{version}
@@ -33,8 +33,11 @@
BuildRequires: %{rubygem gem2rpm}
BuildRequires: ruby-macros >= 5
Url: http://rubybunny.info
-Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
+# MANUAL
+Patch0: bunny-2.6.2-set-default-paths.diff
+# /MANUAL
Summary: Popular easy to use Ruby client for RabbitMQ
License: MIT
Group: Development/Languages/Ruby
@@ -43,6 +46,10 @@
Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later versions.
%prep
+%gem_unpack
+%patch0 -p1
+find -type f -print0 | xargs -0 touch -r %{S:0}
+%gem_build
%build
++++++ bunny-2.6.2-set-default-paths.diff ++++++
diff -ru bunny-2.6.2.orig/lib/bunny/transport.rb
bunny-2.6.2/lib/bunny/transport.rb
--- bunny-2.6.2.orig/lib/bunny/transport.rb 2017-01-30 11:45:38.450558847
+0100
+++ bunny-2.6.2/lib/bunny/transport.rb 2017-01-30 11:46:24.691279686 +0100
@@ -464,6 +464,7 @@
@logger.error "No CA certificates found, add one with
:tls_ca_certificates"
end
OpenSSL::X509::Store.new.tap do |store|
+ store.set_default_paths
cert_files.select { |path| File.readable?(path) }.
each { |path| store.add_file(path) }
cert_inlines.
++++++ bunny-2.6.2.gem -> bunny-2.6.3.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ChangeLog.md new/ChangeLog.md
--- old/ChangeLog.md 2016-12-17 01:57:22.000000000 +0100
+++ new/ChangeLog.md 2017-01-19 19:12:35.000000000 +0100
@@ -1,8 +1,17 @@
-## Changes between Bunny 2.6.1 and 2.6.2 (unreleased)
+## Changes between Bunny 2.6.2 and 2.6.3 (unreleased)
No changes yet.
+## Changes between Bunny 2.6.1 and 2.6.2 (December 17th, 2016)
+
+### Do Not Modify Host Arrays
+
+Bunny now can work with frozen host arrays.
+
+GitHub issue: [#446](https://github.com/ruby-amqp/bunny/issues/446)
+
+
## Changes between Bunny 2.6.0 and 2.6.1 (October 23rd, 2016)
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bunny/cruby/socket.rb
new/lib/bunny/cruby/socket.rb
--- old/lib/bunny/cruby/socket.rb 2016-12-17 01:57:22.000000000 +0100
+++ new/lib/bunny/cruby/socket.rb 2017-01-19 19:12:35.000000000 +0100
@@ -9,8 +9,21 @@
module Socket
attr_accessor :options
- READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable]
- WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable]
+ READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
+ # Ruby 2.1+
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable,
+ IO::EAGAINWaitReadable,
IO::EWOULDBLOCKWaitReadable]
+ else
+ # 2.0
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable]
+ end
+ WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable,
+ IO::EAGAINWaitWritable,
IO::EWOULDBLOCKWaitWritable]
+ else
+ # 2.0
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable]
+ end
def self.open(host, port, options = {})
socket = ::Socket.tcp(host, port, nil, nil,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bunny/cruby/ssl_socket.rb
new/lib/bunny/cruby/ssl_socket.rb
--- old/lib/bunny/cruby/ssl_socket.rb 2016-12-17 01:57:22.000000000 +0100
+++ new/lib/bunny/cruby/ssl_socket.rb 2017-01-19 19:12:35.000000000 +0100
@@ -8,8 +8,21 @@
# methods found in Bunny::Socket.
class SSLSocket < OpenSSL::SSL::SSLSocket
- READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable]
- WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable]
+ READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
+ # Ruby 2.1+
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable,
+ IO::EAGAINWaitReadable,
IO::EWOULDBLOCKWaitReadable]
+ else
+ # 2.0
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitReadable]
+ end
+ WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable,
+ IO::EAGAINWaitWritable,
IO::EWOULDBLOCKWaitWritable]
+ else
+ # 2.0
+ [Errno::EAGAIN, Errno::EWOULDBLOCK,
IO::WaitWritable]
+ end
# Reads given number of bytes with an optional timeout
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bunny/session.rb new/lib/bunny/session.rb
--- old/lib/bunny/session.rb 2016-12-17 01:57:22.000000000 +0100
+++ new/lib/bunny/session.rb 2017-01-19 19:12:35.000000000 +0100
@@ -209,7 +209,7 @@
end
if (options[:host] || options[:hostname]) && (options[:hosts] ||
options[:addresses])
- @logger.warn "The connection options contain both a host and an array
of hosts, the single host is ignored."
+ @logger.warn "Connection options contain both a host and an array of
hosts (addresses), please pick one."
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bunny/version.rb new/lib/bunny/version.rb
--- old/lib/bunny/version.rb 2016-12-17 01:57:22.000000000 +0100
+++ new/lib/bunny/version.rb 2017-01-19 19:12:35.000000000 +0100
@@ -2,5 +2,5 @@
module Bunny
# @return [String] Version of the library
- VERSION = "2.6.2"
+ VERSION = "2.6.3"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2016-12-17 01:57:22.000000000 +0100
+++ new/metadata 2017-01-19 19:12:35.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: bunny
version: !ruby/object:Gem::Version
- version: 2.6.2
+ version: 2.6.3
platform: ruby
authors:
- Chris Duncan
@@ -12,7 +12,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: amq-protocol
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/higher_level_api/integration/connection_spec.rb
new/spec/higher_level_api/integration/connection_spec.rb
--- old/spec/higher_level_api/integration/connection_spec.rb 2016-12-17
01:57:22.000000000 +0100
+++ new/spec/higher_level_api/integration/connection_spec.rb 2017-01-19
19:12:36.000000000 +0100
@@ -282,8 +282,7 @@
it "logs a warning when there is a single host and an array" do
described_class.new(addresses: [address], host: host, logger: logger)
- expect(io.string).to include 'WARN -- : The connection options contain
'\
- 'both a host and an array of hosts, the single host is ignored.'
+ expect(io.string).to match(/both a host and an array of hosts/)
end
it "converts hosts in addresses to addresses" do
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.CvV9w2/_old 2017-02-03 20:00:10.112072240 +0100
+++ /var/tmp/diff_new_pack.CvV9w2/_new 2017-02-03 20:00:10.112072240 +0100
@@ -19,9 +19,8 @@
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
-# :patches:
-# foo.patch: -p1
-# bar.patch:
+:patches:
+ bunny-2.6.2-set-default-paths.diff: -p1
# ## used by gem2rpm
:sources:
# - foo.desktop
