passenger 4.0.10 → 4.0.13

data/rpm/release/mirrors

@@ -0,0 +1 @@
+http://passenger.stealthymonkeys.com/

data/rpm/release/mock-repo/comps.xml

@@ -0,0 +1,21 @@
+<comps>
+<!--	<meta> -->
+<!-- Meta information will go here eventually -->
+<!--	</meta> -->
+	<group>
+		<id>build-passenger</id>
+		<name>BuildPassenger</name>
+		<default>true</default>
+		<description>Build Requirements for Passenger</description>
+		<uservisible>true</uservisible>
+		<packagelist>
+			<packagereq type="default">rubygems</packagereq>
+			<packagereq type="default">pcre-devel</packagereq>
+			<packagereq type="default">perl-ExtUtils-Embed</packagereq>
+			<!-- For the passenger-standalone build -->
+			<packagereq type="default">rubygem-file-tail</packagereq>
+			<packagereq type="default">rubygem-daemon_controller</packagereq>
+			<packagereq type="optional">rubygem-rake</packagereq>
+		</packagelist>
+	</group>
+</comps>

data/rpm/release/mocksetup-first.sh

@@ -0,0 +1,102 @@
+#!/bin/bash -e
+# Checks whether all the prerequities for the package:rpm task are available.
+
+BUILD_VERBOSITY=${BUILD_VERBOSITY:-0}
+[ $BUILD_VERBOSITY -ge 3 ] && set -x
+
+declare -a required_packages=(mock)
+if grep -iq fedora /etc/redhat-release ; then
+		# fedora-packager has rpmbuild-md5 for the SRPM
+		required_packages=( ${required_packages[@]} fedora-packager )
+else
+		required_packages=( ${required_packages[@]} rpm-build )
+fi
+
+while getopts ':p:' opt
+do
+	case $opt in
+		p)
+			required_packages=( ${required_packages[@]} $OPTARG )
+		;;
+		\?)
+			echo "Invalid flag -$OPTARG" >&2
+			exit 255
+		;;
+		\:)
+			echo "missing argument to -$OPTARG" >&2
+			exit 127
+		;;
+	esac
+done
+shift $(($OPTIND - 1))
+
+repo=${1:-/var/lib/mock/passenger-build-repo}
+etc=${2:-/etc/mock}
+
+if [ "$(id -u)" == "0" ]; then
+	cat <<-EOF >&2
+		It is a very bad idea to run this build as root.
+		Use a less-privileged user. If that user is not a sudoer, you may need to run
+		a few commands as root before the first run. (Those commands will be determined
+		the first time through)
+EOF
+	exit 1
+fi
+
+mock_installed=`rpm -q mock | grep -v 'not installed' | wc -l`
+cfg_count=`ls -1 $etc/passenger-* 2>/dev/null | wc -l`
+in_mock_group=`groups | grep mock | wc -l`
+
+# Fedora has a utility to do this, but I don't know if RHEL does, plus it requires another package install, just do it by hand
+mkdir -p `rpm -E '%{_topdir}'`/{SOURCES,SPECS,SRPMS,RPMS}
+
+if [[ ( $cfg_count == 0 && ! -w $etc ) || ! ( -d $etc || -w $etc/.. )	 || ! ( -w $repo || -w $repo/.. ) ]] ; then
+	run_setup=1
+fi
+
+declare -a yum_pkgs
+
+for pkg in "${required_packages[@]}"
+do
+	if [ `rpm -q $pkg | grep -v 'not installed' | wc -l` -eq 0 ] ; then
+		yum_pkgs=(${yum_pkgs[@]} $pkg)
+	fi
+done
+
+if [[ "$run_setup" = "1" || ! $in_mock_group == 1 || ${#yum_pkgs[@]} != 0 ]] ; then
+	echo "There is some setup required before building packages."
+	echo "We will run sudo to do the following:"
+
+	if [[ ${#yum_pkgs[@]} != 0 ]] ; then
+		echo "	# yum -y install ${yum_pkgs[@]}"
+	fi
+
+	if [[ ! "$in_mock_group" == "1" ]] ; then
+		echo "	# usermod -a -G mock $USER"
+		echo "		(add you to the mock group, you will need to log back in for this to take effect)"
+	fi
+
+	if [[ "$run_setup" == "1" ]] ; then
+		echo "	# `dirname $0`/mocksetup.sh"
+		echo "		(sets up the dependencies for mock)"
+	fi
+	echo
+	echo "Hit return to continue, ^C to cancel"
+	read
+
+	if [[ ! $mock_installed == 1 || ! $createrepo_installed == 1 ]] ; then
+		sudo yum -y install "${yum_pkgs[@]}"
+	fi
+	if [[ ! "$in_mock_group" == "1" ]] ; then
+		sudo usermod -a -G mock $USER
+	fi
+	if [[ "$run_setup" == "1" ]] ; then
+		sudo `dirname $0`/mocksetup.sh $repo $etc
+	fi
+
+	if [[ ! "$in_mock_group" == "1" ]] ; then
+		echo "You have been added to the mock group. Please relogin for this to take effect, and re-run 'rake package:rpm'."
+		exit 4
+	fi
+fi
+

data/rpm/release/mocksetup.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+BUILD_VERBOSITY=${BUILD_VERBOSITY:-0}
+[ $BUILD_VERBOSITY -ge 3 ] && set -x
+set -e
+
+repo=${1:-/var/lib/mock/passenger-build-repo}
+etc=${2:-/etc/mock}
+# For the written files & dirs, we want g+w, this isn't consistent enough
+# umask 002
+
+# For the non-groupinstall configs, pull the members out of the mock-comps.xml
+prereqs=`egrep 'packagereq.*default' $(dirname $0)/mock-repo/comps.xml | cut -d\> -f2 | cut -d\< -f1 | tr '\n' ' '`
+
+for cfg in $etc/{fedora-{13,14},epel-5}-*.cfg
+do
+	[ $BUILD_VERBOSITY -ge 2 ] && echo $cfg
+	dir=`dirname $cfg`
+	base=`basename $cfg`
+	new=$dir/passenger-$base
+	perl -p - $repo "$prereqs" $cfg <<-'EOF' > $new
+		# Warning <<- only kills TABS (ASCII 0x9) DO NOT CONVERT THESE
+		# TABS TO SPACES -- IT WILL BREAK
+
+		sub BEGIN {
+				our $repo = shift;
+				our $prereqs = shift;
+		}
+
+		s{opts\['root'\]\s*=\s*'}{${&}passenger-}; #';
+		s{groupinstall [^']+}{$& Ruby build-passenger}; #'
+		s{\binstall buildsys-build}{$& ruby ruby-devel $prereqs};
+		s{^"""}{<<EndRepo . $&}e; #"
+
+		[build-passenger]
+		name=build-passenger
+		baseurl=file://$repo
+		EndRepo
+EOF
+	chgrp mock $new 2>/dev/null || true
+	chmod g+w $new	2>/dev/null || true
+done
+
+mkdir -p $repo
+chmod g+s $repo 2>/dev/null || true
+
+if [ $BUILD_VERBOSITY -ge 1 ]; then
+	rsync_volume='-v'
+	if [ $BUILD_VERBOSITY -ge 2 ]; then
+		rsync_volume='-v --progress'
+	fi
+fi
+
+cp -ra `dirname $0`/mock-repo/* $repo
+chgrp -R mock $repo 2>/dev/null || true
+
+createrepo_volume=
+if [ $BUILD_VERBOSITY -gt 1 ]; then
+	createrepo_volume='-v'
+else
+	if [ $BUILD_VERBOSITY -le 0 ]; then
+		createrepo_volume='-q'
+	fi
+fi
+
+createrepo $createrepo_volume -g comps.xml $repo
+chmod -R g+w $repo 2>/dev/null || true

data/test/integration_tests/apache2_tests.rb

@@ -408,7 +408,7 @@ describe "Apache 2 module" do
 		end
 	end
 	
-	describe "HelperServer" do
+	describe "HelperAgent" do
 		AdminTools = PhusionPassenger::AdminTools
 		
 		before :all do

data/test/integration_tests/downloaded_binaries_tests.rb

@@ -0,0 +1,76 @@
+source_root = File.expand_path("../..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
+PhusionPassenger.locate_directories
+require 'tmpdir'
+require 'fileutils'
+require 'open-uri'
+
+ENV['PATH'] = "#{PhusionPassenger.bin_dir}:#{ENV['PATH']}"
+# This environment variable changes Passenger Standalone's behavior,
+# so ensure that it's not set.
+ENV.delete('PASSENGER_DEBUG')
+
+describe "Downloaded Phusion Passenger binaries" do
+	before :each do
+		@temp_dir = Dir.mktmpdir
+		File.open("#{PhusionPassenger.resources_dir}/release.txt", "w").close
+	end
+
+	after :each do
+		FileUtils.remove_entry_secure(@temp_dir)
+		File.unlink("#{PhusionPassenger.resources_dir}/release.txt")
+	end
+
+	let(:version) { PhusionPassenger::VERSION_STRING }
+	let(:nginx_version) { PhusionPassenger::PREFERRED_NGINX_VERSION }
+	let(:compat_id) { PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id }
+
+	def sh(*command)
+		if !system(*command)
+			abort "Command failed: #{command.join(' ')}"
+		end
+	end
+
+	it "works" do
+		Dir.mkdir("#{@temp_dir}/#{version}")
+		Dir.chdir("#{@temp_dir}/#{version}") do
+			tarballs = Dir["#{PhusionPassenger.download_cache_dir}/*.tar.gz"]
+			tarballs.should_not be_empty
+			
+			File.open("config.ru", "w") do |f|
+				f.write(%Q{
+					app = lambda do |env|
+						[200, { "Content-Type" => "text/plain" }, ["ok"]]
+					end
+					run app
+				})
+			end
+			Dir.mkdir("public")
+			Dir.mkdir("tmp")
+			Dir.mkdir("log")
+
+			begin
+				sh("passenger start " +
+					"-p 4000 " +
+					"-d " +
+					"--no-compile-runtime " +
+					"--binaries-url-root http://127.0.0.1:4001 " +
+					"--runtime-dir '#{@temp_dir}' >log/start.log")
+			rescue Exception
+				system("cat log/start.log")
+				raise
+			end
+			begin
+				open("http://127.0.0.1:4000/") do |f|
+					f.read.should == "ok"
+				end
+			rescue
+				system("cat log/passenger.4000.log")
+				raise
+			ensure
+				sh "passenger stop -p 4000"
+			end
+		end
+	end
+end

data/test/integration_tests/native_packaging_spec.rb

@@ -22,19 +22,28 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+# To run the native packaging tests:
+#     rake debian:dev debian:dev:reinstall
+#     rvmsudo env LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
+#         rspec -f s -c test/integration_tests/native_packaging_spec.rb
+
 # Ensure that the natively installed tools are in PATH.
 ENV['PATH'] = "/usr/bin:#{ENV['PATH']}"
 LOCATIONS_INI = ENV['LOCATIONS_INI']
 abort "Please set the LOCATIONS_INI environment variable to the right locations.ini" if !LOCATIONS_INI
 
+source_root = File.expand_path("../..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
+
 BINDIR = "/usr/bin"
 SBINDIR = "/usr/sbin"
-INCLUDEDIR = "/usr/share/passenger/include"
-NGINX_ADDON_DIR = "/usr/share/passenger/ngx_http_passenger_module"
+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"
-RESOURCESDIR = "/usr/share/passenger"
-RUBY_EXTENSION_SOURCE_DIR = "/usr/share/passenger/ruby_extension_source"
-AGENTS_DIR = "/usr/lib/passenger/agents"
+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"
 APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
 
 describe "A natively packaged Phusion Passenger" do
@@ -43,7 +52,7 @@ describe "A natively packaged Phusion Passenger" do
 		if $?.exitstatus == 0
 			return output
 		else
-			abort "Command #{command.join(' ')} exited with status #{$?.exitstatus}"
+			abort "Command #{command} exited with status #{$?.exitstatus}"
 		end
 	end
 
@@ -122,6 +131,29 @@ describe "A natively packaged Phusion Passenger" do
 			system("passenger-config --natively-packaged").should be_true
 		end
 
+		it "recognizes the install as coming from an official package" do
+			system("passenger-config --installed-from-release-package").should be_true
+		end
+
+		it "recognizes the system's Apache" do
+			output = capture_output("passenger-config --detect-apache2")
+			output.gsub!(/.*Final autodetection results\n/m, '')
+			output.scan(/\* Found Apache .*\!/).size.should == 1
+			output.should include("apxs2          : /usr/bin/apxs2\n")
+			output.should include("Main executable: /usr/sbin/apache2\n")
+			output.should include("Control command: /usr/sbin/apache2ctl\n")
+			output.should include("Config file    : /etc/apache2/apache2.conf\n")
+			output.should include("Error log file : /var/log/apache2/error.log\n")
+			output.should include(%Q{
+   To start, stop or restart this specific Apache version:
+      /usr/sbin/apache2ctl start
+      /usr/sbin/apache2ctl stop
+      /usr/sbin/apache2ctl restart})
+			output.should include(%Q{
+   To troubleshoot, please read the logs in this file:
+      /var/log/apache2/error.log})
+		end
+
 		it "shows the directory to the runtime library headers" do
 			capture_output("passenger-config --includedir").should == INCLUDEDIR
 		end

data/test/integration_tests/source_packaging_test.rb

@@ -0,0 +1,198 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  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.
+
+SOURCE_ROOT = File.expand_path("../..", File.dirname(__FILE__))
+Dir.chdir(SOURCE_ROOT)
+$LOAD_PATH.unshift("#{SOURCE_ROOT}/lib")
+require 'phusion_passenger'
+require 'phusion_passenger/packaging'
+require 'rubygems'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+
+PACKAGE_NAME = PhusionPassenger::PACKAGE_NAME
+VERSION      = PhusionPassenger::VERSION_STRING
+if RUBY_PLATFORM =~ /linux/
+	TAR = "tar --warning=none"
+else
+	TAR = "tar"
+end
+
+def sh(*command)
+	if !system(*command)
+		abort "Command failed: #{command.join(' ')}"
+	end
+end
+
+shared_examples_for "a proper package" do
+	it "includes all files in the git repository" do
+		git_files = `git ls-files`.split("\n")
+		git_files.reject! { |filename| filename =~ /^Passenger.xcodeproj\// }
+		git_files.delete("ext/libeio/eio.3")
+		git_files.delete("ext/libeio/eio.pod")
+
+		package_files = {}
+		Dir.chdir(@pkg_contents_dir) do
+			`find .`.split("\n").each do |filename|
+				filename.sub!(/^.\//, '')
+				if !File.directory?(filename)
+					package_files[filename] = true
+				end
+			end
+		end
+
+		error = false
+		git_files.each do |filename|
+			if !package_files[filename]
+				error = true
+				puts "File \"#{filename}\" is not in the package"
+			end
+		end
+		raise "Some files are not in the package" if error
+	end
+
+	it "includes documentation HTML files" do
+		File.exist?("#{@pkg_contents_dir}/doc/Users guide Apache.html").should be_true
+		File.exist?("#{@pkg_contents_dir}/doc/Users guide Nginx.html").should be_true
+		File.exist?("#{@pkg_contents_dir}/doc/Users guide Standalone.html").should be_true
+	end
+end
+
+shared_examples_for "a user-generated package" do
+	it "isn't marked official" do
+		File.exist?("#{@pkg_contents_dir}/resources/release.txt").should be_false
+	end
+end
+
+shared_examples_for "an official package" do
+	it "is marked official" do
+		File.exist?("#{@pkg_contents_dir}/resources/release.txt").should be_true
+	end
+end
+
+describe "A user-generated gem" do
+	before :all do
+		ENV['PKG_DIR'] = @temp_dir = Dir.mktmpdir
+		basename = "#{PACKAGE_NAME}-#{VERSION}"
+		@pkg_contents_dir = "#{@temp_dir}/#{basename}"
+		Dir.chdir(SOURCE_ROOT) do
+			sh "rake", *PhusionPassenger::Packaging::PREGENERATED_FILES
+			sh "gem build #{PACKAGE_NAME}.gemspec"
+			sh "mv #{PACKAGE_NAME}-#{VERSION}.gem #{@temp_dir}/"
+		end
+		Dir.chdir(@temp_dir) do
+			sh "#{TAR} -xf #{basename}.gem"
+			sh "mkdir #{basename}"
+			sh "gunzip metadata.gz"
+			Dir.chdir(basename) do
+				sh "#{TAR} -xzf ../data.tar.gz"
+			end
+		end
+	end
+
+	after :all do
+		ENV.delete('PKG_DIR')
+		FileUtils.remove_entry_secure(@temp_dir)
+	end
+
+	it_behaves_like "a proper package"
+	it_behaves_like "a user-generated package"
+
+	it "doesn't invoke the binaries downloader upon gem installation" do
+		spec = YAML.load_file("#{@temp_dir}/metadata")
+		spec.extensions.should be_empty
+	end
+end
+
+describe "A user-generated tarball" do
+	before :all do
+		ENV['PKG_DIR'] = @temp_dir = Dir.mktmpdir
+		basename = "#{PACKAGE_NAME}-#{VERSION}"
+		@pkg_contents_dir = "#{@temp_dir}/#{basename}"
+		sh "rake package:tarball"
+		Dir.chdir(@temp_dir) do
+			sh "#{TAR} -xzf #{basename}.tar.gz"
+		end
+	end
+
+	after :all do
+		ENV.delete('PKG_DIR')
+		FileUtils.remove_entry_secure(@temp_dir)
+	end
+
+	it_behaves_like "a proper package"
+	it_behaves_like "a user-generated package"
+end
+
+describe "An officially-generated gem" do
+	before :all do
+		ENV['PKG_DIR'] = @temp_dir = Dir.mktmpdir
+		basename = "#{PACKAGE_NAME}-#{VERSION}"
+		@pkg_contents_dir = "#{@temp_dir}/#{basename}"
+		Dir.chdir(SOURCE_ROOT) do
+			sh "rake package:set_official package:gem SKIP_SIGNING=1"
+		end
+		Dir.chdir(@temp_dir) do
+			sh "#{TAR} -xf #{basename}.gem"
+			sh "mkdir #{basename}"
+			sh "gunzip metadata.gz"
+			Dir.chdir(basename) do
+				sh "#{TAR} -xzf ../data.tar.gz"
+			end
+		end
+	end
+
+	after :all do
+		ENV.delete('PKG_DIR')
+		FileUtils.remove_entry_secure(@temp_dir)
+	end
+
+	it_behaves_like "a proper package"
+	it_behaves_like "an official package"
+
+	it "invokes the binaries downloader upon gem installation" do
+		spec = YAML.load_file("#{@temp_dir}/metadata")
+		spec.extensions.should_not be_empty
+	end
+end
+
+describe "An officially-generated tarball" do
+	before :all do
+		ENV['PKG_DIR'] = @temp_dir = Dir.mktmpdir
+		basename = "#{PACKAGE_NAME}-#{VERSION}"
+		@pkg_contents_dir = "#{@temp_dir}/#{basename}"
+		sh "rake package:set_official package:tarball"
+		Dir.chdir(@temp_dir) do
+			sh "#{TAR} -xzf #{basename}.tar.gz"
+		end
+	end
+
+	after :all do
+		ENV.delete('PKG_DIR')
+		FileUtils.remove_entry_secure(@temp_dir)
+	end
+
+	it_behaves_like "a proper package"
+	it_behaves_like "an official package"
+end