passenger 4.0.16 → 4.0.17

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSKZrGAAoJECrHRaUKISqMSw4IALeI7526hdG7s9eK1Mg1Lq2R
-AP5fKUs2NPcSs34YVNlUyWrnkYL+ekYdW1m9JvRFnQBfTi9IC4ZlTR8fl0DRujE5
-9EZotMJVqna3t/oKTHcG1ZhP9YbMH/InTs6VMtZJoXBBnlVqRsXyXusOoS95HZj8
-uVzu5lMQ2r5uy1GrWaVURjilhn+qVMRgGP8e00HBEAjCBu12WMazctIhL6uQdlPi
-vmClzAjp5MAJFFQyzqtClteobIzqRBekzgrpw6MRjiCgiCqxBRMlFsDTdOuWAnEj
-CabdEhIalAfeNHgpPDdFNO3qKYdMZKMMr4UNIST/GyttFZQynTCWpsKu/Pul6hk=
-=7YRG
+iQEcBAABAgAGBQJSLtLBAAoJECrHRaUKISqMKaMIAIcjl+ySg+pTg2eXZ/VBZM1l
+go4SMxBUG+vBZvwnRUnFKPi1kR2uWcY9+kWnw92gMC0iRAQUKO/rgroN3FE4Igti
+mF9OPKGkacZUdzTHZxP60KbzWqT9GcAWiixC+6mX5WuzGUtzGpJUkmCWzghbhhxs
+baqJA86yn3RVF4qZ1weYBSIyZZJi2boC8Z/qEXW/RR0ebbcZ2SZj3JvcHEFY7sxi
+0HmlLC+XifIJMEoubnQQeAz7urgTf5aVGn9nDYHu5ccuFGp1CEI81mlki35A2Q2f
+dJoagg6cdh46RYHLvYnAYAecWWL5m6zvLk+nSWTX82jW0Ak7DTSlUQc/LS9lNNc=
+=8iM+
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,13 @@
+Release 4.0.17
+--------------
+
+ * Fixed compilation problems on GCC 4.8 systems, such as Arch Linux 2013.04.
+   Fixes issue #941.
+ * Fixed some deprecation warnings when compiling the Ruby native extension
+   on Ruby 2.0.0.
+ * Fixed some Union Station-related stability issues.
+
+
 Release 4.0.16
 --------------
 

data/build/debian.rb

@@ -28,7 +28,7 @@ require 'build/preprocessor'
 # If you change the default distribution list, don't forget to update the configuration
 # file in passenger_apt_automation too: https://github.com/phusion/passenger_apt_automation
 ALL_DISTRIBUTIONS  = string_option("DEBIAN_DISTROS", "raring precise lucid").split(/[ ,]/)
-DEBIAN_NAME        = "ruby-passenger"
+DEBIAN_NAME        = "passenger"
 DEBIAN_EPOCH       = 1
 DEBIAN_ARCHS       = string_option("DEBIAN_ARCHS", "i386 amd64").split(/[ ,]/)
 DEBIAN_ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.debian_orig_tarball_files }
@@ -108,8 +108,8 @@ end
 
 desc "(Re)install the Debian binary packages built for local testing"
 task 'debian:dev:reinstall' do
-	package_names = ["ruby-passenger", "ruby-passenger-dev",
-		"ruby-passenger-doc", "libapache2-mod-passenger"]
+	package_names = ["passenger", "passenger-dev",
+		"passenger-doc", "libapache2-mod-passenger"]
 	package_names.each do |name|
 		if Dir["#{PKG_DIR}/#{name}_*.deb"].size > 1
 			abort "Please ensure that #{PKG_DIR} only has 1 version of the Phusion Passenger packages."
@@ -158,17 +158,29 @@ def pbuilder_base_name(distribution, arch)
 	end
 end
 
