[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/, www-apache/passenger/
commit: 8c743b468dab3f7e4222327acacfadcc0a1786ac
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Oct 13 07:12:25 2018 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Oct 13 07:16:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c743b46
www-apache/passenger: add 5.3.5 and use eapply for both patches
Signed-off-by: Hans de Graaff gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
www-apache/passenger/Manifest | 1 +
.../passenger/files/passenger-5.1.11-gentoo.patch | 4 +-
www-apache/passenger/passenger-5.3.5.ebuild| 127 +
3 files changed, 130 insertions(+), 2 deletions(-)
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 76a5f9b5fea..fffdb68a1d0 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,4 @@
DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B
be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f
SHA512
97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
DIST passenger-5.3.3.tar.gz 7040055 BLAKE2B
1a9caa34dd809f96da84e9e3c00f365fd5a5e80c5134c25be810ad2bd9e1f01d0f64c6323211f28121590ac4d4593572c5f4392e1be2bc87d78741a0fdd73885
SHA512
ae0b4a2681e7877c7a57d236139033f17782f3d0d891ac58bbfec211e77e3ada9d36c250c9c9234d853c666d1501ccc0e2d5997c247f10985cad936ad97a741e
DIST passenger-5.3.4.tar.gz 7201951 BLAKE2B
bc67fc5a0a1a8a38918d5c36470cc9df888eb7b85304b06f283199692b18922a9077db11db374fded091f851d5af67e7852d662f0e22a7ac4d49381eae35cbf9
SHA512
08fa0b06ae85cd48c748739be77713752c989ef031910441c243b5beacef398d544c41c87faa05a4d3f088da048b20ff5923d368ca12e0e2fd815726e9ce8c1a
+DIST passenger-5.3.5.tar.gz 7217952 BLAKE2B
80fca5713590c73b7d6afa73b5d3e323188ba6496082d0203dd09ee7d52d9751c6780ef1f68cb646722973743dfecf3aa810019c68a3f3ff0220a42de84d4081
SHA512
3b892f5d86247913572eb28541625f62fc22efba907541f5d3ef8a2d3a7bc81b7d90d5789650353bb4f2e11184e9ac272ea3d954db20ad5c6f9c9bdc52d2d035
diff --git a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
index 5a2565c0315..5981ead136f 100644
--- a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
+++ b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
@@ -1,5 +1,5 @@
build/packaging.rb.~1~ 2013-10-27 00:00:00.0 +0200
-+++ build/packaging.rb 2015-09-28 07:44:04.584236386 +0200
+--- a/build/packaging.rb.~1~ 2013-10-27 00:00:00.0 +0200
b/build/packaging.rb 2015-09-28 07:44:04.584236386 +0200
@@ -575,7 +575,7 @@
psg_ruby = ENV['RUBY'] || "#{fs_bindir}/ruby"
psg_free_ruby = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
diff --git a/www-apache/passenger/passenger-5.3.5.ebuild
b/www-apache/passenger/passenger-5.3.5.ebuild
new file mode 100644
index 000..3e6bbbe2025
--- /dev/null
+++ b/www-apache/passenger/passenger-5.3.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/;
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+ >=dev-ruby/rack-1.0.0:*
+ >=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+ >=dev-libs/libuv-1.8.0
+ net-misc/curl[ssl]
+ apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+ use debug && append-flags -DPASSENGER_DEBUG
+ depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+ eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+ eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+ # Change these with sed instead of a patch so that we can easily use
+ # the toolchain-funcs methods.
+ sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+ -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+ -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+ # Avoid fixed debugging CFLAGs.
+ sed -e '/debugging_cflags/areturn ""' -i
src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+ # Use sed here so that we can dynamically set the documentation
directory.
+ sed -i -e
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/
commit: 2ca6f81d821bc24b896a53f697f292bacdf50f64
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Feb 3 19:07:47 2018 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Feb 17 08:37:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca6f81d
www-apache/passenger: remove unused patch
.../passenger/files/passenger-5.0.20-gentoo.patch | 30 --
1 file changed, 30 deletions(-)
diff --git a/www-apache/passenger/files/passenger-5.0.20-gentoo.patch
b/www-apache/passenger/files/passenger-5.0.20-gentoo.patch
deleted file mode 100644
index a9fe95f6b25..000
--- a/www-apache/passenger/files/passenger-5.0.20-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
build/packaging.rb.~1~ 2013-10-27 00:00:00.0 +0200
-+++ build/packaging.rb 2015-09-28 07:44:04.584236386 +0200
-@@ -575,7 +575,7 @@
- psg_ruby = ENV['RUBY'] || "#{fs_bindir}/ruby"
- psg_free_ruby = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
-
-- fakeroot = "pkg/fakeroot"
-+ fakeroot = ENV['DISTDIR']
- fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
- fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
- fake_libdir = "#{fakeroot}#{psg_libdir}"
-@@ -593,7 +593,6 @@
-
- packaging_method = ENV['NATIVE_PACKAGING_METHOD'] ||
ENV['PACKAGING_METHOD'] || "deb"
-
-- sh "rm -rf #{fakeroot}"
- sh "mkdir -p #{fakeroot}"
-
- # Ruby sources
-@@ -690,10 +689,6 @@
- change_shebang("#{fake_sbindir}/#{exe}", shebang)
- end
-
-- # Apache 2 module
-- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
-- sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
--
- # Ruby extension sources
- sh "mkdir -p #{fake_ruby_extension_source_dir}"
- sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/*
#{fake_ruby_extension_source_dir}"
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/
commit: e10214086dd87aa49b4884408e999c3220095a27
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Aug 11 05:36:14 2017 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Aug 11 05:36:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1021408
www-apache/passenger: remove unused files
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../passenger/files/30_mod_passenger-4.0.0.conf| 63 --
.../passenger/files/passenger-4.0.49-gentoo.patch | 30 ---
2 files changed, 93 deletions(-)
diff --git a/www-apache/passenger/files/30_mod_passenger-4.0.0.conf
b/www-apache/passenger/files/30_mod_passenger-4.0.0.conf
deleted file mode 100644
index f218b59ca41..000
--- a/www-apache/passenger/files/30_mod_passenger-4.0.0.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-
-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/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
-
-# 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 specifies the default global version of Ruby to use.
-PassengerDefaultRuby /usr/bin/ruby
-
-# This option allows one to specify the Ruby interpreter to use for
-# specific instances.
-# PassengerRuby /usr/bin/ruby
-
-# 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
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/passenger/files/passenger-4.0.49-gentoo.patch
b/www-apache/passenger/files/passenger-4.0.49-gentoo.patch
deleted file mode 100644
index 8365fbd20fb..000
--- a/www-apache/passenger/files/passenger-4.0.49-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
build/packaging.rb.~1~ 2013-10-27 00:00:00.0 +0200
-+++ build/packaging.rb 2014-08-23 08:35:20.372738004 +0200
-@@ -429,7 +429,7 @@
- psg_ruby_extension_source_dir =
"#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
- psg_nginx_module_source_dir =
"#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
-
-- fakeroot = "pkg/fakeroot"
-+ fakeroot = ENV['DISTDIR']
- fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
- fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
- fake_libdir = "#{fakeroot}#{psg_libdir}"
-@@ -447,7 +447,6 @@
-
- native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
-
-- sh "rm -rf #{fakeroot}"
- sh "mkdir -p #{fakeroot}"
-
- # Ruby sources
-@@ -532,10 +531,6 @@
- end
- end
-
-- # Apache 2 module
-- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
-- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
--
- # Ruby extension sources
- sh "mkdir -p #{fake_ruby_extension_source_dir}"
-
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/
commit: b1eaad7341c2c328cf19e7a2f62b994df51b7695
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Tue Feb 14 18:29:51 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Feb 14 21:39:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1eaad73
www-apache/passenger: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3968
.../passenger/files/passenger-4.0.10-gentoo.patch | 48 --
.../passenger/files/passenger-4.0.18-gentoo.patch | 39 --
.../passenger/files/passenger-4.0.21-gentoo.patch | 40 --
.../passenger/files/passenger-4.0.33-gentoo.patch | 30 --
.../passenger/files/passenger-5.0.4-gentoo.patch | 30 --
5 files changed, 187 deletions(-)
diff --git a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch
b/www-apache/passenger/files/passenger-4.0.10-gentoo.patch
deleted file mode 100644
index 808f988c7a..00
--- a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
build/packaging.rb.~1~ 2013-07-09 10:10:02.0 +0200
-+++ build/packaging.rb 2013-07-17 10:25:33.287663252 +0200
-@@ -184,7 +184,7 @@
- require 'rbconfig'
- require 'fileutils'
- include RbConfig
-- 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
build/packaging.rb.~1~ 2013-07-17 13:06:40.199882060 +0200
-+++ build/packaging.rb 2013-07-17 13:18:31.444209611 +0200
-@@ -189,9 +189,9 @@
- # 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.
-- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
-+ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
- fake_libdir = "#{fakeroot}/usr/lib/passenger"
-- fake_native_support_dir =
"#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-+ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
- fake_agents_dir =
"#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
- fake_helper_scripts_dir =
"#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
- fake_resources_dir = "#{fakeroot}/usr/share/passenger"
build/packaging.rb.~1~ 2013-07-17 13:19:21.434826846 +0200
-+++ build/packaging.rb 2013-07-17 13:21:42.954912287 +0200
-@@ -276,10 +276,6 @@
- sh "cp bin/#{exe} #{fake_sbindir}/"
- end
-
-- # Apache 2 module
-- sh "mkdir -p #{fake_apache2_module_dir}"
-- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
--
- # Ruby extension sources
- sh "mkdir -p #{fake_ruby_extension_source_dir}"
- sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/*
#{fake_ruby_extension_source_dir}"
build/packaging.rb.~1~ 2013-07-17 13:25:51.440038844 +0200
-+++ build/packaging.rb 2013-07-17 13:33:30.151365870 +0200
-@@ -203,7 +203,6 @@
- fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
- fake_ruby_extension_source_dir =
"#{fakeroot}/usr/share/passenger/ruby_extension_source"
-
-- sh "rm -rf #{fakeroot}"
- sh "mkdir -p #{fakeroot}"
-
- # Ruby sources
diff --git a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
deleted file mode 100644
index 7eb7c33920..00
--- a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
build/packaging.rb.~1~ 2013-09-14 10:09:56.0 +0200
-+++ build/packaging.rb 2013-10-05 15:03:51.474846961 +0200
-@@ -306,14 +306,14 @@
- require 'rbconfig'
- require 'fileutils'
- include RbConfig
-- 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.
-- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
-+ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
- fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
-- fake_native_support_dir =
"#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
-+ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
- fake_agents_dir =
"#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
- fake_helper_scripts_dir =
"#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
- fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
-@@ -326,7 +326,6 @@
- fake_ruby_extension_source_dir =
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/
commit: d9b04e6c5c0be0f304bbd0a7d2a86b998f72a062
Author: Hans de Graaff gentoo org>
AuthorDate: Mon Sep 28 06:12:31 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Mon Sep 28 06:12:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b04e6c
www-apache/passenger: remove obsolete files
Package-Manager: portage-2.2.20.1
.../files/2.2.15-gentoo-multilib-strict.patch | 33 -
www-apache/passenger/files/2.2.4-gentoo.patch | 42 ---
.../passenger/files/30_mod_passenger-2.0.1.conf| 63 --
.../passenger/files/passenger-3.0.0-gentoo.patch | 34 -
.../passenger/files/passenger-3.0.0-ldflags.patch | 13 --
.../passenger/files/passenger-3.0.12-ldflags.patch | 10 --
.../files/passenger-3.0.21-temp-file-usage.patch | 140 -
.../passenger/files/passenger-3.0.8-gentoo.patch | 35 --
8 files changed, 370 deletions(-)
diff --git a/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch
b/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch
deleted file mode 100644
index ff6cefc..000
--- a/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar passenger-2.2.15.orig/Rakefile passenger-2.2.15/Rakefile
passenger-2.2.15.orig/Rakefile 2010-11-05 03:19:02.0 +
-+++ passenger-2.2.15/Rakefile 2010-11-05 03:23:45.0 +
-@@ -744,7 +744,7 @@
- extdir = "#{libdir}/#{CONFIG['arch']}"
- bindir = "#{fakeroot}/usr/bin"
- docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
-- libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
-+ libexecdir = "#{fakeroot}/usr/libexec/phusion_passenger"
-
- sh "rm -rf #{fakeroot}"
- sh "mkdir -p #{fakeroot}"
-diff -Nuar passenger-2.2.15.orig/ext/common/Utils.cpp
passenger-2.2.15/ext/common/Utils.cpp
passenger-2.2.15.orig/ext/common/Utils.cpp 2010-06-24 11:53:02.0
+
-+++ passenger-2.2.15/ext/common/Utils.cpp 2010-11-05 03:22:39.0
+
-@@ -113,7 +113,7 @@
- return path;
- } else {
- path.assign(root);
--
path.append("lib/phusion_passenger/passenger-spawn-server");
-+
path.append("libexec/phusion_passenger/passenger-spawn-server");
- return path;
- }
- return path;
-@@ -152,7 +152,7 @@
- return path;
- } else {
- path.assign(root);
--
path.append("lib/phusion_passenger/ApplicationPoolServerExecutable");
-+
path.append("libexec/phusion_passenger/ApplicationPoolServerExecutable");
- return path;
- }
- }
diff --git a/www-apache/passenger/files/2.2.4-gentoo.patch
b/www-apache/passenger/files/2.2.4-gentoo.patch
deleted file mode 100644
index cd51913..000
--- a/www-apache/passenger/files/2.2.4-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
Rakefile.~1~ 2009-05-19 11:48:28.236986307 +0200
-+++ Rakefile 2009-05-19 11:50:53.0 +0200
-@@ -38,11 +38,7 @@
-
- CXX = "g++"
- LIBEXT = PlatformInfo.library_extension
--if OPTIMIZE
-- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2
-DBOOST_DISABLE_ASSERTS"
--else
-- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags}
-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
--end
-+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
-
- # Extra compiler flags that should always be passed to the C/C++ compiler.
- # Should be included last in the command string.
-@@ -733,15 +729,15 @@
- 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/phusion_passenger"
-+ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
- libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
-
- sh "rm -rf #{fakeroot}"
-@@ -757,7 +753,6 @@
- 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
deleted file mode 100644
index 0bd7914..000
---
