Hello community, here is the log from the commit of package rubygem-puma for openSUSE:Factory checked in at 2015-09-24 06:14:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-puma (Old) and /work/SRC/openSUSE:Factory/.rubygem-puma.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puma" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-puma/rubygem-puma.changes 2015-08-29 20:05:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-puma.new/rubygem-puma.changes 2015-09-24 06:14:31.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Sep 19 04:32:46 UTC 2015 - [email protected] + +- updated to version 2.14.0 + see installed History.txt + + === 2.14.0 / 2015-09-18 + + * 1 minor feature: + * Make building with SSL support optional + + * 1 bug fix: + * Use Rack::Builder if available. Fixes #735 + +------------------------------------------------------------------- Old: ---- puma-2.13.4.gem New: ---- puma-2.14.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-puma.spec ++++++ --- /var/tmp/diff_new_pack.EPe6Y6/_old 2015-09-24 06:14:31.000000000 +0200 +++ /var/tmp/diff_new_pack.EPe6Y6/_new 2015-09-24 06:14:31.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-puma -Version: 2.13.4 +Version: 2.14.0 Release: 0 %define mod_name puma %define mod_full_name %{mod_name}-%{version} ++++++ puma-2.13.4.gem -> puma-2.14.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/History.txt new/History.txt --- old/History.txt 2015-08-16 18:21:02.000000000 +0200 +++ new/History.txt 2015-09-18 18:56:34.000000000 +0200 @@ -1,3 +1,11 @@ +=== 2.14.0 / 2015-09-18 + +* 1 minor feature: + * Make building with SSL support optional + +* 1 bug fix: + * Use Rack::Builder if available. Fixes #735 + === 2.13.4 / 2015-08-16 * 1 bug fix: Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/puma_http11/extconf.rb new/ext/puma_http11/extconf.rb --- old/ext/puma_http11/extconf.rb 2015-08-16 18:21:02.000000000 +0200 +++ new/ext/puma_http11/extconf.rb 2015-09-18 18:56:35.000000000 +0200 @@ -2,8 +2,12 @@ dir_config("puma_http11") -if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and - %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')} - - create_makefile("puma/puma_http11") +unless ENV["DISABLE_SSL"] + if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and + %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')} + + have_header "openssl/bio.h" + end end + +create_makefile("puma/puma_http11") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/puma_http11/mini_ssl.c new/ext/puma_http11/mini_ssl.c --- old/ext/puma_http11/mini_ssl.c 2015-08-16 18:21:02.000000000 +0200 +++ new/ext/puma_http11/mini_ssl.c 2015-09-18 18:56:35.000000000 +0200 @@ -1,6 +1,10 @@ #define RSTRING_NOT_MODIFIED 1 + #include <ruby.h> #include <rubyio.h> + +#ifdef HAVE_OPENSSL_BIO_H + #include <openssl/bio.h> #include <openssl/ssl.h> #include <openssl/dh.h> @@ -347,6 +351,10 @@ return rb_cert_buf; } +VALUE noop(VALUE self) { + return Qnil; +} + void Init_mini_ssl(VALUE puma) { VALUE mod, eng; @@ -358,6 +366,8 @@ mod = rb_define_module_under(puma, "MiniSSL"); eng = rb_define_class_under(mod, "Engine", rb_cObject); + rb_define_singleton_method(mod, "check", noop, 0); + eError = rb_define_class_under(mod, "SSLError", rb_eStandardError); rb_define_singleton_method(eng, "server", engine_init_server, 1); @@ -371,3 +381,20 @@ rb_define_method(eng, "peercert", engine_peercert, 0); } + +#else + +VALUE raise_error(VALUE self) { + rb_raise(rb_eStandardError, "SSL not available in this build"); + return Qnil; +} + +void Init_mini_ssl(VALUE puma) { + VALUE mod, eng; + + mod = rb_define_module_under(puma, "MiniSSL"); + rb_define_class_under(mod, "SSLError", rb_eStandardError); + + rb_define_singleton_method(mod, "check", raise_error, 0); +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/binder.rb new/lib/puma/binder.rb --- old/lib/puma/binder.rb 2015-08-16 18:21:02.000000000 +0200 +++ new/lib/puma/binder.rb 2015-09-18 18:56:35.000000000 +0200 @@ -128,6 +128,8 @@ @listeners << [str, io] when "ssl" + MiniSSL.check + params = Util.parse_query uri.query require 'puma/minissl' @@ -253,6 +255,8 @@ optimize_for_latency=true, backlog=1024) require 'puma/minissl' + MiniSSL.check + host = host[1..-2] if host[0..0] == '[' s = TCPServer.new(host, port) if optimize_for_latency @@ -272,6 +276,8 @@ def inherited_ssl_listener(fd, ctx) require 'puma/minissl' + MiniSSL.check + s = TCPServer.for_fd(fd) ssl = MiniSSL::Server.new(s, ctx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/configuration.rb new/lib/puma/configuration.rb --- old/lib/puma/configuration.rb 2015-08-16 18:21:02.000000000 +0200 +++ new/lib/puma/configuration.rb 2015-09-18 18:56:35.000000000 +0200 @@ -123,10 +123,24 @@ File.basename(Dir.getwd) end + # Load and use the normal Rack builder if we can, otherwise + # fallback to our minimal version. + def rack_builder + begin + require 'rack' + require 'rack/builder' + rescue LoadError + # ok, use builtin version + return Puma::Rack::Builder + else + return ::Rack::Builder + end + end + def load_rackup raise "Missing rackup file '#{rackup}'" unless File.exist?(rackup) - rack_app, rack_options = Puma::Rack::Builder.parse_file(rackup) + rack_app, rack_options = rack_builder.parse_file(rackup) @options.merge!(rack_options) config_ru_binds = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/const.rb new/lib/puma/const.rb --- old/lib/puma/const.rb 2015-08-16 18:21:02.000000000 +0200 +++ new/lib/puma/const.rb 2015-09-18 18:56:35.000000000 +0200 @@ -99,8 +99,8 @@ # too taxing on performance. module Const - PUMA_VERSION = VERSION = "2.13.4".freeze - CODE_NAME = "A Midsummer Code's Dream".freeze + PUMA_VERSION = VERSION = "2.14.0".freeze + CODE_NAME = "Fuchsia Friday".freeze FAST_TRACK_KA_TIMEOUT = 0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/minissl.rb new/lib/puma/minissl.rb --- old/lib/puma/minissl.rb 2015-08-16 18:21:02.000000000 +0200 +++ new/lib/puma/minissl.rb 2015-09-18 18:56:35.000000000 +0200 @@ -102,6 +102,8 @@ class SSLError < StandardError # Define this for jruby even though it isn't used. end + + def self.check; end end class Context diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-08-16 18:21:02.000000000 +0200 +++ new/metadata 2015-09-18 18:56:34.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: puma version: !ruby/object:Gem::Version - version: 2.13.4 + version: 2.14.0 platform: ruby authors: - Evan Phoenix autorequire: bindir: bin cert_chain: [] -date: 2015-08-16 00:00:00.000000000 Z +date: 2015-09-18 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rdoc @@ -64,14 +64,14 @@ requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.13' + version: '3.14' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.13' + version: '3.14' description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that
