version bump wrt #229449

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64

6 files changed, 141 insertions, 118 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 6631927803a2..ecb8e6916e7a 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.3 2008/06/01 11:06:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.4 2008/07/01 19:36:16 hollow Exp $
+
+*passenger-2.0.1 (01 Jul 2008)
+
+  01 Jul 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/30_mod_passenger-2.0.1.conf, -files/1.0.1-gentoo.patch,
+  +files/2.0.1-gentoo.patch, -passenger-1.0.1.ebuild,
+  +passenger-2.0.1.ebuild:
+  version bump wrt #229449
 
   01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> passenger-1.0.5.ebuild:
   fix patch
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index a403d9fdd871..fa336d66201e 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.0.1-gentoo.patch 3258 RMD160 da519d9959dcd132008db8b25d3c81673b461f8a SHA1 fa6568451ea78166856a2cebd2bc56c845bd8519 SHA256 6b3a8f36312367b4b1c77be4ab7b595458f1a439ef9745c303e32c383c25fc82
 AUX 1.0.5-gentoo.patch 3658 RMD160 448b31ea9a8ef8dbf24e64ccbe425c76941e4a4c SHA1 fe875ef07f07127e8d8781b3379b9af895948df9 SHA256 16a96e13f756762eb71e0fa92f11d335620a8ffba8b12bbdbeaf8b0484760e34
+AUX 2.0.1-gentoo.patch 2152 RMD160 ecb1691c26d50ed2a7ff2877003db9b2d8b0f9c2 SHA1 42873c6c22471e5614d658b2c99be7679ff929e7 SHA256 9863ceedfdd30feb74429aa844637e14a46c1d7700719a30af82316f15e163fd
+AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 AUX 30_mod_passenger.conf 1602 RMD160 0b50a86b3e79884ab18cd85f398c1fe9bac5d6ff SHA1 3343f8f65edb48e084ff847f8ed7d571fb5e14f4 SHA256 12ba5a6090dd3e660bef69c5c69bac6255d2237fc04f6ec6ecac53dc5dacca26
-DIST passenger-1.0.1.tar.gz 1668684 RMD160 61495ce6eae6c8aa8d2261ec7527598c99c6369f SHA1 68500f5ae5b520cfb482082c90c5863f6e30b2c1 SHA256 0be68fbf99f3c0da5eec812fd14b45263e2719196c1e2588dca8fbe926479c58
 DIST passenger-1.0.5.tar.gz 1689058 RMD160 4a1045804945db04a5a6ea85415082fa26edcebf SHA1 2277729c296b9fe9d83482c528d3b8dbdc714cec SHA256 4b41b1a0a9d59acd310f3730dae0dfe3a96de17825c6bb325e2cc93eb731e510
-EBUILD passenger-1.0.1.ebuild 1564 RMD160 76fda40d17c0da2c1774abf0a986cea8d5b7497d SHA1 06f441a6cda361903fbba54fe320c71a9cc4eafb SHA256 9346405367c14f7064b165006f6ae526466a202a9dd0af918844a9f1c14fc686
+DIST passenger-2.0.1.tar.gz 1436825 RMD160 900701eeac7d7d37d9f7e745fc0930d58c0a8a2b SHA1 79c022a9de8cd5d9d059571a117239fc14670d2d SHA256 e2ff57708909c4bc286588adfe50d40c1d01c3e743f6569164b1feb05b97b3c6
 EBUILD passenger-1.0.5.ebuild 1564 RMD160 f8497b1ba9a0ed65ab69bf54e3b1e8192847eb54 SHA1 2388c081e92c2c7298416412294330e5516a1bdd SHA256 a516d7d12ec9f6d95b8438aee06db799206ae02622c19cb0661f738004172b08
