passenger 5.0.4 → 5.0.5

data/packaging/rpm/passenger_spec/passenger_dynamic_thread_group.patch

@@ -1,16 +0,0 @@
-diff --git a/test/oxt/dynamic_thread_group_test.cpp b/test/oxt/dynamic_thread_group_test.cpp
-index 003b7ef..5a90463 100644
---- a/test/oxt/dynamic_thread_group_test.cpp
-+++ b/test/oxt/dynamic_thread_group_test.cpp
-@@ -103,9 +103,9 @@ namespace tut {
- 	}
- 	
- 	static void create_threads(dynamic_thread_group *group) {
--		for (int i = 1000; i >= 0; i--) {
-+		for (int i = 100; i >= 0; i--) {
- 			boost::function<void ()> f(boost::bind(do_nothing, i * 1000));
--			group->create_thread(f, "", 256 * 1024);
-+			group->create_thread(f, "", 8 * 1024);
- 		}
- 	}
- 	

data/packaging/rpm/passenger_spec/passenger_tests_default_config_example.patch

@@ -1,44 +0,0 @@
-diff -up ./test/config.json.example.lindefault ./test/config.json.example
---- ./test/config.json.example.lindefault	2013-05-30 16:04:41.206533618 +0200
-+++ ./test/config.json.example	2013-05-30 16:04:34.070449358 +0200
-@@ -10,24 +10,24 @@
-   // otherwise the tests will fail.
- 
-   //// Good values for OS X:
--  "normal_user_1": "_www",
--  "normal_user_2": "daemon",
--  // Must not be "nobody".
--  "default_user": "_sandbox",
--  // Must not be normal_user_1's primary group.
--  "normal_group_1": "daemon",
--  // Must not be normal_user_2's primary group.
--  "normal_group_2": "_sandbox",
--  // Must not be default_user's primary group. Must not be "nobody".
--  "default_group": "_www",
--
--  ///// Good values for Linux and FreeBSD. Same restrictions apply.
--  //"normal_user_1": "games",
-+  //"normal_user_1": "_www",
-   //"normal_user_2": "daemon",
--  //"default_user": "man",
-+  //// Must not be "nobody".
-+  //"default_user": "_sandbox",
-+  //// Must not be normal_user_1's primary group.
-   //"normal_group_1": "daemon",
--  //"normal_group_2": "man",
--  //"default_group": "games",
-+  //// Must not be normal_user_2's primary group.
-+  //"normal_group_2": "_sandbox",
-+  //// Must not be default_user's primary group. Must not be "nobody".
-+  //"default_group": "_www",
-+
-+  ///// Good values for Linux and FreeBSD. Same restrictions apply.
-+  "normal_user_1": "games",
-+  "normal_user_2": "daemon",
-+  "default_user": "man",
-+  "normal_group_1": "daemon",
-+  "normal_group_2": "man",
-+  "default_group": "games",
- 
-   // A nonexistant username, group name, user ID and group ID.
-   "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",

data/packaging/rpm/passenger_spec/rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch

@@ -1,21 +0,0 @@
-diff -urp passenger-release-4.0.18.orig/ext/boost/cstdint.hpp passenger-release-4.0.18/ext/boost/cstdint.hpp
---- passenger-release-4.0.18.orig/ext/boost/cstdint.hpp	2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/ext/boost/cstdint.hpp	2013-09-23 16:34:02.074450639 -0500
-@@ -41,7 +41,15 @@
- // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+// This define has been dropped altogether in GLIBC 2.17.  As of then,
-+// support for long long is part of baseline requirements, and
-+// [u]int64_t is always defined.  See here:
-+// http://sourceware.org/ml/libc-alpha/2013-01/msg00440.html
-+//
-+#if defined(BOOST_HAS_STDINT_H)					\
-+  && (!defined(__GLIBC__)					\
-+      || defined(__GLIBC_HAVE_LONG_LONG)			\
-+      || (defined __GLIBC_PREREQ && __GLIBC_PREREQ(2,17)))
- 
- // The following #include is an implementation artifact; not part of interface.
- # ifdef __hpux
-Only in passenger-release-4.0.18/ext/boost: cstdint.hpp.glibc-long

data/packaging/rpm/repo_update

@@ -1,114 +0,0 @@
-#!/bin/bash
-set -e
-
-SELFROOT=`dirname "$0"`
-SELFROOT=`cd "$SELFROOT" && pwd`
-TEMPDIR=
-
-PACKAGE_DIR=
-SIGNING_KEY=
-PASSPHRASE_FILE=
-
-function usage()
-{
-  echo "Usage: ./repo_update [OPTIONS]"
-  echo "Sign RPMs and import them into a YUM repository."
-  echo
-  echo "Required options:"
-  echo "  -p PATH        Path to a project"
-  echo
-  echo "  -r PATH        Directory to RPMs"
-  echo "  -P PATH        Directory to YUM repository"
-  echo
-  echo "  -s KEY         Signing key to use"
-  echo "  -x PATH        File containing signing key passphrase"
-}
-
-function parse_options()
-{
-  local OPTIND=1
-  local opt
-  while getopts "p:r:P:s:x:h" opt; do
-    case "$opt" in
-    p)
-      PACKAGE_DIR="$OPTARG/build"
-      REPO_DIR="$OPTARG/repo"
-      ;;
-    r)
-      PACKAGE_DIR="$OPTARG"
-      ;;
-    P)
-      REPO_DIR="$OPTARG"
-      ;;
-    s)
-      SIGNING_KEY="$OPTARG"
-      ;;
-    x)
-      PASSPHRASE_FILE="$OPTARG"
-      ;;
-    h)
-      usage
-      exit
-      ;;
-    *)
-      return 1
-      ;;
-    esac
-  done
-
-  if [[ "$PACKAGE_DIR" = "" ]]; then
-    echo "Please specify a project using -p, or an RPM package directory using -r."
-    exit 1
-  fi
-  if [[ "$REPO_DIR" = "" ]]; then
-    echo "Please specify a project using -p, or a YUM repo directory using -P."
-    exit 1
-  fi
-  if [[ "$SIGNING_KEY" = "" ]]; then
-    echo "Please specify a signing key using -s."
-    exit 1
-  fi
-  if [[ "$PASSPHRASE_FILE" = "" ]]; then
-    echo "Please specify a passphrase file using -p."
-    exit 1
-  fi
-}
-
-function cleanup()
-{
-  local pids=`jobs -p`
-  set +e
-  if [[ "$pids" != "" ]]; then
-    kill $pids
-  fi
-  if [[ "$TEMPDIR" != "" ]]; then
-    rm -rf "$TEMPDIR"
-  fi
-}
-
-trap cleanup EXIT
-parse_options "$@"
-
-if ! gpg --list-keys "$SIGNING_KEY" >/dev/null 2>/dev/null; then
-  echo "ERROR: signing key $SIGNING_KEY not found."
-  exit 1
-fi
-
-APP_UID=`id -u`
-APP_GID=`id -g`
-TEMPDIR=`mktemp -d /tmp/passenger-rpm.XXXXXXXX`
-gpg --armor --export-secret-keys "$SIGNING_KEY" > "$TEMPDIR/signing_key"
-cat "$PASSPHRASE_FILE" > "$TEMPDIR/signing_passphrase"
-chmod 600 "$TEMPDIR"/*
-
-docker run --rm \
-  -v "$SELFROOT:/system:ro" \
-  -v "$TEMPDIR:/params:ro" \
-  -v "$PACKAGE_DIR:/packages" \
-  -v "$REPO_DIR:/repo" \
-  -e "APP_UID=$APP_UID" \
-  -e "APP_GID=$APP_GID" \
-  -e "SIGNING_KEY=$SIGNING_KEY" \
-  phusion/passenger_rpm_automation \
-  /system/internal/my_init --skip-runit --skip-startup-files --quiet -- \
-  /system/internal/repo_update

data/packaging/rpm/setup-system

@@ -1,61 +0,0 @@
-#!/bin/bash
-set -e
-
-function create_user()
-{
-  local name="$1"
-  local full_name="$2"
-  local id="$3"
-  create_group $name $id
-  if ! grep -q "^$name:" /etc/passwd; then
-    sudo adduser --uid $id --gid $id --disabled-password --gecos "$full_name" $name
-  fi
-  sudo usermod -L $name
-}
-
-function create_group()
-{
-  local name="$1"
-  local id="$2"
-  if ! grep -q "^$name:" /etc/group >/dev/null; then
-    sudo addgroup --gid $id $name
-  fi
-}
-
-set -x
-
-wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -
-echo deb http://pkg.jenkins-ci.org/debian binary/ | sudo tee /etc/apt/sources.list.d/jenkins.list
-sudo apt-get update
-sudo apt-get install -y jenkins acl git ca-certificates ruby
-sudo usermod -a -G docker jenkins
-if [[ -e /vagrant ]]; then
-  sudo service jenkins stop
-  sudo update-rc.d -f jenkins disable
-  if [[ ! -e /srv/passenger_rpm_automation ]]; then
-    sudo ln -s /vagrant /srv/passenger_rpm_automation
-  fi
-fi
-
-create_user psg_rpm_automation "Passenger RPM automation" 2466
-
-create_group passenger_ci 2450
-sudo usermod -a -G passenger_ci jenkins
-sudo usermod -a -G passenger_ci,docker psg_rpm_automation
-sudo mkdir -p /var/cache/passenger_ci
-sudo touch /var/cache/passenger_ci/lock
-sudo chown -R root:passenger_ci /var/cache/passenger_ci
-sudo chmod 770 /var/cache/passenger_ci
-sudo chmod 660 /var/cache/passenger_ci/lock
-
-sudo mkdir -p /etc/passenger_rpm_automation
-sudo touch /etc/passenger_rpm_automation/signing_passphrase
-sudo chown jenkins: /etc/passenger_rpm_automation/signing_passphrase
-sudo chmod 600 /etc/passenger_rpm_automation/signing_passphrase
-if [[ ! -e signing_passphrase ]]; then
-  sudo ln -s /etc/passenger_rpm_automation/signing_passphrase signing_passphrase
-fi
-
-if [[ ! -e /tools ]]; then
-  sudo git clone https://github.com/phusion/phusion-server-tools.git /tools
-fi

data/packaging/rpm/shell

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-SELFDIR=`dirname "$0"`
-SELFDIR=`cd "$SELFDIR" && pwd`
-exec docker run --rm --privileged -t -i \
-	-v "$SELFDIR:/system:ro" \
-	"$@" \
-	phusion/passenger_rpm_automation \
-	/system/internal/my_init --skip-runit --skip-startup-files --quiet -- \
-	/bin/bash

data/test/.rspec

@@ -1,4 +0,0 @@
---colour
---format d
---pattern 'dont_auto_load_anything'
---tty

data/test/config.json.example

@@ -1,42 +0,0 @@
-{
-  //// This file contains system-specific configuration options that the test suite needs.
-  //// Please customize it for your system.
-
-  // These are the usernames and group names of normal, non-administrator
-  // users and groups. Preferably, these are user and group accounts that
-  // are normally not used.
-  //
-  // These users and groups MUST be able to access this 'test' directory,
-  // otherwise the tests will fail.
-
-  //// Good values for OS X:
-  "normal_user_1": "_www",
-  "normal_user_2": "daemon",
-  // Must not be "nobody".
-  "default_user": "_sandbox",
-  // Must not be normal_user_1's primary group.
-  "normal_group_1": "daemon",
-  // Must not be normal_user_2's primary group.
-  "normal_group_2": "_sandbox",
-  // Must not be default_user's primary group. Must not be "nobody".
-  "default_group": "_www",
-
-  ///// Good values for Linux and FreeBSD. Same restrictions apply.
-  //"normal_user_1": "games",
-  //"normal_user_2": "daemon",
-  //"default_user": "man",
-  //"normal_group_1": "daemon",
-  //"normal_group_2": "man",
-  //"default_group": "games",
-
-  // A nonexistant username, group name, user ID and group ID.
-  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_uid": 9999,
-  "nonexistant_gid": 9999,
-
-  // If you want to run the Nginx integration tests, then set the following
-  // config option to the full path of the Nginx binary. This Nginx binary *must*
-  // be compiled with Phusion Passenger support!
-  "nginx": "/usr/local/sbin/nginx"
-}

data/test/config.json.rpm-automation

@@ -1,15 +0,0 @@
-{
-  "normal_user_1": "games",
-  "normal_user_2": "daemon",
-  "default_user": "gopher",
-  "normal_group_1": "daemon",
-  "normal_group_2": "gopher",
-  "default_group": "games",
-
-  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_uid": 9999,
-  "nonexistant_gid": 9999,
-
-  "nginx": "/usr/sbin/nginx"
-}

data/test/config.json.travis

@@ -1,15 +0,0 @@
-{
-  "normal_user_1": "games",
-  "normal_user_2": "daemon",
-  "default_user": "man",
-  "normal_group_1": "daemon",
-  "normal_group_2": "man",
-  "default_group": "games",
-
-  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_uid": 9999,
-  "nonexistant_gid": 9999,
-
-  "nginx": "/tmp/nginx/sbin/nginx"
-}

data/test/config.json.vagrant

@@ -1,30 +0,0 @@
-{
-  //// This file contains system-specific configuration options that the test suite needs.
-  //// Please customize it for your system.
-
-  // These are the usernames and group names of normal, non-administrator
-  // users and groups. Preferably, these are user and group accounts that
-  // are normally not used.
-  //
-  // These users and groups MUST be able to access this 'test' directory,
-  // otherwise the tests will fail.
-
-  ///// Good values for Linux and FreeBSD. Same restrictions apply.
-  "normal_user_1": "games",
-  "normal_user_2": "daemon",
-  "default_user": "man",
-  "normal_group_1": "daemon",
-  "normal_group_2": "man",
-  "default_group": "games",
-
-  // A nonexistant username, group name, user ID and group ID.
-  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
-  "nonexistant_uid": 9999,
-  "nonexistant_gid": 9999,
-
-  // If you want to run the Nginx integration tests, then set the following
-  // config option to the full path of the Nginx binary. This Nginx binary *must*
-  // be compiled with Phusion Passenger support!
-  "nginx": "/home/vagrant/nginx/objs/nginx"
-}

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -1,124 +0,0 @@
-#include <TestSupport.h>
-#include <ApplicationPool2/DirectSpawner.h>
-#include <Utils/json.h>
-#include <fcntl.h>
-
-using namespace Passenger;
-using namespace Passenger::ApplicationPool2;
-
-namespace tut {
-	struct ApplicationPool2_DirectSpawnerTest {
-		SpawnObject object;
-		PipeWatcher::DataCallback gatherOutput;
-		string gatheredOutput;
-		boost::mutex gatheredOutputSyncher;
-
-		ApplicationPool2_DirectSpawnerTest() {
-			PipeWatcher::onData = PipeWatcher::DataCallback();
-			gatherOutput = boost::bind(&ApplicationPool2_DirectSpawnerTest::_gatherOutput, this, _1, _2);
-			setLogLevel(LVL_ERROR); // TODO: change to LVL_WARN
-			setPrintAppOutputAsDebuggingMessages(true);
-		}
-
-		~ApplicationPool2_DirectSpawnerTest() {
-			setLogLevel(DEFAULT_LOG_LEVEL);
-			setPrintAppOutputAsDebuggingMessages(false);
-			unlink("stub/wsgi/passenger_wsgi.pyc");
-			PipeWatcher::onData = PipeWatcher::DataCallback();
-		}
-
-		boost::shared_ptr<DirectSpawner> createSpawner(const Options &options) {
-			return boost::make_shared<DirectSpawner>(createSpawnerConfig());
-		}
-
-		SpawnerConfigPtr createSpawnerConfig() {
-			SpawnerConfigPtr config = boost::make_shared<SpawnerConfig>();
-			config->resourceLocator = resourceLocator;
-			config->finalize();
-			return config;
-		}
-
-		Options createOptions() {
-			Options options;
-			options.spawnMethod = "direct";
-			options.loadShellEnvvars = false;
-			return options;
-		}
-
-		void _gatherOutput(const char *data, unsigned int size) {
-			boost::lock_guard<boost::mutex> l(gatheredOutputSyncher);
-			gatheredOutput.append(data, size);
-		}
-	};
-
-	DEFINE_TEST_GROUP_WITH_LIMIT(ApplicationPool2_DirectSpawnerTest, 90);
-
-	#include "SpawnerTestCases.cpp"
-
-	TEST_METHOD(80) {
-		// If the application didn't start within the timeout
-		// then whatever was written to stderr is used as the
-		// SpawnException error page.
-		Options options = createOptions();
-		options.appRoot      = "stub";
-		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"; sleep(60)";
-		options.startupFile  = ".";
-		options.startTimeout = 300;
-
-		DirectSpawner spawner(createSpawnerConfig());
-		setLogLevel(LVL_CRIT);
-
-		try {
-			object = spawner.spawn(options);
-			object.process->requiresShutdown = false;
-			fail("Timeout expected");
-		} catch (const SpawnException &e) {
-			ensure_equals(e.getErrorKind(),
-				SpawnException::APP_STARTUP_TIMEOUT);
-			ensure(e.getErrorPage().find("hello world\n") != string::npos);
-		}
-	}
-
-	TEST_METHOD(81) {
-		// If the application crashed during startup without returning
-		// a proper error response, then its stderr output is used
-		// as error response instead.
-		Options options = createOptions();
-		options.appRoot      = "stub";
-		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"";
-		options.startupFile  = ".";
-
-		DirectSpawner spawner(createSpawnerConfig());
-		setLogLevel(LVL_CRIT);
-
-		try {
-			object = spawner.spawn(options);
-			object.process->requiresShutdown = false;
-			fail("SpawnException expected");
-		} catch (const SpawnException &e) {
-			ensure_equals(e.getErrorKind(),
-				SpawnException::APP_STARTUP_ERROR);
-			ensure(e.getErrorPage().find("hello world\n") != string::npos);
-		}
-	}
-
-	TEST_METHOD(82) {
-		SHOW_EXCEPTION_BACKTRACE(
-		// Test that everything works correctly if the app re-execs() itself.
-		// https://code.google.com/p/phusion-passenger/issues/detail?id=842#c19
-		Options options = createOptions();
-		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\t" "start.rb\t" "--execself";
-		options.startupFile  = "start.rb";
-		SpawnerPtr spawner = createSpawner(options);
-		object = spawner->spawn(options);
-		object.process->requiresShutdown = false;
-		ensure_equals(object.process->sockets.size(), 1u);
-
-		Connection conn = object.process->sockets.front().checkoutConnection();
-		ScopeGuard guard(boost::bind(checkin, object.process, &conn));
-		writeExact(conn.fd, "ping\n");
-		ensure_equals(readAll(conn.fd), "pong\n");
-		);
-	}
-}