Hello community,
here is the log from the commit of package rubygem-unicorn for openSUSE:Factory
checked in at 2019-06-19 21:01:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-unicorn (Old)
and /work/SRC/openSUSE:Factory/.rubygem-unicorn.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-unicorn"
Wed Jun 19 21:01:29 2019 rev:8 rq:706033 version:5.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-unicorn/rubygem-unicorn.changes
2019-03-27 16:17:31.131578334 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-unicorn.new.4811/rubygem-unicorn.changes
2019-06-19 21:01:32.618145705 +0200
@@ -1,0 +2,6 @@
+Sat Mar 16 04:13:43 UTC 2019 - Marcus Rueckert <[email protected]>
+
+- backport fix booting rails apps with 5.5.0
+ added patch: 6836d06.patch
+
+-------------------------------------------------------------------
New:
----
6836d06.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-unicorn.spec ++++++
--- /var/tmp/diff_new_pack.6wKEUE/_old 2019-06-19 21:01:33.382146347 +0200
+++ /var/tmp/diff_new_pack.6wKEUE/_new 2019-06-19 21:01:33.386146351 +0200
@@ -40,6 +40,7 @@
Source3: gem2rpm.yml
# MANUAL
Patch0: unicorn-4.6.3_fix_shebangline.patch
+Patch1: 6836d06.patch
# /MANUAL
Summary: Rack HTTP server for fast clients and Unix
License: GPL-2.0-only OR GPL-3.0-only OR Ruby
@@ -56,6 +57,7 @@
%prep
%gem_unpack
%patch0 -p0
+%patch1 -p1
find -type f -print0 | xargs -0 touch -r %{S:0}
%gem_build
++++++ 6836d06.patch ++++++
commit 6836d0674efdb1a6b79953285f10d8edd7e20432
Author: Jeremy Evans <[email protected]>
Date: Tue Mar 5 21:57:34 2019 -0800
unicorn_rails: fix regression with Rails >= 3.x in app build
Note: `unicorn_rails' was only intended for Rails <= 2.x projects
in the old days.
Fixes: 5985dd50a9bd7238 ("Support default_middleware configuration option")
From: Jeremy Evans <[email protected]>
cf.
https://bogomips.org/unicorn-public/[email protected]/
Signed-off-by: Eric Wong <[email protected]>
[ew: commit message]
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index ea4f822..354c1df 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -132,11 +132,11 @@ def rails_builder(ru, op, daemonize)
# this lambda won't run until after forking if preload_app is false
# this runs after config file reloading
- lambda do ||
+ lambda do |x, server|
# Rails 3 includes a config.ru, use it if we find it after
# working_directory is bound.
::File.exist?('config.ru') and
- return Unicorn.builder('config.ru', op).call
+ return Unicorn.builder('config.ru', op).call(x, server)
# Load Rails and (possibly) the private version of Rack it bundles.
begin
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.6wKEUE/_old 2019-06-19 21:01:33.450146404 +0200
+++ /var/tmp/diff_new_pack.6wKEUE/_new 2019-06-19 21:01:33.450146404 +0200
@@ -75,3 +75,4 @@
- series
:patches:
unicorn-4.6.3_fix_shebangline.patch: -p0
+ 6836d06.patch: -p1
++++++ series ++++++
--- /var/tmp/diff_new_pack.6wKEUE/_old 2019-06-19 21:01:33.494146441 +0200
+++ /var/tmp/diff_new_pack.6wKEUE/_new 2019-06-19 21:01:33.494146441 +0200
@@ -1 +1,2 @@
unicorn-4.6.3_fix_shebangline.patch -p0
+6836d06.patch -p1
