passenger 4.0.48 → 4.0.49

data/test/gdbinit.example

@@ -6,6 +6,9 @@
 handle SIGUSR1 noprint pass
 handle SIGPIPE noprint pass
 
+# Use Intel syntax for disassembles.
+set disassembly-flavor intel
+
 # Convenience command.
 define rake
 	shell rake $arg0

data/test/integration_tests/nginx_tests.rb

@@ -70,7 +70,7 @@ describe "Phusion Passenger for Nginx" do
 			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
-				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server[:root]        = File.expand_path("stub")
 				server << %Q{
 					location ~ ^/subapp(/.*|$) {
 						alias #{@stub.full_app_root}/public$1;
@@ -132,7 +132,7 @@ describe "Phusion Passenger for Nginx" do
 			@stub = PythonStub.new('wsgi')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
-				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server[:root]        = File.expand_path("stub")
 				server << %Q{
 					location ~ ^/subapp(/.*|$) {
 						alias #{@stub.full_app_root}/public$1;
@@ -194,7 +194,7 @@ describe "Phusion Passenger for Nginx" do
 			@stub = NodejsStub.new('node')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
-				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server[:root]        = File.expand_path("stub")
 				server[:passenger_friendly_error_pages] = 'on'
 				server << %Q{
 					location ~ ^/subapp(/.*|$) {

data/test/integration_tests/source_packaging_test.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -50,6 +50,8 @@ 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(".gitmodules")
+		git_files.delete("packaging/rpm")
 		git_files.delete("ext/libeio/eio.3")
 		git_files.delete("ext/libeio/eio.pod")
 

data/test/stub/nginx/nginx.conf.erb

@@ -1,8 +1,14 @@
 worker_processes  2;
 
-error_log <%= @passenger_root %>/test/test.log;
+error_log <%= @nginx_root %>/../test.log;
 pid       <%= @nginx_root %>/nginx.pid;
 
+# Makes integration tests work when run in a CentOS container, with Node.js
+# and Python installed through SCL.
+env PATH;
+env LD_LIBRARY_PATH;
+env PYTHONPATH;
+
 events {
     worker_connections  1024;
 }
@@ -21,6 +27,7 @@ http {
     
     passenger_root <%= @passenger_root %>;
     passenger_ruby <%= PlatformInfo.ruby_command %>;
+    passenger_nodejs <%= PlatformInfo.find_command('node') %>;
     passenger_default_user <%= CONFIG['default_user'] %>;
     passenger_default_group <%= CONFIG['default_group'] %>;
     passenger_max_pool_size <%= @max_pool_size %>;

data/test/support/nginx_controller.rb

@@ -25,13 +25,13 @@ class NginxController
 		@pid_file    = "#{root_dir}/nginx.pid"
 		@log_file    = "#{root_dir}/error.log"
 		@controller  = DaemonController.new(
-		      :identifier    => 'Nginx',
-		      :start_command => "#{CONFIG['nginx']} -c '#{@config_file}'",
-		      :ping_command  => [:tcp, '127.0.0.1', PORT],
-		      :pid_file      => @pid_file,
-		      :log_file      => @log_file,
-		      :timeout       => 25,
-		      :before_start  => method(:write_nginx_config_files)
+			:identifier    => 'Nginx',
+			:start_command => "#{CONFIG['nginx']} -c '#{@config_file}'",
+			:ping_command  => [:tcp, '127.0.0.1', PORT],
+			:pid_file      => @pid_file,
+			:log_file      => @log_file,
+			:timeout       => 25,
+			:before_start  => method(:write_nginx_config_files)
 		)
 		
 		@servers = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.48
+  version: 4.0.49
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,6 @@ files:
 - build/packaging.rb
 - build/preprocessor.rb
 - build/rake_extensions.rb
-- build/rpm.rb
 - build/ruby_extension.rb
 - build/ruby_tests.rb
 - build/test_basics.rb
@@ -123,15 +122,16 @@ files:
 - debian.template/patches/series
 - debian.template/rules.template
 - debian.template/source/format
+- dev/ci/inituidgid
+- dev/ci/run_jenkins.sh
+- dev/ci/run_rpm_tests.sh
+- dev/ci/run_travis.sh
 - dev/copy_boost_headers
 - dev/install_scripts_bootstrap_code.rb
 - dev/list_tests
 - dev/rack.test/config.ru
 - dev/rack.test/public/asset.txt
-- dev/rpmtool
-- dev/run_travis.sh
 - dev/runner
-- dev/test_rpm_packaging.sh
 - dev/vagrant/apache_default_site.conf
 - dev/vagrant/apache_passenger.conf
 - dev/vagrant/apache_passenger.load
@@ -2467,6 +2467,62 @@ files:
 - node_lib/phusion_passenger/line_reader.js
 - npm-shrinkwrap.json
 - package.json
+- packaging/rpm/LICENSE.txt
+- packaging/rpm/Makefile
+- packaging/rpm/README.md
+- packaging/rpm/Vagrantfile
+- packaging/rpm/Vagrantfile.centos
+- packaging/rpm/build
+- packaging/rpm/create_project
+- packaging/rpm/git_update
+- packaging/rpm/image/Dockerfile
+- packaging/rpm/image/Gemfile
+- packaging/rpm/image/Gemfile.lock
+- packaging/rpm/image/RPM-GPG-KEY-amazon-ga
+- packaging/rpm/image/amazon2014-i386.cfg
+- packaging/rpm/image/amazon2014-x86_64.cfg
+- packaging/rpm/image/site-defaults.cfg
+- packaging/rpm/internal/build_tasks.rb
+- packaging/rpm/internal/dummygpg
+- packaging/rpm/internal/exec_build
+- packaging/rpm/internal/get_distro_arch
+- packaging/rpm/internal/get_distro_id
+- packaging/rpm/internal/git_update
+- packaging/rpm/internal/inituidgid
+- packaging/rpm/internal/my_init
+- packaging/rpm/internal/python27
+- packaging/rpm/internal/repo_update
+- packaging/rpm/internal/setuser
+- packaging/rpm/internal/tracking_helper
+- packaging/rpm/jenkins_release
+- packaging/rpm/lib/build_tasks_support.rb
+- packaging/rpm/lib/preprocessor.rb
+- packaging/rpm/nginx_spec/404.html
+- packaging/rpm/nginx_spec/50x.html
+- packaging/rpm/nginx_spec/index.html
+- packaging/rpm/nginx_spec/nginx-auto-cc-gcc.patch
+- packaging/rpm/nginx_spec/nginx-logo.png
+- packaging/rpm/nginx_spec/nginx-upgrade
+- packaging/rpm/nginx_spec/nginx-upgrade.8
+- packaging/rpm/nginx_spec/nginx.conf
+- packaging/rpm/nginx_spec/nginx.init
+- packaging/rpm/nginx_spec/nginx.logrotate
+- packaging/rpm/nginx_spec/nginx.service
+- packaging/rpm/nginx_spec/nginx.spec.template
+- packaging/rpm/nginx_spec/nginx.sysconfig
+- packaging/rpm/nginx_spec/passenger.conf
+- packaging/rpm/nginx_spec/poweredby.png
+- packaging/rpm/passenger_spec/apache-passenger.conf.in
+- packaging/rpm/passenger_spec/config.json
+- packaging/rpm/passenger_spec/passenger.logrotate
+- packaging/rpm/passenger_spec/passenger.spec.template
+- packaging/rpm/passenger_spec/passenger_dynamic_thread_group.patch
+- packaging/rpm/passenger_spec/passenger_tests_default_config_example.patch
+- packaging/rpm/passenger_spec/rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch
+- packaging/rpm/passenger_spec/rubygem-passenger-4.0.18-gcc47-include-sys_types.patch
+- packaging/rpm/repo_update
+- packaging/rpm/setup-system
+- packaging/rpm/shell
 - passenger.gemspec
 - resources/mime.types
 - resources/oss-binaries.phusionpassenger.com.crt
@@ -2513,16 +2569,6 @@ files:
 - resources/templates/standalone/run_installer_as_root.txt.erb
 - resources/templates/undisclosed_error.html.template
 - resources/union_station_gateway.crt
-- rpm/Vagrantfile
-- rpm/apache-passenger.conf.in
-- rpm/config.json
-- rpm/get_distro_id.py
-- rpm/passenger.logrotate
-- rpm/passenger.spec.template
-- rpm/passenger_dynamic_thread_group.patch
-- rpm/passenger_tests_default_config_example.patch
-- rpm/rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch
-- rpm/rubygem-passenger-4.0.18-gcc47-include-sys_types.patch
 - test/.rspec
 - test/config.json.example
 - test/config.json.rpm-automation
@@ -2609,7 +2655,6 @@ files:
 - test/ruby/utils/tee_input_spec.rb
 - test/ruby/utils/unseekable_socket_spec.rb
 - test/ruby/utils_spec.rb
-- test/stub/.DS_Store
 - test/stub/apache2/httpd.conf.erb
 - test/stub/apache2/mime.types
 - test/stub/garbage1.dat

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT0PH2AAoJECrHRaUKISqM3rUH/AsN9NOP4ynTb+acSScLq/I/
-nF1Qv9XA8CW23M6Mx9boMgGcVC0B6NOP5I6T8WMHDBL3J6XLCOox0FeQ0kwAS1pZ
-y4uHVwNPvl3JTS8h2c50y7JeixN/WQodXvgb9WvtV6vJQKKaqQ65wAFKo2yk4Nn8
-hRipGYgrpuZsRG8/qKvk5iBa6qkWLrHWhWbekY/hS/zMAh+UlwV5UwUlL+Q8cf5L
-dOpPxu9qj1Fw2gdIRON4VJ/nW+MiH0skGCdtaLdVs+/aFW2DcF/5G28lcV7X1ANb
-vXL5NWRRM/ZveskFCFdbm5Irhp/dnf5PqPvoyljqsJh2O34e3PizXXtTN9a9kEw=
-=UGA6
+iQEcBAABAgAGBQJT91guAAoJECrHRaUKISqMKFUH/3l5bNbJGQZzDJb7jXjFt6GH
+jwS3UkvGCXNUv4Uv/JR1QTM6pX7yBLuIzKe+LABgMNR0woH0muGE/XGkwLy+sRPV
+zcXkElapA0m/1eFkc+V1Y8sQZOz0eSAGGyqmvP+1ihlsA0bzaVIcPzY0Hs9ex7ly
+r15XevCss1JHtU8Lk8zpbPWUsWqneZugBcKhl80p0Ih4dLdpDjx18H0eJAu1GTlu
+mlYbMsATa5plTgGrTkd7NpKRu9ZbPrGN8NpBGDHyhEPUhpzkDWx6jKMkfP8rPcRM
+ePnmfbRYdRvu/UFDkea/ITTGd6QmILX2Zl2Av7nkAmqNYHntgmrHTmMjglWOoxo=
+=50RB
 -----END PGP SIGNATURE-----

data/build/rpm.rb

@@ -1,128 +0,0 @@
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (C) 2010-2013  Phusion
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-RPM_NAME = "passenger"
-MOCK_OFFLINE = boolean_option('MOCK_OFFLINE', false)
-ALL_RPM_DISTROS = {
-	"el6" => { :mock_chroot_name => "epel-6", :distro_name => "Enterprise Linux 6" },
-	"amazon" => { :mock_chroot_name => "epel-6", :distro_name => "Amazon Linux" }
-}
-
-task 'rpm:sources' => ['package:set_official', 'package:tarball'] do
-	basename = "#{PACKAGE_NAME}-#{VERSION_STRING}"
-	nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
-
-	sh "cp #{PKG_DIR}/#{basename}.tar.gz rpm/* #{rpmbuild_root}/SOURCES/"
-	if File.exist?("#{rpmbuild_root}/SOURCES/nginx-#{nginx_version}.tar.gz")
-		puts "Local Nginx tarball already exists."
-	else
-		sh "curl -L -o #{rpmbuild_root}/SOURCES/nginx-#{nginx_version}.tar.gz http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
-	end
-end
-
-desc "Build RPM for local machine"
-task 'rpm:local' => 'rpm:sources' do
-	distro_id = `./rpm/get_distro_id.py`.strip
-	rpm_spec_dir = "#{rpmbuild_root}/SPECS"
-	spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
-	spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
-
-	sh "mkdir -p #{spec_target_dir}"
-	puts "Generating #{spec_target_file}"
-	Preprocessor.new.start("rpm/#{RPM_NAME}.spec.template",
-		spec_target_file,
-		:distribution => distro_id)
-
-	sh "rpmbuild -ba #{spec_target_file}"
-end
-
-task 'rpm:local:uninstall' do
-	sh "sudo yum remove -y passenger mod_passenger passenger-devel passenger-doc passenger-native-libs passenger-debuginfo"
-end
-
-task 'rpm:local:reinstall' => 'rpm:local:uninstall' do
-	rpm_spec_dir = "#{rpmbuild_root}/RPMS"
-	files = []
-	["passenger", "mod_passenger", "passenger-devel", "passenger-doc", "passenger-native-libs", "passenger-debuginfo"].each do |package_name|
-		files << Dir["#{rpm_spec_dir}/*/#{package_name}-#{PACKAGE_VERSION}-*.rpm"].first
-	end
-	files.compact!
-	if files.empty?
-		abort "No RPMs have been built yet. Please run 'rake rpm:local' first."
-	end
-	sh "sudo yum install -y #{files.join(' ')}"
-end
-
-def create_rpm_build_task(distro_id, mock_chroot_name, distro_name)
-	desc "Build RPM for #{distro_name}"
-	task "rpm:#{distro_id}" => 'rpm:gem' do
-		rpm_spec_dir = "#{rpmbuild_root}/SPECS"
-		spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
-		spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
-		maybe_offline = MOCK_OFFLINE ? "--offline" : nil
-
-		sh "mkdir -p #{spec_target_dir}"
-		puts "Generating #{spec_target_file}"
-		Preprocessor.new.start("rpm/#{RPM_NAME}.spec.template",
-			spec_target_file,
-			:distribution => distro_id)
-
-		sh "rpmbuild -bs #{spec_target_file}"
-		sh "mock --verbose #{maybe_offline} " +
-			"-r #{mock_chroot_name}-x86_64 " +
-			"--resultdir '#{PKG_DIR}/#{distro_id}' " +
-			"rebuild #{rpmbuild_root}/SRPMS/#{RPM_NAME}-#{PACKAGE_VERSION}-1#{distro_id}.src.rpm"
-	end
-end
-
-ALL_RPM_DISTROS.each_pair do |distro_id, info|
-	create_rpm_build_task(distro_id, info[:mock_chroot_name], info[:distro_name])
-end
-
-desc "Build RPMs for all distributions"
-task "rpm:all" => ALL_RPM_DISTROS.keys.map { |x| "rpm:#{x}" }
-
-desc "Publish RPMs for all distributions"
-task "rpm:publish" do
-	server = "juvia-helper.phusion.nl"
-	remote_dir = "/srv/oss_binaries_passenger/yumgems/phusion-misc"
-	rsync = "rsync -z -r --delete --progress"
-
-	ALL_RPM_DISTROS.each_key do |distro_id|
-		if !File.exist?("#{PKG_DIR}/#{distro_id}")
-			abort "No packages built for #{distro_id}. Please run 'rake rpm:all' first."
-		end
-	end
-	ALL_RPM_DISTROS.each_key do |distro_id|
-		sh "rpm --resign --define '%_signature gpg' --define '%_gpg_name #{PACKAGE_SIGNING_KEY}' #{PKG_DIR}/#{distro_id}/*.rpm"
-	end
-	sh "#{rsync} #{server}:#{remote_dir}/latest/ #{PKG_DIR}/yumgems/"
-	ALL_RPM_DISTROS.each_key do |distro_id|
-		distro_dir = "#{PKG_DIR}/#{distro_id}"
-		repo_dir = "#{PKG_DIR}/yumgems/#{distro_id}"
-		sh "mkdir -p #{repo_dir}"
-		sh "cp #{distro_dir}/#{RPM_NAME}*.rpm #{repo_dir}/"
-		sh "createrepo #{repo_dir}"
-	end
-	sh "ssh #{server} 'rm -rf #{remote_dir}/new && cp -dpR #{remote_dir}/latest #{remote_dir}/new'"
-	sh "#{rsync} #{PKG_DIR}/yumgems/ #{server}:#{remote_dir}/new/"
-	sh "ssh #{server} 'rm -rf #{remote_dir}/previous && mv #{remote_dir}/latest #{remote_dir}/previous && mv #{remote_dir}/new #{remote_dir}/latest'"
-end
-
-
-def rpmbuild_root
-	@rpmbuild_root ||= File.expand_path("~/rpmbuild")
-end

data/dev/rpmtool

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rake'
-
-class RpmTool
-	include Rake::DSL
-
-	def initialize(argv)
-		@argv = argv.dup
-	end
-
-	def start
-		parse_options
-	end
-
-private
-	def parse_options
-		sh "rake package:tarball"
-	end
-end
-
-RpmTool.new(ARGV).start

data/dev/test_rpm_packaging.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -ex
-
-sudo sh -c 'cat >> /etc/hosts' <<EOF
-127.0.0.1 passenger.test
-127.0.0.1 mycook.passenger.test
-127.0.0.1 zsfa.passenger.test
-127.0.0.1 norails.passenger.test
-127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test
-127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test
-127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test
-EOF
-
-# Don't care about the docs.
-for F in "Users guide.html" "Users guide Apache.html" "Users guide Nginx.html" "Users guide Standalone.html" "Packaging.html" "Security of user switching support.html" "Architectural overview.html"; do
-	if [[ ! -f "doc/$F" ]]; then
-		echo > "doc/$F"
-	fi
-done
-
-cp test/config.json.rpm-automation test/config.json
-
-rake test:install_deps DEVDEPS_DEFAULT=false BASE_DEPS=true RAILS_BUNDLES=true
-rake rpm:local rpm:local:reinstall
-rake test:integration:native_packaging SUDO=1
-env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
-	rake test:integration:apache2 \
-	SUDO=1

data/rpm/get_distro_id.py

@@ -1,4 +0,0 @@
-#!/usr/bin/env python
-vars = { 'config_opts': {} }
-execfile("/etc/mock/default.cfg", vars)
-print(vars['config_opts']['dist'])