-desc "Build official Debian binary packages"
-task 'debian:binary_packages' do
+def create_debian_binary_package_task(distribution, arch)
+	task "debian:binary_package:#{distribution}_#{arch}" => 'debian:binary_packages:check' do
+		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
+		sh "cd #{PKG_DIR}/official && pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc"
+	end
+end
+
+DEBIAN_BINARY_PACKAGE_TASKS = []
+ALL_DISTRIBUTIONS.each do |distribution|
+	DEBIAN_ARCHS.each do |arch|
+		task = create_debian_binary_package_task(distribution, arch)
+		DEBIAN_BINARY_PACKAGE_TASKS << task
+	end
+end
+
+task 'debian:binary_packages:check' do
 	pkg_dir = "#{PKG_DIR}/official"
 	if !File.exist?(pkg_dir)
 		abort "Please run rake debian:source_packages first."
 	end
 
-	all_distributions = [string_option('DISTRO') || ALL_DISTRIBUTIONS].flatten
 	pbuilder_dir = File.expand_path("~/pbuilder")
-
-	all_distributions.each do |distribution|
+	ALL_DISTRIBUTIONS.each do |distribution|
 		DEBIAN_ARCHS.each do |arch|
 			pbase_name = pbuilder_base_name(distribution, arch) + "-base.tgz"
 			if !File.exist?("#{pbuilder_dir}/#{pbase_name}")
@@ -177,15 +189,11 @@ task 'debian:binary_packages' do
 			end
 		end
 	end
-
-	all_distributions.each do |distribution|
-		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
-		DEBIAN_ARCHS.each do |arch|
-			sh "cd #{pkg_dir} && pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc"
-		end
-	end
 end
 
+desc "Build official Debian binary packages"
+task 'debian:binary_packages' => DEBIAN_BINARY_PACKAGE_TASKS
+
 desc "Clean Debian packaging products, except for orig tarball"
 task 'debian:clean' do
 	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]

data/build/packaging.rb

@@ -129,8 +129,12 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			sha1 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
 				Digest::SHA1.hexdigest(f.read)
 			end
-			sh "rm -rf /tmp/homebrew"
-			sh "git clone https://github.com/mxcl/homebrew.git /tmp/homebrew"
+			homebrew_dir = "/tmp/homebrew"
+			sh "rm -rf #{homebrew_dir}"
+			sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
+			sh "cd #{homebrew_dir} && git remote add mxcl https://github.com/mxcl/homebrew.git"
+			sh "cd #{homebrew_dir} && git fetch mxcl"
+			sh "cd #{homebrew_dir} && git reset --hard mxcl/master"
 			formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
 			formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
 				abort("Unable to substitute Homebrew formula tarball filename")
@@ -139,11 +143,14 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
 				f.write(formula)
 			end
-			sh "cd /tmp/homebrew && hub pull-request 'Update passenger to version #{version}' -h release-#{version}"
+			sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
+			sh "cd #{homebrew_dir} && git push -f"
+			sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b mxcl:master"
 
 			puts "Initiating building of Debian packages"
 			command = "cd /srv/passenger_apt_automation && " +
 				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"/tools/silence-unless-failed " +
 				"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
 			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
 
@@ -165,6 +172,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			git_url = `git config remote.origin.url`.strip
 			command = "cd /srv/passenger_apt_automation && " +
 				"chpst -L /tmp/passenger_apt_automation.lock " +
+				"/tools/silence-unless-failed " +
 				"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
 			sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
 

data/build/preprocessor.rb

@@ -70,10 +70,11 @@ class Preprocessor
 		end
 		the_binding  = create_binding(variables)
 		context      = []
+		@filename    = filename
 		@lineno      = 1
 		@indentation = 0
 
-		each_line(filename) do |line|
+		each_line(filename, the_binding) do |line|
 			debug("context=#{context.inspect}, line=#{line.inspect}")
 
 			name, args_string, cmd_indentation = recognize_command(line)
@@ -144,6 +145,8 @@ class Preprocessor
 				else
 					terminate "#endif is not allowed outside #if block"
 				end
