initial version wrt #218170

(Portage version: 2.1.5_rc6)

2 files changed, 128 insertions, 0 deletions

diff --git a/www-apache/passenger/files/1.0.1-gentoo.patch b/www-apache/passenger/files/1.0.1-gentoo.patch
new file mode 100644
index 000000000000..776b6458c0cc
--- /dev/null
+++ b/www-apache/passenger/files/1.0.1-gentoo.patch
@@ -0,0 +1,89 @@
+Index: passenger-1.0.1/Rakefile
+===================================================================
+--- passenger-1.0.1.orig/Rakefile
++++ passenger-1.0.1/Rakefile
+@@ -37,7 +37,7 @@ APR1_FLAGS.nil? and raise "Could not fin
+ 
+ CXX = "g++"
+ THREADING_FLAGS = "-D_REENTRANT"
+-CXXFLAGS = "#{THREADING_FLAGS} -Wall -g -I/usr/local/include " << MULTI_ARCH_FLAGS
++CXXFLAGS = "#{ENV['CXXFLAGS']} #{THREADING_FLAGS} -Wall" << MULTI_ARCH_FLAGS
+ LDFLAGS = ""
+ 
+ 
+@@ -87,8 +87,7 @@ subdir 'ext/boost/src' do
+ 		# processes, sometimes pthread errors will occur. These errors are harmless
+ 		# and should be ignored. Defining NDEBUG guarantees that boost::thread() will
+ 		# not abort if such an error occured.
+-		flags = "-O2 -fPIC -I../.. #{THREADING_FLAGS} -DNDEBUG #{MULTI_ARCH_FLAGS}"
+-		compile_cxx "*.cpp", flags
++		compile_cxx "*.cpp", "#{CXXFLAGS} -fPIC -I../.. -DNDEBUG"
+ 		create_static_library "libboost_thread.a", "*.o"
+ 	end
+ 	
+@@ -101,7 +100,7 @@ end
+ ##### Apache module
+ 
+ class APACHE2
+-	CXXFLAGS = CXXFLAGS + " -fPIC -g -DPASSENGER_DEBUG #{APR1_FLAGS} #{APXS2_FLAGS} -I.."
++	CXXFLAGS = CXXFLAGS + " -fPIC #{APR1_FLAGS} #{APXS2_FLAGS} -I.."
+ 	OBJECTS = {
+ 		'Configuration.o' => %w(Configuration.cpp Configuration.h),
+ 		'Hooks.o' => %w(Hooks.cpp Hooks.h
+Index: passenger-1.0.1/lib/passenger/platform_info.rb
+===================================================================
+--- passenger-1.0.1.orig/lib/passenger/platform_info.rb
++++ passenger-1.0.1/lib/passenger/platform_info.rb
+@@ -115,7 +115,6 @@ private
+ 		else
+ 			flags = `#{APXS2} -q CFLAGS`.strip << " -I" << `#{APXS2} -q INCLUDEDIR`
+ 			flags.strip!
+-			flags.gsub!(/-O\d? /, '')
+ 			return flags
+ 		end
+ 	end
+@@ -139,7 +138,6 @@ private
+ 				libs = `#{apr_config} --link-ld`.strip
+ 			end
+ 		end
+-		flags.gsub!(/-O\d? /, '')
+ 		return [flags, libs]
+ 	end
+ 	
+Index: passenger-1.0.1/bin/passenger-spawn-server
+===================================================================
+--- passenger-1.0.1.orig/bin/passenger-spawn-server
++++ passenger-1.0.1/bin/passenger-spawn-server
+@@ -16,7 +16,6 @@
+ #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ require 'pathname'
+-$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
+ require 'passenger/spawn_manager'
+ require 'passenger/utils'
+ 
+Index: passenger-1.0.1/lib/passenger/request_handler.rb
+===================================================================
+--- passenger-1.0.1.orig/lib/passenger/request_handler.rb
++++ passenger-1.0.1/lib/passenger/request_handler.rb
+@@ -101,7 +101,6 @@ class RequestHandler
+ 	NINJA_PATCHING_LOCK = Mutex.new
+ 	@@ninja_patched_action_controller = false
+ 	
+-	File.read("#{File.dirname(__FILE__)}/../../Rakefile") =~ /^PACKAGE_VERSION = "(.*)"$/
+ 	PASSENGER_VERSION = $1
+ 	
+ 	# The name of the socket on which the request handler accepts
+Index: passenger-1.0.1/lib/passenger/utils.rb
+===================================================================
+--- passenger-1.0.1.orig/lib/passenger/utils.rb
++++ passenger-1.0.1/lib/passenger/utils.rb
+@@ -20,7 +20,7 @@ require 'etc'
+ require 'thread'
+ require 'fastthread'
+ require 'timeout'
+-require File.expand_path("#{File.dirname(__FILE__)}/../../ext/passenger/native_support.so")
++require 'native_support'
+ 
+ module Passenger
+ 
diff --git a/www-apache/passenger/files/30_mod_passenger.conf b/www-apache/passenger/files/30_mod_passenger.conf
new file mode 100644
index 000000000000..4cf0a29f75c6
--- /dev/null
+++ b/www-apache/passenger/files/30_mod_passenger.conf
@@ -0,0 +1,39 @@
+<IfDefine PASSENGER>
+LoadModule passenger_module modules/mod_passenger.so
+
+# The location to the Passenger spawn server. This configuration option is
+# essential to Passenger. The correct value is given by the ebuild, and should
+# usually not be changed manually.
+RailsSpawnServer /usr/bin/passenger-spawn-server
+
+# This option allows one to specify the Ruby interpreter to use.
+RailsRuby /usr/bin/ruby18
+
+# Whether Passenger should automatically detect whether a virtual host's
+# document root is a Ruby on Rails application.
+RailsAutoDetect On
+
+# The maximum number of Ruby on Rails application instances that may be
+# simultaneously active. A larger number results in higher memory usage, but
+# improved ability to handle concurrent HTTP clients.
+RailsMaxPoolSize 20
+
+# The maximum number of seconds that a Ruby on Rails application instance may
+# be idle. That is, if an application instance hasn't done anything after the
+# given number of seconds, then it will be shutdown in order to conserve
+# memory.
+RailsPoolIdleTime 120
+
+# When the RailsUserSwitching option is enabled a Rails application is started
+# as the owner of the file config/environment.rb. So if
+# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will
+# launch the corresponding Rails application as joe as well.
+RailsUserSwitching On
+
+# Under no circumstances will Rails applications be run as root. If
+# environment.rb is owned by root or by an unknown user, then the Rails
+# application will run as the user specified by RailsDefaultUser.
+RailsDefaultUser apache
+</IfDefine>
+
+# vim: ts=4 filetype=apache