-MISC ChangeLog 676 RMD160 93dc1da94a2e889790ef96bc38c0021f3d388738 SHA1 84f7854bcc1afbcb51102765473b87991d2e281f SHA256 2474231641966a2670b8931d008b103bd277349c32bfc75a42e073bb02de118e
+EBUILD passenger-2.0.1.ebuild 1241 RMD160 ac4f616b7676b0e6eb3d30586758c8972b4f9408 SHA1 e2896515c29dd7a0b08b1547ee856afe47470439 SHA256 ef3a3c46edc59222c9b9b9796cdde553cd619bc326413f8d0d3de5709e886998
+MISC ChangeLog 932 RMD160 3d76dce10aeae7a94953a3b44e85ab89fef6ceae SHA1 c4615f7f4bfd72816e1eb0ac37afd43c0ddbc2b3 SHA256 00ddb68d2f7178ca0778eb8fbd6d0995e1c643ab378ed663cdc08954c771783d
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhCgrQACgkQmPFBzbX68WF67gCgjDEYup7HAm+sQHrbIwVtu9ft
-j8oAniarL6aRXTugYRMdwV4vmfC9eVLf
-=7rHm
+iEYEARECAAYFAkhqhz0ACgkQmPFBzbX68WGeyQCeOUbYQP4kOo0JHojDdyGxyZPn
+A3QAniGZ565/DedYUGoA+RhgLPe4uCQY
+=928k
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/1.0.1-gentoo.patch b/www-apache/passenger/files/1.0.1-gentoo.patch
deleted file mode 100644
index 776b6458c0cc..000000000000
--- a/www-apache/passenger/files/1.0.1-gentoo.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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/2.0.1-gentoo.patch b/www-apache/passenger/files/2.0.1-gentoo.patch
new file mode 100644
index 000000000000..cf8c6420b5ce
--- /dev/null
+++ b/www-apache/passenger/files/2.0.1-gentoo.patch
@@ -0,0 +1,55 @@
+Index: passenger-2.0.1/Rakefile
+===================================================================
+--- passenger-2.0.1.orig/Rakefile
++++ passenger-2.0.1/Rakefile
+@@ -38,12 +38,8 @@ APR_FLAGS.nil? and raise "Could not find
+ 
+ CXX = "g++"
+ THREADING_FLAGS = "-D_REENTRANT"
+-if OPTIMIZE
+-	OPTIMIZATION_FLAGS = "-O2 -DNDEBUG"
+-else
+-	OPTIMIZATION_FLAGS = "-g -DPASSENGER_DEBUG"
+-end
+-CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall -I/usr/local/include #{MULTI_ARCH_FLAGS}"
++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
++CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall #{MULTI_ARCH_FLAGS}"
+ LDFLAGS = ""
+ 
+ 
+@@ -156,7 +152,7 @@ subdir 'ext/apache2' do
+ 	] do
+ 		create_executable "ApplicationPoolServerExecutable",
+ 			'ApplicationPoolServerExecutable.cpp System.o Utils.o Logging.o',
+-			"-I.. #{CXXFLAGS} #{LDFLAGS} -DPASSENGER_DEBUG ../boost/src/libboost_thread.a -lpthread"
++			"-I.. #{CXXFLAGS} #{LDFLAGS} ../boost/src/libboost_thread.a -lpthread"
+ 	end
+ 	
+ 	file 'mod_passenger.o' => ['mod_passenger.c'] do
+@@ -476,15 +472,15 @@ desc "Create a fakeroot, useful for buil
+ task :fakeroot => [:apache2, :native_support, :doc] do
+ 	require 'rbconfig'
+ 	include Config
+-	fakeroot = "pkg/fakeroot"
++	fakeroot = ENV['DISTDIR']
+ 
+ 	# We don't use CONFIG['archdir'] and the like because we want
+ 	# the files to be installed to /usr, and the Ruby interpreter
+ 	# on the packaging machine might be in /usr/local.
+-	libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
++	libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
+ 	extdir = "#{libdir}/#{CONFIG['arch']}"
+ 	bindir = "#{fakeroot}/usr/bin"
+-	docdir = "#{fakeroot}/usr/share/doc/passenger"
++	docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
+ 	libexecdir = "#{fakeroot}/usr/lib/passenger"
+ 	
+ 	sh "rm -rf #{fakeroot}"
+@@ -503,7 +499,6 @@ task :fakeroot => [:apache2, :native_sup
+ 	sh "cp bin/* #{bindir}/"
+ 	
+ 	sh "mkdir -p #{libexecdir}"
+-	sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
+ 	sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
+ 	sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
+ 	
diff --git a/www-apache/passenger/files/30_mod_passenger-2.0.1.conf b/www-apache/passenger/files/30_mod_passenger-2.0.1.conf
new file mode 100644
index 000000000000..b0fb7a1e712f
--- /dev/null
+++ b/www-apache/passenger/files/30_mod_passenger-2.0.1.conf
@@ -0,0 +1,63 @@
+<IfDefine PASSENGER>
+LoadModule passenger_module modules/mod_passenger.so
+
+# The location to the Phusion Passenger root directory. This configuration
+# option is essential to Phusion Passenger. The correct value is given by the
+# installer, and should usually not be changed manually.
+PassengerRoot /usr
+
+# This option allows one to specify how much information Phusion Passenger
+# should write to the Apache error log file. A higher log level value means
+# that more information will be logged.
+#
+# Possible values are:
+#
+#    0: Show only errors and warnings.
+#    1: Show the most important debugging information. This might be useful for
+#       system administrators who are trying to figure out the cause of a
+#       problem.
+#    2: Show more debugging information. This is typically only useful for
+#       developers.
+#    3: Show even more debugging information.
+PassengerLogLevel 0
+
+# This option allows one to specify the Ruby interpreter to use.
+PassengerRuby /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.
+PassengerMaxPoolSize 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.
+PassengerPoolIdleTime 120
+
+# The maximum number of application instances that may be simultaneously active
+# for a single application. This helps to make sure that a single application
+# will not occupy all available slots in the application pool.
+#
+# This value must be less than PassengerMaxPoolSize. A value of 0 means that
+# there is no limit placed on the number of instances a single application may
+# use, i.e. only the global limit of PassengerMaxPoolSize will be enforced.
+PassengerMaxInstancesPerApp 0
+
+# When the PassengerUserSwitching 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.
+PassengerUserSwitching 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 PassengerDefaultUser.
+PassengerDefaultUser apache
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/passenger/passenger-1.0.1.ebuild b/www-apache/passenger/passenger-2.0.1.ebuild
index ae15864faf5f..1916a307b85b 100644
--- a/www-apache/passenger/passenger-1.0.1.ebuild
+++ b/www-apache/passenger/passenger-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-1.0.1.ebuild,v 1.1 2008/04/25 10:56:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.0.1.ebuild,v 1.1 2008/07/01 19:36:16 hollow Exp $
 
 inherit apache-module flag-o-matic ruby
 
@@ -22,7 +22,7 @@ DEPEND=">=dev-lang/ruby-1.8.5
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
-APACHE2_MOD_CONF="30_mod_${PN}"
+APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
 APACHE2_MOD_DEFINE="PASSENGER"
 
 need_apache2_2
@@ -34,34 +34,19 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
-
-	# set version here to prevent Rakefile parsing
-	sed -i -e "s/\(PASSENGER_VERSION\) = .*/\1 = '${PV}'/" \
-		lib/passenger/request_handler.rb
+	rm -f bin/passenger-install-apache2-module
 }
 
 src_compile() {
-	cd "${S}"/ext/passenger
-	ruby_src_compile
-
-	cd "${S}"
 	APXS2="${APXS}" \
 	HTTPD="${APACHE_BIN}" \
-	rake apache2 || die "rake apache2 failed"
+	rake apache2 native_support doc || die "rake failed"
 }
 
 src_install() {
-	( # dont want to pollute calling env
-		insinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
-		doins -r lib/passenger
-	) || die "failed to install passenger lib"
-
-	dobin bin/passenger-spawn-server
-
-	cd "${S}"/ext/passenger
-	ruby_einstall
+	DISTDIR="${D}" \
+	rake fakeroot || die "rake failed"
 
 	apache-module_src_install
 }