passenger 4.0.59 → 4.0.60

data/ext/common/ApplicationPool2/SmartSpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2013 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -336,6 +336,9 @@ private:
 				"ruby_libdir: " + config->resourceLocator.getRubyLibDir() + "\n"
 				"passenger_version: " PASSENGER_VERSION "\n"
 				"generation_dir: " + generation->getPath() + "\n";
+			if (!details.options->groupSecret.empty()) {
+				data.append("connect_password: " + details.options->groupSecret + "\n");
+			}
 
 			vector<string> args;
 			vector<string>::const_iterator it, end;

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.59"
+	#define PASSENGER_VERSION "4.0.60"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/nginx/ContentHandler.c

@@ -320,6 +320,18 @@ header_is_transfer_encoding(ngx_str_t *key)
         ngx_strncasecmp(key->data + 1, (u_char *) "ransfer-encodin", sizeof("ransfer-encodin") - 1) == 0;
 }
 
+static int
+header_contains_non_alphanumdash(ngx_str_t *key)
+{
+	unsigned int i;
+	for (i = 0; i < key->len; i++) {
+		u_char c = key->data[i];
+		if (!(c >= 'a' && c <= 'z') && !(c >= 'A' && c <= 'Z') && !(c == '-') && !(c >= '0' && c <= '9')) {
+			return 1;
+		}
+	}
+	return 0;
+}
 
 static ngx_int_t
 create_request(ngx_http_request_t *r)
