cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support ruby22 FLAVOR for ruby-passenger

Browse Source 
Add patch to make passenger not fail at runtime on ruby 2.2.
This commit is contained in:
jeremy 2015-01-08 21:24:57 +00:00
parent 473cdf2610
commit d1f7b823f8
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/ruby-passenger/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2015/01/02 19:32:21 robert Exp $
# $OpenBSD: Makefile,v 1.39 2015/01/08 21:24:57 jeremy Exp $
COMMENT-main = Nginx module for deploying ruby applications
COMMENT-standalone = ruby web application server
@ -8,7 +8,7 @@ BROKEN-hppa = rake fails when linking PassengerHelperAgent
PASS_VERSION = 4.0.44
NGINX_VERSION = 1.4.7
DISTNAME = passenger-${PASS_VERSION}
REVISION = 1
REVISION = 2
FULLPKGNAME-main = ${MODRUBY_PKG_PREFIX}-${DISTNAME}
FULLPKGNAME-standalone = ${MODRUBY_PKG_PREFIX}-passenger-standalone-${PASS_VERSION}.${NGINX_VERSION}
FULLPKGPATH-main = ${BASE_PKGPATH},-main
@ -30,11 +30,11 @@ MULTI_PACKAGES = -main -standalone
MODULES = devel/gettext \
lang/ruby
FLAVORS = ruby18 ruby19 ruby20 ruby21
FLAVORS = ruby18 ruby19 ruby20 ruby21 ruby22
FLAVOR ?= ruby21
# Fix conflict between subpackages when using ruby21 FLAVOR
.if ${FLAVOR} == ruby21
# Fix conflict between subpackages when using ruby21/ruby22 FLAVORs
.if ${FLAVOR} == ruby21 || ${FLAVOR} == ruby22
PKG_ARGS-standalone =
.endif

25
www/ruby-passenger/patches/patch-lib_phusion_passenger_ruby_core_enhancements_rb Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-lib_phusion_passenger_ruby_core_enhancements_rb,v 1.1 2015/01/08 21:24:57 jeremy Exp $
SIGKILL is not trappable on ruby 2.2 (it's ignored in earlier ruby
versions).
Backported from upstream commit b50d031e1b76c7f2782f2673b93cc91c8e0e307a
--- lib/phusion_passenger/ruby_core_enhancements.rb.orig Thu Jan 8 12:50:41 2015
+++ lib/phusion_passenger/ruby_core_enhancements.rb Thu Jan 8 12:50:56 2015
@@ -153,7 +153,6 @@ module Signal
result.delete("QUIT")
result.delete("ILL")
result.delete("FPE")
- result.delete("KILL")
result.delete("SEGV")
result.delete("USR1")
result.delete("IOT")
@@ -172,6 +171,7 @@ module Signal
# Other stuff that we don't want to trap no matter which
# Ruby engine.
result.delete("STOP")
+ result.delete("KILL")
return result
end