+			when "DEBHELPER"
+				output.puts(line)
 			when "", nil
 				# Either a comment or not a preprocessor command.
 				case context.last
@@ -227,11 +230,11 @@ private
 		end
 	end
 
-	def each_line(filename)
+	def each_line(filename, the_binding)
 		data = File.open(filename, 'r') do |f|
 			erb = ERB.new(f.read, nil, "-")
 			erb.filename = filename
-			erb.result(binding)
+			erb.result(the_binding)
 		end
 		data.each_line do |line|
 			yield line.chomp
@@ -312,6 +315,6 @@ private
 	end
 
 	def terminate(message)
-		abort "*** ERROR: line #{@lineno}: #{message}"
+		abort "*** ERROR: #{@filename} line #{@lineno}: #{message}"
 	end
 end

data/debian.template/control.template

@@ -1,4 +1,4 @@
-Source: ruby-passenger
+Source: passenger
 Section: ruby
 Priority: optional
 Maintainer: John Leach <john@brightbox.co.uk>
@@ -20,29 +20,31 @@ Vcs-Git: git://github.com/phusion/passenger.git
 Vcs-Browser: https://github.com/phusion/passenger
 XS-Ruby-Versions: all
 
-Package: ruby-passenger
+Package: passenger
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  rubygems (>= 1.2), ruby-rack, ruby-daemon-controller
-Recommends: ruby-passenger-doc (= ${binary:Version}), ruby-passenger-dev (= ${binary:Version}),
+Recommends: passenger-doc (= ${binary:Version}), passenger-dev (= ${binary:Version}),
  crash-watch
 Suggests: python
-Breaks: libapache2-mod-passenger (<< 1:3.9.1), passenger-common,
- passenger-common1.8, passenger-common1.9.1
-Replaces: libapache2-mod-passenger (<< 1:3.9.1), passenger-common,
- passenger-common1.8, passenger-common1.9.1
+Breaks: libapache2-mod-passenger (<< <%= DEBIAN_EPOCH %>:<%= PACKAGE_VERSION %>), passenger-common,
+ passenger-common1.8, passenger-common1.9.1, ruby-passenger
+Replaces: libapache2-mod-passenger (<< <%= DEBIAN_EPOCH %>:<%= PACKAGE_VERSION %>), passenger-common,
+ passenger-common1.8, passenger-common1.9.1, ruby-passenger
+Provides: ruby-passenger
 Description: Rails and Rack support for Apache2 and Nginx
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the
  revolutionary Ruby on Rails web framework, a breeze.
 
-Package: ruby-passenger-dev
+Package: passenger-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- ruby-passenger (= ${binary:Version})
+ passenger (= ${binary:Version})
 Suggests: python
-Replaces: passenger-dev
-Breaks: passenger-dev
+Replaces: ruby-passenger-dev
+Conflicts: ruby-passenger-dev
+Provides: ruby-passenger-dev
 Description: Rails and Rack support for Apache2 and Nginx
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the
@@ -55,7 +57,7 @@ Architecture: any
 Section: web
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-worker (>= 2.2.9-9) |
  apache2-mpm-prefork (>= 2.2.9-9) | apache2-mpm-itk (>= 2.2.9-9) | apache2-mpm-event (>= 2.2.9-9),
- ruby-passenger (= ${binary:Version})
+ passenger (= ${binary:Version})
 Description: Rails and Rack support for Apache2
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the
@@ -63,14 +65,14 @@ Description: Rails and Rack support for Apache2
  .
  This package contains the Apache 2 module required by Phusion Passenger.
 
-Package: ruby-passenger-doc
+Package: passenger-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: www-browser
-Provides: passenger-doc
-Conflicts: passenger-doc
-Replaces: passenger-doc
+Provides: ruby-passenger-doc
+Conflicts: ruby-passenger-doc
+Replaces: ruby-passenger-doc
 Description: Rails and Rack support for Apache2 - Documentation
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
  deployment of Ruby web applications, such as those built on the