@@ -490,7 +502,7 @@ create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
-            if (!header_is_transfer_encoding(&header[i].key)) {
+            if (!header_is_transfer_encoding(&header[i].key) && !header_contains_non_alphanumdash(&header[i].key)) {
                 len += sizeof("HTTP_") - 1 + header[i].key.len + 1
                     + header[i].value.len + 1;
             }
@@ -674,6 +686,10 @@ create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
+            if (header_contains_non_alphanumdash(&header[i].key)) {
+            	continue;
+            }
+
             if (header_is_transfer_encoding(&header[i].key)) {
                 continue;
             }

data/lib/phusion_passenger.rb

@@ -30,10 +30,10 @@ module PhusionPassenger
 
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.59'
+	VERSION_STRING = '4.0.60'
 
-	PREFERRED_NGINX_VERSION = '1.6.2'
-	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'
+	PREFERRED_NGINX_VERSION = '1.6.3'
+	NGINX_SHA256_CHECKSUM = '0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757'
 
 	PREFERRED_PCRE_VERSION  = '8.34'
 	PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
@@ -214,8 +214,7 @@ module PhusionPassenger
 
 	def self.binaries_sites
 		return [
-			{ :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release",
-			  :cacert => "#{resources_dir}/oss-binaries.phusionpassenger.com.crt" },
+			{ :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release" },
 			{ :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release" }
 		]
 	end

data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -2,7 +2,8 @@ define 'openssl-dev' do
 	name "OpenSSL development headers"
 	website "http://www.openssl.org/"
 	define_checker do
-		check_for_header('openssl/ssl.h')
+		check_for_header('openssl/ssl.h', :c,
+			PlatformInfo.openssl_extra_cflags)
 	end
 
 	on :debian do
@@ -19,7 +20,7 @@ define 'libcurl-dev' do
 	define_checker do
 		PhusionPassenger.require_passenger_lib 'platform_info/curl'
 		result = { :found => false }
-		
+
 		if !(curl_config = PlatformInfo.find_command('curl-config'))
 			result[:error] = "Cannot find the `curl-config` command."
 			next result
@@ -65,7 +66,7 @@ define 'libcurl-dev' do
 
 		result
 	end
-	
+
 	install_instructions "Please download Curl from <b>#{website}</b> " +
 		"and make sure you install it <b>with SSL support</b>."
 	on :debian do

data/lib/phusion_passenger/platform_info/openssl.rb

@@ -0,0 +1,61 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2015 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+
+module PhusionPassenger
+
+module PlatformInfo
+	def self.openssl_extra_cflags
+		if PlatformInfo.os_name == "macosx"
+			if File.exist?("/usr/include/openssl")
+				""
+			else
+				# OS X >= 10.11 El Capitan no longer include
+				# OpenSSL development headers. Use the one from
+				# Homebrew.
+				"-I/usr/local/opt/openssl/include"
+			end
+		else
+			""
+		end
+	end
+	memoize :openssl_extra_cflags
+
+	def self.openssl_extra_ldflags
+		if PlatformInfo.os_name == "macosx"
+			if File.exist?("/usr/include/openssl")
+				""
+			else
+				"-L/usr/local/opt/openssl/lib"
+			end
+		else
+			""
+		end
+	end
+	memoize :openssl_extra_ldflags
+end
+
+end # module PhusionPassenger

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -1,7 +1,7 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,6 +30,7 @@ PhusionPassenger.require_passenger_lib 'packaging'
 PhusionPassenger.require_passenger_lib 'common_library'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 PhusionPassenger.require_passenger_lib 'standalone/utils'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
@@ -89,7 +90,7 @@ class RuntimeInstaller < AbstractInstaller
 			raise ArgumentError, ":lib_dir must be given" if !@lib_dir
 		end
 	end
-	
+
 protected
 	def dependencies
 		specs = [
@@ -115,7 +116,7 @@ protected
 		].compact
 		return [specs, ids]
 	end
-	
+
 	def users_guide_path
 		return PhusionPassenger.standalone_doc_path
 	end
@@ -179,7 +180,7 @@ private
 		if should_install_nginx?
 			nginx_binary_downloaded = download_nginx_binary
 		end
-		
+
 		should_compile_support_binaries = should_install_support_binaries? &&
 			!support_binaries_downloaded
 		should_compile_nginx = should_install_nginx? && !nginx_binary_downloaded
@@ -238,7 +239,7 @@ private
 			puts "     No binaries are available for your platform. Will compile them from source"
 			return false
 		end
-		
+
 		FileUtils.mkdir_p(@support_dir)
 		Dir.mkdir("#{@working_dir}/support")
 		Dir.chdir("#{@working_dir}/support") do
@@ -333,7 +334,7 @@ private
 			end
 		end
 		nginx_sources_name = "nginx-#{@nginx_version}"
-		
+
 		Dir.chdir(@working_dir) do
 			begin_progress_bar
 			begin
@@ -385,7 +386,7 @@ private
 			system "rm -rf '#{@support_dir}'/common/libboost_oxt"
 			system "rm -rf '#{@support_dir}'/*/{*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
 			system "rm -rf '#{@support_dir}'/{libeio,libev}/*.o"
-			
+
 			# Retain only the object files that are needed for linking the Phusion Passenger module into Nginx.
 			nginx_libs = COMMON_LIBRARY.
 				only(*NGINX_LIBS_SELECTOR).
@@ -405,7 +406,7 @@ private
 		end
 		puts
 	end
-	
+
 	def check_nginx_module_sources_available
 		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.nginx_module_source_dir)
 			case PhusionPassenger.native_packaging_method
@@ -454,14 +455,14 @@ private
 	ensure
 		File.unlink("#{dir}/__test__.txt") rescue nil
 	end
-	
+
 	def show_progress(progress, total, phase, total_phases, status_text = "")
 		if !phase.is_a?(Range)
 			phase = phase..phase
 		end
 		total_progress = (phase.first - 1).to_f / total_phases
 		total_progress += (progress.to_f / total) * ((phase.last - phase.first + 1).to_f / total_phases)
-		
+
 		max_width = 79
 		progress_bar_width = 45
 		text = sprintf("[%-#{progress_bar_width}s] %s",
@@ -482,24 +483,24 @@ private
 		end
 		@plugin.call_hook(:runtime_installer_progress, total_progress, status_text) if @plugin
 	end
-	
+
 	def myself
 		return `whoami`.strip
 	end
-	
+
 	def begin_progress_bar
 		if !@begun
 			@begun = true
 			puts "<banner>Installing #{PROGRAM_NAME} Standalone...</banner>"
 		end
 	end
-	
+
 	def show_possible_solutions_for_download_and_extraction_problems
 		new_screen
 		render_template "standalone/possible_solutions_for_download_and_extraction_problems"
 		puts
 	end
-	
+
 	def extract_tarball(filename)
 		File.open(filename, 'rb') do |f|
 			IO.popen("tar xzf -", "wb") do |io|
@@ -564,7 +565,7 @@ private
 			:logger => logger,
 			:use_cache => true)
 	end
-	
+
 	def run_command_with_throbber(command, status_text)
 		backlog = ""
 		IO.popen("#{command} 2>&1", "r") do |io|
@@ -583,7 +584,7 @@ private
 			exit 1
 		end
 	end
-	
+
 	def copy_files(files, target)
 		FileUtils.mkdir_p(target)
 		files.each_with_index do |filename, i|
@@ -596,15 +597,15 @@ private
 			yield(i + 1, files.size)
 		end
 	end
-	
+
 	def rake
 		return PlatformInfo.rake_command
 	end
-	
+
 	def run_rake_task!(target)
 		total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1`.split("\n").size - 1
 		backlog = ""
-		
+
 		IO.popen("#{rake} #{target} --trace STDERR_TO_STDOUT=1", "r") do |io|
 			progress = 1
 			while !io.eof?
@@ -625,7 +626,7 @@ private
 			exit 1
 		end
 	end
-	
+
 	def install_nginx_from_source(source_dir)
 		PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 		Dir.chdir(source_dir) do
@@ -635,6 +636,8 @@ private
 			nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
 				set_output_dir(lib_dir).
 				link_objects_as_string
+			extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+			extra_ldflags = PlatformInfo.openssl_extra_ldflags
 			command << "env PASSENGER_INCLUDEDIR='#{PhusionPassenger.include_dir}' " <<
 				"PASSENGER_LIBS='#{nginx_libs} #{lib_dir}/../libboost_oxt.a' "
 			# RPM thinks it's being smart by scanning binaries for
@@ -647,11 +650,13 @@ private
 			# /tmp.
 			command << "#{shell} ./configure --prefix=/tmp " <<
 				"#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " <<
+				"--with-cc-opt=#{Shellwords.escape extra_cflags} " <<
+				"--with-ld-opt=#{Shellwords.escape extra_ldflags} " <<
 				"'--add-module=#{PhusionPassenger.nginx_module_source_dir}'"
 			run_command_with_throbber(command, "Preparing web helper...") do |status_text|
 				yield(0, 1, status_text)
 			end
-			
+
 			backlog = ""
 
 			# Capture and index the `make --dry-run` output for
@@ -683,7 +688,7 @@ private
 				@stderr.puts backlog
 				exit 1
 			end
-			
+
 			yield(1, 1, 'Copying files...')
 			if !system("cp -pR objs/nginx '#{@nginx_dir}/PassengerWebHelper'")
 				@stderr.puts

data/packaging/debian/LICENSE.md

@@ -0,0 +1,19 @@
+Copyright (c) 2013-2015 Phusion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/packaging/debian/README.md

@@ -0,0 +1,320 @@
+# Phusion Passenger Debian packaging project
+
+This repository contains Debian package definitions for [Phusion Passenger](https://www.phusionpassenger.com/), as well as tools for automatically building Passenger packages for multiple distributions and architectures.
+
+The goal of this project is twofold:
+
+ 1. To allow Phusion to release Debian packages for multiple distributions and architectures, immediately after a Passenger source release, in a completely automated manner.
+ 2. To allow users to build their own Debian packages for Passenger, without having to wait for Phusion to do so.
+
+> Are you a user who wants to build your own packages for a Passenger version that hasn't been released yet? Read [Tutorial: building your own packages](#tutorial-building-your-own-packages).
+
+**Table of Contents**
+
+ * [Overview](#overview)
+ * [Development](#development)
+ * [Package building process](#package-building-process)
+   - [The build script](#the-build-script)
+   - [The test script](#the-test-script)
+   - [The publish script](#the-publish-script)
+ * [Maintenance](#maintenance)
+   - [Adding support for a new distribution](#adding-support-for-a-new-distribution)
+   - [Building Nginx packages only](#building-nginx-packages-only)
+   - [Updating SSL certificates](#updating-ssl-certificates)
+ * [Jenkins integration](#jenkins-integration)
+   - [Debugging a packaging test failure](#debugging-a-packaging-test-failure)
+ * [Tutorial: building your own packages](#tutorial-building-your-own-packages)
+ * [Related projects](#related-projects)
+
+## Overview
+
+This project consists of three major tools:
+
+ * **build** -- Given a Passenger source directory, this script builds Debian packages for it.
+ * **test** -- Given a directory with built Debian packages (as produced by the `build` script), this script runs tests against them.
+ * **publish** -- Given a directory with built Debian packages, this script publishes them to [PackageCloud](https://packagecloud.io/).
+
+Debian package definitions are located in the `debian_specs` directory:
+
+ * `debian_specs/passenger` -- Package definitions for Passenger, open source edition.
+ * `debian_specs/passenger-enterprise` -- Package definitions for [Passenger Enterprise](https://www.phusionpassenger.com/enterprise).
+ * `debian_specs/nginx` -- Package definitions for Nginx, with Passenger compiled in.
+
+Other noteworthy tools:
+
+ * `shell` -- Open a shell in the buildbox container for debugging purposes.
+ * `jenkins` -- Scripts to be run by our Jenkins continuous integration jobs, either after every commit or during release time.
+
+This project utilizes Docker for isolation. Because of the usage of Docker, these tools can be run on any 64-bit Linux system, including non-Debian-based systems. Though in practice, we've only tested on Ubuntu.
+
+## Development
+
+This repository is included as a git submodule in the Passenger git repository, under the directory `packaging/debian`. Instead of cloning the `passenger_apt_automation` repository directly, you should clone the Passenger git repository, and work in the `packaging/debian` directory instead. This scheme allows each Passenger version to lock down to a specific version of `passenger_apt_automation`.
+
+A Vagrantfile is provided so that you can develop this project in a VM. To get started, run:
+
+    host$ vagrant up
+
+The Passenger source directory (`../..`) will be automatically mounted inside the VM under `/passenger`.
+
+## Package building process
+
+The package build process is as follows. First, the `build` script is used to build Debian packages from a Passenger source code directory. Next, either the `test` script is run to test the built packages, or the `publish` script is run to publish the built packages to PackageCloud.
+
+    build   ------------>   test
+                 \
+                  \----->   publish
+
+### The build script
+
+Everything begins with the `build` script and a copy of the Passenger source code. Here's an example invocation:
+
+    ./build -p /passenger -w work -c cache -o output pkg:all
+
+ * `-p` tells it where the Passenger source code is.
+ * `-w` tells it where it's work directory is. This is a directory in which in stores temporary files while building packages. WARNING: everything inside this directory will be deleted before the build begins, so only specify a directory that doesn't contain anything important.
+ * `-c` tells it where the cache directory is. The build script caches files into this directory so that subsequent runs will be faster.
+ * `-o` tells it where to store the final built Debian packages (the output directory). WARNING: everything inside this directory will be deleted when the build finishes, so only specify a directory that doesn't contain anything important.
+ * The final argument, `pkg:all`, is the task that the build script must run. The build script provides a number of tasks, such as tasks for building packages for specific distributions or architecture only, or tasks for building source packages only. The `pkg:all` task builds all source and binary packages for all supported distributions and architectures.
+
+More command line options are available. Run `./build -h` to learn more. You can also run `./build -T` to learn which tasks are available.
+
+When the build script is finished, the output directory (`-o`) will contain one subdirectory per distribution that was built for, with each subdirectory containing packages for that distribution (in all architectures that were built for). For example:
+
+    output/
+      |
+      +-- trusty/
+      |      |
+      |      +-- *.deb
+      |      |
+      |      +-- *.dsc
+      |
+      +-- precise/
+      |      |
+      |      +-- *.deb
+      |      |
+      |      +-- *.dsc
+      |
+     ...
+
+#### Vagrant notes
+
+When using Vagrant, the directories referred to by `-w` and `-c` must be native filesystem directories. That is, they may not be located inside /vagrant, because /vagrant is a remote filesystem. I typically use `-w ~/work -c ~/cache` when developing with Vagrant.
+
+#### Troubleshooting
+
+If anything goes wrong during a build, please take a look at the various log files in the work directory. Of interest are:
+
+ * state.log -- Overview.
+ * pkg.*.log -- Build logs for a specific package, distribution and architecture.
+
+### The test script
+
+Once packages have been built, you can test them with the test script. Here is an example invocation:
+
+    ./test -p /passenger -x trusty -d output/trusty -c cache
+
+ * `-p` tells it where the Passenger source code is.
+ * `-x` tells it which distribution it should use for running the tests. To learn which distributions are supported, run `./test -h`.
+ * `-d` tells it where to find the packages that are to be tested. This must point to a subdirectory in the output directory produced by the build script, and the packages must match the test environment as specified by `-x`. For example, if you specified `-x trusty`, and if the build script stored packages in the directory `output`, then you should pass `-d output/trusty`.
+ * `-c` tells it where the cache directory is. The test script caches files into this directory so that subsequent runs will be faster.
+
+#### Vagrant notes
+
+When using Vagrant, the directory referred to by `-c` must be a native filesystem directory. That is, it may not be located inside /vagrant, because /vagrant is a remote filesystem. I typically use `-c ~/cache` when developing with Vagrant.
+
+### The publish script
+
+Once packages have been built, you can publish them to PackageCloud. The `publish` script publishes all packages inside a build script output directory. Example invocation:
+
+    ./publish -d output -c ~/.packagecloud_token -r passenger-testing publish:all
+
+ * `-d` tells it where the build script output directory is.
+ * `-c` refers to a file that contains the PackageCloud security token.
+ * `-r` tells it the name of the PackageCloud repository. For example `passenger-5`, `passenger-testing`.
+ * The last argument is the task to run. The `publish:all` publishes all packages inside the build script output directory.
+
+## Maintenance
+
+### Adding support for a new distribution
+
+There are three things you want to add support for a new distribution. In these instructions, we assume that  the new distribution is Ubuntu 15.05 "wily". Update the actual parameters accordingly.
+
+ 1. Rebuild the build box so that it has the latest distribution information:
+
+        ./docker-images/setup-buildbox-docker-image
+
+ 2. Add a definition for this new distribution to `internal/lib/distro_info.rb`.
+
+     * Add to either the `UBUNTU_DISTRIBUTIONS` or the `DEBIAN_DISTRIBUTIONS` constant.
+     * Add to the `DEFAULT_DISTROS` constant.
+
+ 3. Run `./internal/scripts/regen_distro_info_script.sh`.
+ 4. Update the package definitions in `debian_specs/`.
+ 5. Build publish packages for this distribution only. You can do that by running the build script with the `-d` option.
+
+    For example:
+
+        ./build -p /passenger -w work -c cache -o output -d wily pkg:all
+
+ 6. Create a test box for this new distribution.
+
+     1. Create `docker_images/setup-testbox-docker-image-ubuntu-15.10`
+     2. Create `docker_images/testbox-ubuntu-15.10/`
+     3. Edit `docker_images/Makefile` and add entries for this new testbox.
+     4. Run `./docker_images/setup-testbox-docker-image-ubuntu-15.10`
+
+    When done, test Passenger under the new testbox:
+
+        ./test -p /passenger -x wily -d output/wily -c cache
+
+ 7. Commit and push all changes, then publish the new packages and the updated Docker images by running:
+
+        git add docker_images
+        git commit -a -m "Add support for Ubuntu 15.10 Wily"
+        git push
+        cd docker_images
+        make upload
+
+ 8. On the Phusion CI server, pull the latest buildbox:
+
+        docker pull phusion/passenger_apt_automation_buildbox
+
+### Building Nginx packages only
+
+Sometimes you want to build Nginx packages only, without building the Phusion Passenger packages. You can do this by invoking the build script with the `pkg:nginx:all` task. For example:
+
+    ./build -p /passenger -w work -c cache -o output -d wily pkg:nginx:all
+
+After the build script finishes, you can publish these Nginx packages:
+
+    ./publish -d output -c ~/.packagecloud_token -r passenger-testing publish:all
+
+### Updating SSL certificates
+
+The Jenkins publishing script posts to some HTTPS servers. For security reasons, we pin the certificates, but these certificates expire after a while. You can update them by running:
+
+    ./internal/scripts/pin_certificates
+
+## Jenkins integration
+
+The `jenkins` directory contains scripts which are invoked from jobs in the Phusion Jenkins CI server.
+
+### Debugging a packaging test failure
+
+If a packaging test job fails, here's what you should do.
+
+ 1. Checkout the Passenger source code, go to the commit for which the test failed, then cd into the packaging/debian directory.
+
+        git clone https://github.com/phusion/passenger.git
+        git reset --hard <COMMIT FOR WHICH THE TEST FAILED>
+        cd packaging/debian
+
+ 2. If you're not on Linux, setup the Vagrant development environment and login to the VM:
+
+        vagrant up
+        vagrant ssh
+
+ 3. Build packages for the distribution for which the test failed.
+
+        ./build -w ~/work -c ~/cache -o ~/output -p /passenger -d wily -a amd64 -j 2 -R pkg:all
+
+    Be sure to customize the value passed to `-d` based on the distribution for which the test failed.
+ 4. Run the tests with the debugging console enabled:
+
+        ./test -p /passenger -x wily -d ~/output/wily -c ~/cache -D
+
+    Be sure to customize the values passed to `-x` and `-d` based on the distribution for which the test failed.
+
+If the test fails now, a shell will be opened inside the test container, in which you can do anything you want. Please note that this is a root shell, but the tests are run as the `app` user, so be sure to prefix test commands with `setuser app`. You can see in internal/test/test.sh which commands are invoked inside the container in order to run the tests.
+
+Inside the test container, you will be dropped into the directory /tmp/passenger, which is a *copy* of the Passenger source directory. The original Passenger source directory is mounted under /passenger.
+
+## Tutorial: building your own packages
+
+Are you a user who wants to build Debian packages for a Passenger version that hasn't been released yet? Maybe because you want to gain access to a bug fix that isn't part of a release yet? Then this tutorial is for you.
+
+You can follow this tutorial on any OS you want. You do not necessarily have to follow this tutorial on the OS you wish to build packages for. For example, it is possible to build packages for Ubuntu 14.04 while following this tutorial on OS X.
+
+### Prerequisites
+
+If you are following this tutorial on a Linux system, then you must [install Docker](https://www.docker.com/).
+
+If you are following this tutorial on any other OS, then you must install [Vagrant](https://www.vagrantup.com/) and [VirtualBox](https://www.virtualbox.org/).
+
+NOTE: If you are on OS X, installing boot2docker is NOT enough. You MUST use Vagrant+VirtualBox.
+
+### Step 1: Checkout out the desired source code
+
+First, clone the Passenger git repository and its submodules:
+
+    git clone git://github.com/phusion/passenger.git
+    cd passenger
+    git submodule update --init --recursive
+
+Checkout the branch you want. At the time of writing (2015 May 13), you will most likely be interested in the `stable-5.0` branch because that's the branch that is slated to become the next release version.
+
+    git checkout stable-5.0
+
+Then go to the directory `packaging/debian`:
+
+    cd packaging/debian
+
+### Step 2 (non-Linux): spin up Vagrant VM
+
+If you are on a Linux system, then you can skip to step 3.
+
+If you are not on a Linux system, then you must spin up the Vagrant VM. Type:
+
+    vagrant up
+
+Wait until the VM has booted, then run:
+
+    vagrant ssh
+
+You will now be dropped in an SSH session inside the VM. Any futher steps must be followed inside this SSH session.
+
+### Step 3: build packages
+
+Use the `./build` script to build packages. You must tell the build script which distribution and architecture it should build for. Run:
+
+    ./build -p <PATH TO PASSENGER> -w ~/work -c ~/cache -o output -a <ARCHITECTURE> -d <DISTRIBUTION> pkg:all
+
+Replace `<PATH TO PASSENGER>` with one of these:
+
+ * If you are on a Linux system, it should be `../..`.
+ * If you are on a non-Linux system (and using Vagrant), it should be `/passenger`.
+
+Replace `<ARCHITECTURE>` with either `i386` or `amd64`. Replace `<DISTRIBUTION>` with the codename of the distribution you want to build for. For example:
+
+ * `precise` -- Ubuntu 12.04
+ * `trusty` -- Ubuntu 14.04
+ * `wheezy` -- Debian 7
+ * `jessie` -- Debian 8
+
+You can find the codename of your distribution version on Wikipedia: [Ubuntu codenames](http://en.wikipedia.org/wiki/Debian#Release_timeline), [Debian codenames](http://en.wikipedia.org/wiki/Ubuntu_(operating_system)#Releases).
+
+Here is an example invocation for building packages for Ubuntu 14.04, x86_64:
+
+```bash
+# If you are on a Linux system:
+./build -p ../.. -w ~/work -c ~/cache -o output -a amd64 -d trusty pkg:all
+
+# If you are on a non-Linux system (and using Vagrant):
+./build -p /passenger -w ~/work -c ~/cache -o output -a amd64 -d trusty pkg:all
+```
+
+### Step 4: get packages, clean up
+
+When the build is finished, you can find the packages in the `output` directory.
+
+If you are on a non-Linux OS (and thus using Vagrant), you should know that this `output` directory is accessible from your host OS too. It is a subdirectory inside `<PASSENGER REPO>/packaging/debian`.
+
+If you are not on a Linux system, then you should spin down the Vagrant VM. Run this on your host OS, inside the `packaging/debian` subdirectory:
+
+    vagrant halt
+
+## Related projects
+
+ * https://github.com/phusion/passenger_autobuilder
+ * https://github.com/phusion/passenger_rpm_automation