Hello community, here is the log from the commit of package rubygem-bunny for openSUSE:Factory checked in at 2018-07-02 23:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-bunny (Old) and /work/SRC/openSUSE:Factory/.rubygem-bunny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bunny" Mon Jul 2 23:31:27 2018 rev:43 rq:619608 version:2.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-bunny/rubygem-bunny.changes 2018-06-08 23:14:38.657843534 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-bunny.new/rubygem-bunny.changes 2018-07-02 23:31:36.113386748 +0200 @@ -1,0 +2,17 @@ +Thu Jun 28 15:36:44 UTC 2018 - [email protected] + +- Remove patch: bunny-2.6.2-set-default-paths.diff + +The patch was used to add openSUSE default certificates, +as ca-bundle.pem doesn't exist anymore + +Patch is already in upstream: +https://github.com/ruby-amqp/bunny/pull/555 + +------------------------------------------------------------------- +Thu Jun 28 15:00:45 UTC 2018 - [email protected] + +- updated to version 2.11.0 + see installed ChangeLog.md + +------------------------------------------------------------------- Old: ---- bunny-2.10.0.gem bunny-2.6.2-set-default-paths.diff New: ---- bunny-2.11.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-bunny.spec ++++++ --- /var/tmp/diff_new_pack.mfBzQq/_old 2018-07-02 23:31:37.597384907 +0200 +++ /var/tmp/diff_new_pack.mfBzQq/_new 2018-07-02 23:31:37.601384902 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-bunny -Version: 2.10.0 +Version: 2.11.0 Release: 0 %define mod_name bunny %define mod_full_name %{mod_name}-%{version} @@ -35,9 +35,6 @@ Url: http://rubybunny.info 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 @@ -46,10 +43,6 @@ 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.10.0.gem -> bunny-2.11.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ChangeLog.md new/ChangeLog.md --- old/ChangeLog.md 2018-06-05 12:06:33.000000000 +0200 +++ new/ChangeLog.md 2018-06-21 22:12:20.000000000 +0200 @@ -1,6 +1,15 @@ ## Changes between Bunny 2.10.0 and 2.11.0 (unreleased) -No changes yet. +### More Reliable System-wide Trusted Certificate Directory Detection + +Bunny no longer tries to compile a list of trusted CA certificates on its own. +Instead it uses an OpenSSL API method that makes OpenSSL set the path(s), +which should cover more platforms and be forward- and backward-compatible. + +GitHub issue: [#555](https://github.com/ruby-amqp/bunny/issues/555). + +Contributed by Ana María Martínez Gómez. + ## Changes between Bunny 2.9.0 and 2.10.0 (Jun 5th, 2018) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2018-06-05 12:06:33.000000000 +0200 +++ new/README.md 2018-06-21 22:12:20.000000000 +0200 @@ -95,7 +95,7 @@ To use Bunny in a project managed with Bundler: ``` ruby -gem "bunny", ">= 2.9.2" +gem "bunny", ">= 2.10.0" ``` Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/automatic_recovery_with_basic_get.rb new/examples/connection/automatic_recovery_with_basic_get.rb --- old/examples/connection/automatic_recovery_with_basic_get.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/automatic_recovery_with_basic_get.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(:heartbeat_timeout => 8) conn.start ch = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/automatic_recovery_with_client_named_queues.rb new/examples/connection/automatic_recovery_with_client_named_queues.rb --- old/examples/connection/automatic_recovery_with_client_named_queues.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/automatic_recovery_with_client_named_queues.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(heartbeat_timeout: 8) conn.start ch = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/automatic_recovery_with_multiple_consumers.rb new/examples/connection/automatic_recovery_with_multiple_consumers.rb --- old/examples/connection/automatic_recovery_with_multiple_consumers.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/automatic_recovery_with_multiple_consumers.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(heartbeat_timeout: 8) conn.start ch1 = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/automatic_recovery_with_republishing.rb new/examples/connection/automatic_recovery_with_republishing.rb --- old/examples/connection/automatic_recovery_with_republishing.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/automatic_recovery_with_republishing.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'Bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(:heartbeat_timeout => 8) conn.start ch0 = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/automatic_recovery_with_server_named_queues.rb new/examples/connection/automatic_recovery_with_server_named_queues.rb --- old/examples/connection/automatic_recovery_with_server_named_queues.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/automatic_recovery_with_server_named_queues.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(heartbeat_timeout: 8) conn.start ch = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/channel_level_exception.rb new/examples/connection/channel_level_exception.rb --- old/examples/connection/channel_level_exception.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/channel_level_exception.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(heartbeat_timeout: 8) conn.start begin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/disabled_automatic_recovery.rb new/examples/connection/disabled_automatic_recovery.rb --- old/examples/connection/disabled_automatic_recovery.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/disabled_automatic_recovery.rb 2018-06-21 22:12:20.000000000 +0200 @@ -8,7 +8,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 8, :automatically_recover => false) +conn = Bunny.new(heartbeat_timeout: 8, automatically_recover: false) conn.start ch = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/connection/heartbeat.rb new/examples/connection/heartbeat.rb --- old/examples/connection/heartbeat.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/connection/heartbeat.rb 2018-06-21 22:12:20.000000000 +0200 @@ -9,7 +9,7 @@ require 'bunny' -conn = Bunny.new(:heartbeat_interval => 2) +conn = Bunny.new(:heartbeat_timeout => 2) conn.start c = conn.create_channel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/examples/consumers/high_and_low_priority.rb new/examples/consumers/high_and_low_priority.rb --- old/examples/consumers/high_and_low_priority.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/examples/consumers/high_and_low_priority.rb 2018-06-21 22:12:20.000000000 +0200 @@ -11,7 +11,7 @@ HIGH_PRIORITY_Q = "bunny.examples.priority.hilo.high" LOW_PRIORITY_Q = "bunny.examples.priority.hilo.low" -conn = Bunny.new(:heartbeat_interval => 8) +conn = Bunny.new(heartbeat_timeout: 8) conn.start ch1 = conn.create_channel 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 2018-06-05 12:06:33.000000000 +0200 +++ new/lib/bunny/session.rb 2018-06-21 22:12:20.000000000 +0200 @@ -101,7 +101,7 @@ # @option connection_string_or_opts [String] :username ("guest") Username # @option connection_string_or_opts [String] :password ("guest") Password # @option connection_string_or_opts [String] :vhost ("/") Virtual host to use - # @option connection_string_or_opts [Integer, Symbol] :heartbeat (:server) Heartbeat interval. :server means use the default suggested by RabbitMQ. 0 means heartbeats and socket read timeouts will be disabled (not recommended). + # @option connection_string_or_opts [Integer, Symbol] :heartbeat (:server) Heartbeat timeout to offer to the server. :server means use the value suggested by RabbitMQ. 0 means heartbeats and socket read timeouts will be disabled (not recommended). # @option connection_string_or_opts [Integer] :network_recovery_interval (4) Recovery interval periodic network recovery will use. This includes initial pause after network failure. # @option connection_string_or_opts [Boolean] :tls (false) Should TLS/SSL be used? # @option connection_string_or_opts [String] :tls_cert (nil) Path to client TLS/SSL certificate file (.pem) @@ -233,9 +233,13 @@ # @return [String] Virtual host used def virtual_host; self.vhost; end - # @return [Integer] Heartbeat interval used + # @deprecated + # @return [Integer] Heartbeat timeout (not interval) used def heartbeat_interval; self.heartbeat; end + # @return [Integer] Heartbeat timeout used + def heartbeat_timeout; self.heartbeat; end + # @return [Boolean] true if this connection uses TLS (SSL) def uses_tls? @transport.uses_tls? @@ -944,7 +948,7 @@ # @private def heartbeat_from(options) - options[:heartbeat] || options[:heartbeat_interval] || options[:requested_heartbeat] || DEFAULT_HEARTBEAT + options[:heartbeat] || options[:heartbeat_timeout] || options[:requested_heartbeat] || options[:heartbeat_interval] || DEFAULT_HEARTBEAT end # @private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bunny/transport.rb new/lib/bunny/transport.rb --- old/lib/bunny/transport.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/lib/bunny/transport.rb 2018-06-21 22:12:20.000000000 +0200 @@ -357,8 +357,6 @@ @tls_key = tls_key_from(opts) @tls_certificate_store = opts[:tls_certificate_store] - @tls_ca_certificates = tls_ca_certificates_paths_from(opts) - @tls_ca_certificates = default_tls_certificates if @tls_ca_certificates.empty? @verify_peer = as_boolean(opts[:verify_ssl] || opts[:verify_peer] || opts[:verify]) @tls_context = initialize_tls_context(OpenSSL::SSL::SSLContext.new, opts) @@ -417,6 +415,8 @@ ctx.cert_store = if @tls_certificate_store @tls_certificate_store else + # this ivar exists so that this value can be exposed in the API + @tls_ca_certificates = tls_ca_certificates_paths_from(opts) initialize_tls_certificate_store(@tls_ca_certificates) end @@ -450,23 +450,6 @@ ctx end - def default_tls_certificates - if defined?(JRUBY_VERSION) - # see https://github.com/jruby/jruby/issues/1055. MK. - [] - else - default_ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE - default_ca_path = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR - - [ - default_ca_file, - File.join(default_ca_path, 'ca-certificates.crt'), # Ubuntu/Debian - File.join(default_ca_path, 'ca-bundle.crt'), # Amazon Linux & Fedora/RHEL - File.join(default_ca_path, 'ca-bundle.pem') # OpenSUSE - ].uniq - end - end - def initialize_tls_certificate_store(certs) cert_files = [] cert_inlines = [] @@ -481,10 +464,8 @@ end @logger.debug { "Using CA certificates at #{cert_files.join(', ')}" } @logger.debug { "Using #{cert_inlines.count} inline CA certificates" } - if certs.empty? - @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. 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 2018-06-05 12:06:33.000000000 +0200 +++ new/lib/bunny/version.rb 2018-06-21 22:12:20.000000000 +0200 @@ -2,5 +2,5 @@ module Bunny # @return [String] Version of the library - VERSION = "2.10.0" + VERSION = "2.11.0" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2018-06-05 12:06:33.000000000 +0200 +++ new/metadata 2018-06-21 22:12:20.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: bunny version: !ruby/object:Gem::Version - version: 2.10.0 + version: 2.11.0 platform: ruby authors: - Chris Duncan @@ -12,7 +12,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2018-06-05 00:00:00.000000000 Z +date: 2018-06-21 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 2018-06-05 12:06:33.000000000 +0200 +++ new/spec/higher_level_api/integration/connection_spec.rb 2018-06-21 22:12:20.000000000 +0200 @@ -462,7 +462,7 @@ let(:interval) { 1 } subject do - described_class.new(hostname: host, username: username, password: password, vhost: vhost, heartbeat_interval: interval) + described_class.new(hostname: host, username: username, password: password, vhost: vhost, heartbeat_timeout: interval) end it "successfully connects" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/higher_level_api/integration/heartbeat_spec.rb new/spec/higher_level_api/integration/heartbeat_spec.rb --- old/spec/higher_level_api/integration/heartbeat_spec.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/spec/higher_level_api/integration/heartbeat_spec.rb 2018-06-21 22:12:20.000000000 +0200 @@ -3,7 +3,7 @@ describe "Client-defined heartbeat interval" do context "with value > 0" do let(:connection) do - c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: 4) + c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_timeout: 4) c.start c end @@ -19,7 +19,7 @@ context "with value = 0" do let(:connection) do c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", - heartbeat_interval: 0, automatically_recover: false) + heartbeat_timeout: 0, automatically_recover: false) c.start c end @@ -35,7 +35,7 @@ describe "Server-defined heartbeat interval" do let(:connection) do - c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: :server) + c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_timeout: :server) c.start c end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/stress/long_running_consumer_spec.rb new/spec/stress/long_running_consumer_spec.rb --- old/spec/stress/long_running_consumer_spec.rb 2018-06-05 12:06:33.000000000 +0200 +++ new/spec/stress/long_running_consumer_spec.rb 2018-06-21 22:12:20.000000000 +0200 @@ -9,7 +9,7 @@ before :all do @connection = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", - automatic_recovery: false, heartbeat_interval: 6) + automatic_recovery: false, heartbeat_timeout: 6) @connection.start end