data/debian.template/locations.ini.template

@@ -6,7 +6,7 @@ lib_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
 helper_scripts_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts
 resources_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
 include_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/include
-doc_dir=/usr/share/doc/ruby-passenger
+doc_dir=/usr/share/doc/passenger
 ruby_libdir=/usr/lib/ruby/vendor_ruby
 apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so
 ruby_extension_source_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ruby_extension_source

data/debian.template/passenger-doc.install.template

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/* usr/share/doc/passenger/
+CONTRIBUTORS usr/share/doc/passenger/

data/doc/Users guide Apache.txt

@@ -1132,7 +1132,7 @@ include::users_guide_snippets/enterprise_only.txt[]
 
 Specifies the I/O concurrency model that should be used for application processes. Phusion Passenger supports two concurrency models:
 
- * 'process' - single-threaded, multi-processed I/O concurrency. Each application process only has a single thread and can only handle 1 request at a time. This is the concurrency model that Ruby applications traditionally used. It has excellent compatiblity (can work with applications that are not designed to be thread-safe) but is unsuitable workloads in which the application has to wait for a lot of external I/O (e.g. HTTP API calls), and uses more memory because each process has a large memory overhead.
+ * 'process' - single-threaded, multi-processed I/O concurrency. Each application process only has a single thread and can only handle 1 request at a time. This is the concurrency model that Ruby applications traditionally used. It has excellent compatiblity (can work with applications that are not designed to be thread-safe) but is unsuitable for workloads in which the application has to wait for a lot of external I/O (e.g. HTTP API calls), and uses more memory because each process has a large memory overhead.
  * 'thread' - multi-threaded, multi-processed I/O concurrency. Each application process has multiple threads (customizable via <<PassengerThreadCount,PassengerThreadCount>>). This model provides much better I/O concurrency and uses less memory because threads share memory with each other within the same process. However, using this model may cause compatibility problems if the application is not designed to be thread-safe.
 
 This option may occur in the following places:

data/doc/Users guide Nginx.txt

@@ -1274,7 +1274,7 @@ include::users_guide_snippets/enterprise_only.txt[]
 
 Specifies the I/O concurrency model that should be used for application processes. Phusion Passenger supports two concurrency models:
 
- * 'process' - single-threaded, multi-processed I/O concurrency. Each application process only has a single thread and can only handle 1 request at a time. This is the concurrency model that Ruby applications traditionally used. It has excellent compatiblity (can work with applications that are not designed to be thread-safe) but is unsuitable workloads in which the application has to wait for a lot of external I/O (e.g. HTTP API calls), and uses more memory because each process has a large memory overhead.
+ * 'process' - single-threaded, multi-processed I/O concurrency. Each application process only has a single thread and can only handle 1 request at a time. This is the concurrency model that Ruby applications traditionally used. It has excellent compatiblity (can work with applications that are not designed to be thread-safe) but is unsuitable for workloads in which the application has to wait for a lot of external I/O (e.g. HTTP API calls), and uses more memory because each process has a large memory overhead.
  * 'thread' - multi-threaded, multi-processed I/O concurrency. Each application process has multiple threads (customizable via <<PassengerThreadCount,passenger_thread_count>>). This model provides much better I/O concurrency and uses less memory because threads share memory with each other within the same process. However, using this model may cause compatibility problems if the application is not designed to be thread-safe.
 
 This option may occur in the following places:

data/doc/users_guide_snippets/installation.txt

@@ -68,15 +68,15 @@ gem install passenger --version 3.9.1.beta --pre
 
 .Enterprise
 
-First, download the *license key* from the link:phusionpassenger.com/orders[Customer Area] and save it as '/etc/passenger-enterprise-license'.
+First, download the *license key* from the link:https://www.phusionpassenger.com/orders[Customer Area] and save it as '/etc/passenger-enterprise-license'.
 
 Next, add the Phusion Passenger Enterprise gem server to your RubyGems source list:
 
 ------------------------------------------
-gem source --add https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_gems
+gem source --add https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_gems/
 ------------------------------------------
 
-Substitute 'YOUR_ORDER_REFERENCE' and 'YOUR_PASSWORD' with your link:phusionpassenger.com/orders[Customer Area] login credentials.
+Substitute 'YOUR_ORDER_REFERENCE' and 'YOUR_PASSWORD' with your link:https://www.phusionpassenger.com/orders[Customer Area] login credentials. And notice the **trailing slash** in the URL! It is very important.
 
 Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:
 

data/ext/common/Constants.h

@@ -68,7 +68,7 @@
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_VERSION "4.0.16"
+	#define PASSENGER_VERSION "4.0.17"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Utils/MD5.h

@@ -69,8 +69,13 @@
  * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
  */
 
