Hello community,
here is the log from the commit of package rubygem-bundler for openSUSE:Factory
checked in at 2014-07-26 09:41:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-bundler (Old)
and /work/SRC/openSUSE:Factory/.rubygem-bundler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bundler"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-bundler/rubygem-bundler.changes
2014-07-21 22:34:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-bundler.new/rubygem-bundler.changes
2014-07-26 09:42:05.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jul 25 09:25:03 UTC 2014 - co...@suse.com
+
+- updated to version 1.6.5
+ Bugfixes:
+ - require openssl explicitly to fix rare HTTPS request failures (@indirect,
#3107)
+
+-------------------------------------------------------------------
Old:
----
bundler-1.6.4.gem
New:
----
bundler-1.6.5.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-bundler.spec ++++++
--- /var/tmp/diff_new_pack.SUEXPO/_old 2014-07-26 09:42:06.000000000 +0200
+++ /var/tmp/diff_new_pack.SUEXPO/_new 2014-07-26 09:42:06.000000000 +0200
@@ -17,12 +17,12 @@
Name: rubygem-bundler
-Version: 1.6.4
+Version: 1.6.5
Release: 0
%define mod_name bundler
%define mod_full_name %{mod_name}-%{version}
%define mod_branch -%{version}
-%define mod_weight 10604
+%define mod_weight 10605
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 3
++++++ bundler-1.6.4.gem -> bundler-1.6.5.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2014-07-18 08:18:49.000000000 +0200
+++ new/CHANGELOG.md 2014-07-24 03:15:48.000000000 +0200
@@ -1,3 +1,9 @@
+## 1.6.5 (2014-07-23)
+
+Bugfixes:
+
+ - require openssl explicitly to fix rare HTTPS request failures (@indirect,
#3107)
+
## 1.6.4 (2014-07-17)
Bugfixes:
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/fetcher.rb new/lib/bundler/fetcher.rb
--- old/lib/bundler/fetcher.rb 2014-07-18 08:18:49.000000000 +0200
+++ new/lib/bundler/fetcher.rb 2014-07-24 03:15:48.000000000 +0200
@@ -91,47 +91,43 @@
end
def initialize(remote_uri)
-
- # How many redirects to allew in one request
- @redirect_limit = 5
- # How long to wait for each gemcutter API call
- @api_timeout = 10
- # How many retries for the gemcutter API call
- @max_retries = 3
+ @redirect_limit = 5 # How many redirects to allow in one request
+ @api_timeout = 10 # How long to wait for each API call
+ @max_retries = 3 # How many retries for the API call
@remote_uri = Bundler::Source.mirror_for(remote_uri)
@public_uri = @remote_uri.dup
@public_uri.user, @public_uri.password = nil, nil # don't print these
Socket.do_not_reverse_lookup = true
+ connection # create persistent connection
end
def connection
- return @connection if @connection
-
- needs_ssl = @remote_uri.scheme == "https" ||
- Bundler.settings[:ssl_verify_mode] ||
- Bundler.settings[:ssl_client_cert]
- raise SSLError if needs_ssl && !defined?(OpenSSL)
-
- @connection = Net::HTTP::Persistent.new 'bundler', :ENV
+ @connection ||= begin
+ needs_ssl = @remote_uri.scheme == "https" ||
+ Bundler.settings[:ssl_verify_mode] ||
+ Bundler.settings[:ssl_client_cert]
+ raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
+
+ con = Net::HTTP::Persistent.new 'bundler', :ENV
+
+ if @remote_uri.scheme == "https"
+ con.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
+ OpenSSL::SSL::VERIFY_PEER)
+ con.cert_store = bundler_cert_store
+ end
- if @remote_uri.scheme == "https"
- @connection.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
- OpenSSL::SSL::VERIFY_PEER)
- @connection.cert_store = bundler_cert_store
- end
+ if Bundler.settings[:ssl_client_cert]
+ pem = File.read(Bundler.settings[:ssl_client_cert])
+ con.cert = OpenSSL::X509::Certificate.new(pem)
+ con.key = OpenSSL::PKey::RSA.new(pem)
+ end
- if Bundler.settings[:ssl_client_cert]
- pem = File.read(Bundler.settings[:ssl_client_cert])
- @connection.cert = OpenSSL::X509::Certificate.new(pem)
- @connection.key = OpenSSL::PKey::RSA.new(pem)
+ con.read_timeout = @api_timeout
+ con.override_headers["User-Agent"] = self.class.user_agent
+ con
end
-
- @connection.read_timeout = @api_timeout
- @connection.override_headers["User-Agent"] = self.class.user_agent
-
- @connection
end
def uri
@@ -255,9 +251,10 @@
raise HTTPError, "Too many redirects" if counter >= @redirect_limit
response = request(uri)
+ Bundler.ui.debug("HTTP #{response.code} #{response.message}")
+
case response
when Net::HTTPRedirection
- Bundler.ui.debug("HTTP Redirection")
new_uri = URI.parse(response["location"])
if new_uri.host == uri.host
new_uri.user = uri.user
@@ -265,7 +262,6 @@
end
fetch(new_uri, counter + 1)
when Net::HTTPSuccess
- Bundler.ui.debug("HTTP Success")
response.body
when Net::HTTPRequestEntityTooLarge
raise FallbackError, response.body
@@ -275,7 +271,7 @@
end
def request(uri)
- Bundler.ui.debug "Fetching from: #{uri}"
+ Bundler.ui.debug "HTTP GET #{uri}"
req = Net::HTTP::Get.new uri.request_uri
if uri.user
user = CGI.unescape(uri.user)
@@ -287,7 +283,8 @@
retry_with_auth { request(uri) }
rescue OpenSSL::SSL::SSLError
raise CertificateFailureError.new(uri)
- rescue *HTTP_ERRORS
+ rescue *HTTP_ERRORS => e
+ Bundler.ui.trace e
raise HTTPError, "Network error while fetching #{uri}"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/ui/shell.rb new/lib/bundler/ui/shell.rb
--- old/lib/bundler/ui/shell.rb 2014-07-18 08:18:49.000000000 +0200
+++ new/lib/bundler/ui/shell.rb 2014-07-24 03:15:48.000000000 +0200
@@ -56,12 +56,9 @@
end
def trace(e, newline = nil)
+ return unless debug?
msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
- if debug?
- tell_me(msg, nil, newline)
- elsif @trace
- STDERR.puts "#{msg}#{newline}"
- end
+ tell_me(msg, nil, newline)
end
def silence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/vendored_persistent.rb
new/lib/bundler/vendored_persistent.rb
--- old/lib/bundler/vendored_persistent.rb 2014-07-18 08:18:49.000000000
+0200
+++ new/lib/bundler/vendored_persistent.rb 2014-07-24 03:15:48.000000000
+0200
@@ -1,3 +1,11 @@
+# We forcibly require OpenSSL, because net/http/persistent will only autoload
+# it. On some Rubies, autoload fails but explicit require succeeds.
+begin
+ require 'openssl'
+rescue LoadError
+ # some Ruby builds don't have OpenSSL
+end
+
vendor = File.expand_path('../vendor', __FILE__)
$:.unshift(vendor) unless $:.include?(vendor)
require 'net/http/persistent'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/version.rb new/lib/bundler/version.rb
--- old/lib/bundler/version.rb 2014-07-18 08:18:49.000000000 +0200
+++ new/lib/bundler/version.rb 2014-07-24 03:15:48.000000000 +0200
@@ -2,5 +2,5 @@
# We're doing this because we might write tests that deal
# with other versions of bundler and we are unsure how to
# handle this better.
- VERSION = "1.6.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.6.5" unless defined?(::Bundler::VERSION)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler.rb new/lib/bundler.rb
--- old/lib/bundler.rb 2014-07-18 08:18:49.000000000 +0200
+++ new/lib/bundler.rb 2014-07-24 03:15:48.000000000 +0200
@@ -189,7 +189,7 @@
end
def root
- default_gemfile.dirname.expand_path
+ @root ||= default_gemfile.dirname.expand_path
end
def app_config_path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2014-07-18 08:18:49.000000000 +0200
+++ new/metadata 2014-07-24 03:15:48.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: bundler
version: !ruby/object:Gem::Version
- version: 1.6.4
+ version: 1.6.5
platform: ruby
authors:
- André Arko
@@ -11,7 +11,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rdiscount
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