-typedef uint8_t md5_byte_t; /* 8-bit byte */
-typedef uint32_t md5_word_t; /* 32-bit word */
+#ifdef __cplusplus
+	typedef boost::uint8_t md5_byte_t; /* 8-bit byte */
+	typedef boost::uint32_t md5_word_t; /* 32-bit word */
+#else
+	typedef uint8_t md5_byte_t; /* 8-bit byte */
+	typedef uint32_t md5_word_t; /* 32-bit word */
+#endif
 
 /** Size of an MD5 checksum, in bytes. */
 #define MD5_SIZE      16

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1722,10 +1722,12 @@ private:
 				return;
 			}
 
-			client->options.analytics = true;
-			client->options.unionStationKey = key;
 			client->options.logger = loggerFactory->newTransaction(
 				options.getAppGroupName(), "requests", key, filters);
+			if (!client->options.logger->isNull()) {
+				client->options.analytics = true;
+				client->options.unionStationKey = key;
+			}
 			
 			client->beginScopeLog(&client->scopeLogs.requestProcessing, "request processing");
 

data/ext/ruby/extconf.rb

@@ -36,6 +36,7 @@ end
 
 have_header('alloca.h')
 have_header('ruby/io.h')
+have_func('rb_thread_io_blocking_region')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')

data/ext/ruby/passenger_native_support.c

@@ -77,6 +77,10 @@
 	/* Linux doesn't define IOV_MAX in limits.h for some reason. */
 	#define IOV_MAX sysconf(_SC_IOV_MAX)
 #endif
+#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+	/* Ruby doesn't define this function in its headers */
+	VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
+#endif
 
 static VALUE mPassenger;
 static VALUE mNativeSupport;
@@ -311,8 +315,13 @@ f_generic_writev(VALUE fd, VALUE *array_of_components, unsigned int count) {
 				writev_wrapper_data.filedes = fd_num;
 				writev_wrapper_data.iov     = groups[i].io_vectors;
 				writev_wrapper_data.iovcnt  = groups[i].count;
-				ret = (int) rb_thread_blocking_region(writev_wrapper,
-					&writev_wrapper_data, RUBY_UBF_IO, 0);
+				#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+					ret = (int) rb_thread_io_blocking_region(writev_wrapper,
+						&writev_wrapper_data, fd_num);
+				#else
+					ret = (int) rb_thread_blocking_region(writev_wrapper,
+						&writev_wrapper_data, RUBY_UBF_IO, 0);
+				#endif
 			#endif
 			if (ret == -1) {
 				/* If the error is something like EAGAIN, yield to another
@@ -724,11 +733,14 @@ fs_watcher_wait_fd(VALUE _fd) {
 static VALUE
 fs_watcher_read_byte_from_fd(VALUE _arg) {
 	FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
-	#ifdef TRAP_BEG
+	#if defined(TRAP_BEG)
 		TRAP_BEG;
 		data->ret = read(data->fd, &data->byte, 1);
 		TRAP_END;
 		data->error = errno;
+	#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
+		rb_thread_io_blocking_region(fs_watcher_read_byte_from_fd_wrapper,
+			data, data->fd);
 	#else
 		rb_thread_blocking_region(fs_watcher_read_byte_from_fd_wrapper,
 			data, RUBY_UBF_IO, 0);

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.16'
+	VERSION_STRING = '4.0.17'
 	
 	PREFERRED_NGINX_VERSION = '1.4.2'
 	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'

data/test/integration_tests/native_packaging_spec.rb

@@ -43,7 +43,7 @@ BINDIR = "/usr/bin"
 SBINDIR = "/usr/sbin"
 INCLUDEDIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/include"
 NGINX_ADDON_DIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
-DOCDIR = "/usr/share/doc/ruby-passenger"
+DOCDIR = "/usr/share/doc/passenger"
 RESOURCESDIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}"
 RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
 AGENTS_DIR = "/usr/lib/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/agents"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.16
+  version: 4.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -271,16 +271,16 @@ files:
 - debian.template/libapache2-mod-passenger.postinst
 - debian.template/libapache2-mod-passenger.prerm
 - debian.template/locations.ini.template
+- debian.template/passenger-dev.install.template
+- debian.template/passenger-doc.install.template
 - debian.template/passenger.conf
+- debian.template/passenger.docs
+- debian.template/passenger.install.template
 - debian.template/passenger.load
+- debian.template/passenger.manpages
 - debian.template/patches/series
 - debian.template/README.Debian
 - debian.template/repack.sh
-- debian.template/ruby-passenger-dev.install.template
-- debian.template/ruby-passenger-doc.install.template
-- debian.template/ruby-passenger.docs
-- debian.template/ruby-passenger.install.template
-- debian.template/ruby-passenger.manpages
 - debian.template/rules.template
 - debian.template/source/format
 - debian.template/watch

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSKZrGAAoJECrHRaUKISqMSgEH/0piSIDZIAab2vN4/ds5hfCC
-FcOPzSBreoKcCGVZlY+HBnS5DIRMpYr9OYhIUtJUHWxAcyfdSvU5MoaCRHFvVFEK
-s2j+gtX22SccQBfukx50d6EVBOTh8r7Aq0/Uq8EDqkq8Zd/1UcB3xcfRDhQ73OXW
-Tqe/KC7zlXw4JEClvw3s9gFOUepXWCTQex2fnkmDLNm3PQIGVc+ePuCFAbZK97gj
-L7O8Ug3lYJ1WdLQKPTx64Z2GXq5IWPnq6zTvCfzDvuSnI+UCC5K7ZBtpKk5973el
-V8Ii+y0/wdLxeWztBdDHEeQAhnEqZHRRAaDCAUhXSmFeD5nJM+dcLCZQCexvnCM=
-=0YE2
+iQEcBAABAgAGBQJSLtLBAAoJECrHRaUKISqMyXoH/jA+BtiR4so10B+sZh6P1YVY
+rmjhCHnigmgM22lYr/Pa37XosOXx/gNF2SRbseVxTCq47JhYjklx5xVV/PAyYkDn
+KZUf6ahrqhn9UGjQHaDCefqchldEklibj+CP/3VzCpNafK0q9r9MMCioNWj5oYbZ
+RxW6HIJ3DNdbrPi9S3TelkxtOGBnNGJhHC6LfDjFMWo5Wufe0ESF5S6JzPjfBoiN
+F32GGnkfSJXN8ZrCb9yAtw7LHCFCwZNJEgBs2HEntO69R2RzRSOyPGlEAWAIggmz
+Zr8qsANTZhPUmiTq3OVj9ezmz4gWzuwJWar9qwyKxAUjvf95w6CzJyl9r1wm8Vk=
+=+Cn0
 -----END PGP SIGNATURE-----

data/debian.template/ruby-passenger-doc.install.template

@@ -1,2 +0,0 @@
-debian/tmp/usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/* usr/share/doc/ruby-passenger/
-CONTRIBUTORS usr/share/doc/ruby-passenger/