passenger 4.0.10 → 4.0.13

data/rpm/patches/passenger-force-native.patch

@@ -0,0 +1,63 @@
+diff --git a/lib/phusion_passenger.rb b/lib/phusion_passenger.rb
+index e747477..27e82f1 100644
+--- a/lib/phusion_passenger.rb
++++ b/lib/phusion_passenger.rb
+@@ -94,12 +94,12 @@ module PhusionPassenger
+ 		# Not available when natively packaged.
+ 		NATIVE_SUPPORT_DIR = File.join(SOURCE_ROOT, "ext", "ruby")
+ 	else
+-		SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_ROOT
+-		DOCDIR             = NATIVELY_PACKAGED_DOCDIR
+-		RESOURCES_DIR      = NATIVELY_PACKAGED_RESOURCES_DIR
+-		AGENTS_DIR         = NATIVELY_PACKAGED_AGENTS_DIR
+-		HELPER_SCRIPTS_DIR = NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR
+-		APACHE2_MODULE     = NATIVELY_PACKAGED_APACHE2_MODULE
++		SOURCE_ROOT        = '%%GEM_INSTALL_DIR%%'
++		DOCDIR             = "#{SOURCE_ROOT}/doc"
++		RESOURCES_DIR      = "#{SOURCE_ROOT}/resources"
++		HELPER_SCRIPTS_DIR = "#{SOURCE_ROOT}/helper-scripts"
++		APACHE2_MODULE     = '%%APACHE_INSTALLED_MOD%%'
++		NATIVE_SUPPORT_DIR = "#{SOURCE_ROOT}/ext/ruby"
+ 	end
+ 	
+ 	
+diff --git a/lib/phusion_passenger/native_support.rb b/lib/phusion_passenger/native_support.rb
+index f1edf1c..4312d01 100644
+--- a/lib/phusion_passenger/native_support.rb
++++ b/lib/phusion_passenger/native_support.rb
+@@ -38,10 +38,7 @@ class NativeSupportLoader
+ 
+ private
+ 	def archdir
+-		@archdir ||= begin
+-			require 'phusion_passenger/platform_info/binary_compatibility'
+-			PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+-		end
++		@archdir ||= 'native'
+ 	end
+ 	
+ 	def libext
+diff --git a/ext/common/ResourceLocator.h b/ext/common/ResourceLocator.h
+index 5f65804..e585d1a 100644
+--- a/ext/common/ResourceLocator.h
++++ b/ext/common/ResourceLocator.h
+@@ -64,13 +64,13 @@ public:
+ 				!fileExists(root + "/DEVELOPERS.TXT");
+ 			
+ 			if (nativelyPackaged) {
+-				agentsDir           = "/usr/lib/phusion-passenger/agents";
+-				helperScriptsDir    = "/usr/share/phusion-passenger/helper-scripts";
+-				resourcesDir        = "/usr/share/phusion-passenger";
+-				docDir              = "/usr/share/doc/phusion-passenger";
++				agentsDir           = "%%GEM_INSTALL_DIR%%/agents";
++				helperScriptsDir    = "%%GEM_INSTALL_DIR%%/helper-scripts";
++				resourcesDir        = "%%GEM_INSTALL_DIR%%";
++				docDir              = "%%GEM_INSTALL_DIR%%/doc";
+ 				rubyLibDir          = "";
+-				compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
+-				apache2Module       = "/usr/lib/apache2/modules/mod_passenger.so";
++				compilableSourceDir = "%%GEM_INSTALL_DIR%%";
++				apache2Module       = "%%APACHE_INSTALLED_MOD%%";
+ 			} else {
+ 				agentsDir           = root + "/agents";
+ 				helperScriptsDir    = root + "/helper-scripts";

data/rpm/release/RPM-GPG-KEY-stealthymonkeys

@@ -0,0 +1,33 @@
+GPG Signing key for rpms@stealthymonkeys.com
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (Darwin)
+
+mQENBEzHVv8BCAC1nWHsSRdv7bsZYFJLfwXPMxm5oR3OD/lldIKvJXcz6G/STaB8
+FL0vshaaHd2MR8vvn70hByLEjT6YK0e5BvjTspozRFW+k/Sqlj6AjNpLPPaig4GP
+rlaILL42ZrzXmC8UoxBrxJr4mrQn7nKVJDV5I1pPeZYK3kJD5yOwNDW+pGcRSeyw
+idTfBmazzBlLUKX/wFp4X/KNE8NJqaR5HyFPakcTNMIq6hl0pi+zfzEpulykmrJX
+7jCm1meiVyR1avtfpNRAGQWIJEhqXxBliyUFA3B+AorxKWe3Km7+499w8FdilBHB
+JrJU+FgUBYQ24h2HLD81dgx4NxSIVnFr02TLABEBAAG0NkVyaWsgT2dhbiAoUlBN
+IHNpZ25pbmcga2V5KSA8cnBtc0BzdGVhbHRoeW1vbmtleXMuY29tPokBPgQTAQgA
+KAUCTMdW/wIbAwsLCQgHCg0MCwMCBAYVCgkICwMFFgIDAQACHgECF4AACgkQPo92
+smVzqwlSnAf9G875hB1bE3FYf22YNMIkxSCTTnY/Yw/8c76xJQVEB2+Mx9V7wmiE
+75pIhL/GrqEpKMtCGK/pYy6Cvd1+VXRX40pqVHZCdkTGHWjtxTL0RunNGEueDXBb
+g1Qs810fIKM/7iqpc6bOx49B8F/jTzk8w8/iK3OMHjd4wLJf6CKmdC25O44KX3Ii
+QpGCzm1sV505TT4MFvO13VDg7XK/Xq+3q5w094ryDXidL3quGJTfvOWaE5/g5Bgh
+ISyO3W3Ak9MfRCzOK5eWao+ZZ2eow0tai5EEhuzakvX7dRNlIhvabjucar585lLP
+uP5h06nDSMXzD7PMnAF65g70gMungXLITLkBDQRMx1b/AQgArX1+UzcPYUbXj6nT
+H+iiRlegG/jPwkYRBwKZkG8Bme4GlTsR6uLDZR4K8zg9DckgbtFjBBpZ1WSWpqOD
+r7suhVAiL/Qev+Gk3H2Q12/4s6OBY0z8N//2UAa/h4R9DIMdP3jdhgP0XK0hmCiH
+z6ZRp3e0t4fZqP4wTfktSGaCzWZL/cG1d/4yclXKHQ8CnLcGf2xE2VhAFObajcHX
+sY2XWfPr7r+4PYjJ+S1lTMT4R+do8gxXDXq5ixN1TuAH5yGB2G2YzVNfFa5bXZFl
+cFnGXNJn3h3tHf9yT9D+yAq37lkqaZ8oByxmNvNi9HYQr8zo+9ztOOFcGgFTlPUT
+MLsk8QARAQABiQEfBBgBCAAJBQJMx1b/AhsMAAoJED6PdrJlc6sJIO0IAJgr2IrG
+WVMPRaU3vVSSC6gkdvn6bIhQuHqdTpw1HFyw/3nRGiPrAH0jmUSojPmTifTpx2Yv
+lsf5vkZjOUvyTB2yDU/pTO8nAarDDyVZv/KWRMruboxFUbqryN/hN747akfZGqt5
+0aAAfLukQQQ6TmDMEpy3AQKJITZnDylMw7J84UgGcL+iNeU7ogbW+H618gIhl0Sy
+eyZLwwC4sEDXEiRfS0o4JJnOjVshOfNE4tDDjVuLSQ3LW2hwaYJELBJls/ns44Nw
+BQTzTiSbDhOiSTGZr/IwXyRgBhbGfx9AvvPkqOIrKPY6kB+khAYiDdPunbSSg2I3
+BSuPuk9DJp+2Gsc=
+=pVe5
+-----END PGP PUBLIC KEY BLOCK-----

data/rpm/release/build-release.sh

@@ -0,0 +1,35 @@
+#!/bin/sh -e
+
+BUILD_VERBOSITY=${BUILD_VERBOSITY:-0}
+[ $BUILD_VERBOSITY -ge 3 ] && set -x
+
+reldir=`dirname $0`
+stage=./stage-release
+rm -rf $stage
+mkdir -p $stage/{SRPMS,SOURCES}
+ln -s `readlink -f $reldir/mirrors` $stage/SOURCES/mirrors-passenger
+ln -s `readlink -f $reldir/RPM-GPG-KEY-stealthymonkeys` $stage/SOURCES
+
+rpmbuild-md5 --define "_topdir $stage" --define 'dist %nil' -bs passenger-release.spec
+rm -rf $stage/{SOURCES,BUILD*,RPMS,SPECS}
+srpm=`ls -1t $stage/SRPMS/*rpm | head -1`
+
+for ver in {epel-5,fedora-{13,14}}
+do
+	echo --------- $ver
+	xdir=$stage/`echo $ver | tr '-' '/'`/x86_64
+	idir=`echo $xdir | sed -e 's/x86_64/i386/'`
+	mock -r passenger-$ver-x86_64 $srpm
+	mkdir -p $xdir $idir
+	cp /var/lib/mock/passenger-$ver-x86_64/result/*noarch.rpm $xdir
+	cp /var/lib/mock/passenger-$ver-x86_64/result/*noarch.rpm $idir
+	cd $xdir/..
+	short=`ls -1t x86_64/*rpm | head -1 | perl -pe 's{.*/(.*)-[^-]+-[^-]+(.noarch.rpm)}{\1\2}'`
+	ln -s x86_64/*rpm $short
+	cd -
+done
+
+mv $stage/epel $stage/rhel
+# Don't resign symlinks
+# -- arguably this should be done once for each file, since they're copied
+rpm --addsign `find $stage -type f`

data/rpm/release/build.rb

@@ -0,0 +1,301 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'ftools'
+require 'optparse'
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'phusion_passenger'
+
+CFGLIMIT=%w{fedora-{13,14} epel-5}
+
+stage_dir='./stage'
+
+mock_base_dir = '/var/lib/mock'
+mock_repo_dir = "#{mock_base_dir}/passenger-build-repo"
+mock_etc_dir='/etc/mock'
+#mock_etc_dir='/tmp/mock'
+
+# If rpmbuild-md5 is installed, use it for the SRPM, so EPEL machines can read it.
+rpmbuild = '/usr/bin/rpmbuild' + (File.exist?('/usr/bin/rpmbuild-md5') ? '-md5' : '')
+rpmtopdir = `rpm -E '%_topdir'`.chomp
+rpmarch = `rpm -E '%_arch'`.chomp
+
+@verbosity = 0
+
+@can_build	 = {
+	'i386'		=> %w{i586 i686},
+	'i686'		=> %w{i586 i686},
+	'ppc'			=> %w{},
+	'ppc64'		=> %w{ppc},
+	's390x'		=> %w{},
+	'sparc'		=> %w{},
+	'sparc64' => %w{sparc},
+	'x86_64'	=> %w{i386 i586 i686},
+}
+
+#@can_build.keys.each {|k| @can_build[k].push k}
+@can_build = @can_build[rpmarch.to_s == '' ? 'x86_64' : rpmarch]
+@can_build.push rpmarch
+
+bindir=File.dirname(File.expand_path __FILE__)
+
+configs = Dir["#{mock_etc_dir}/{#{CFGLIMIT.join ','}}*"].map {|f| f.gsub(%r{.*/([^.]*).cfg}, '\1')}
+
+def limit_configs(configs, limits)
+	tree = configs.inject({}) do |m,c|
+		(distro,version,arch) = c.split /-/
+		next m unless @can_build.include?(arch)
+		[
+			# Rather than construct this list programatically, just spell it out
+			'',
+			distro,
+			"#{distro}-#{version}",
+			"#{distro}-#{version}-#{arch}",
+			"#{distro}--#{arch}",
+			"--#{arch}",
+			# doubtful these will be used, but for completeness
+			"-#{version}",
+			"-#{version}-#{arch}",
+		].each do |pattern|
+			unless m[pattern]
+				m[pattern] = []
+			end
+			m[pattern].push c
+		end
+		m
+	end
+	tree.default = []
+	# Special case for no arguments
+	limits = [nil] if limits.empty?
+	# By splitting and rejoining we normalize the distro--, etc. cases.
+	return limits.map do |l|
+		parts = l.to_s.split(/-/).map {|v| v == '*' ? nil : v}
+		if parts[2] && !@can_build.include?(parts[2])
+			abort "ERROR: Cannot build '#{parts[2]}' packages on '#{rpmarch}'"
+		end
+		tree[parts.join '-']
+	end.flatten
+end
+
+def noisy_system(*args)
+	puts(args.join(' ')) if @verbosity > 0
+	system(*args)
+end
+
+
+############################################################################
+options = {}
+OptionParser.new do |opts|
+	opts.banner = "Usage: #{$0} [options] [distro-version-arch] [distro-version] [distro--arch] [*--arch]"
+
+	opts.on("-v", "--[no-]verbose", "Run verbosely. Add more -v's to increase @verbosity") do |v|
+		@verbosity += v ? 1 : -1
+	end
+
+	opts.on('-s', '--single', 'Only build a single distro-rev-arch set (for this machine)') do |v|
+		options[:single] = true
+	end
+
+	# Do these with options, because the order matters
+	opts.on('-b', '--mock-base-dir DIR', "Mock's base directory. Default: #{mock_base_dir}") do |v|
+		#mock_repo_dir = v
+		options[:mock_base_dir] = v
+	end
+
+	opts.on('-m', '--mock-repo-dir DIR', "Directory for special mock yum repository. Default: #{mock_repo_dir}") do |v|
+		#mock_repo_dir = v
+		options[:mock_repo_dir] = v
+	end
+
+	opts.on("-c", "--mock-config-dir DIR", "Directory for mock configuration. Default: #{mock_etc_dir}") do |v|
+		if File.directory?(v)
+			mock_etc_dir=v
+		else
+			abort "No such directory: #{v}"
+		end
+	end
+
+	opts.on('-d', '--stage-dir DIR', "Staging directory. Default: #{stage_dir}") do |v|
+		stage_dir = v
+	end
+
+	opts.on('-e', '--extra-packages DIR', "Directory for extra packages to install.") do |v|
+		options[:extra_packages] = v
+	end
+
+	opts.on('-r', '--include-release', "Also build passenger-release packages") do
+		options[:release] = true
+	end
+
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
+		exit
+	end
+end.parse!
+
+if options.key?(:mock_base_dir) || options.key?(:mock_repo_dir)
+	if options.key?(:mock_base_dir)
+		mock_base_dir = options[:mock_base_dir]
+		mock_repo_dir = "#{mock_base_dir}/passenger-build-repo"
+	end
+	if options.key?(:mock_repo_dir)
+		mock_repo_dir = options[:mock_repo_dir]
+		unless mock_repo_dir[0] == '/'[0]
+			mock_repo_dir = "#{mock_base_dir}/#{mock_repo_dir}"
+		end
+	end
+end
+
+limit = ARGV
+if options.key?(:single)
+	# This can probably be simplified
+	limit = [`rpm --queryformat '%{name}\t%{version}' -qf /etc/redhat-release`.sub(/(\w+)-release\t(\d+)/,'\1-\2').sub(/^(rhel|centos|sl)-/,'epel-') + "-#{`rpm -E '%{_host_cpu}'`.strip}"]
+end
+
+configs = limit_configs(configs, limit)
+
+if configs.empty?
+	abort "Can't find a set of configs for '#{ARGV[0]}' (hint try 'fedora' or 'fedora-14' or even 'fedora-14-x86_64')"
+end
+
+puts "BUILD:\n	" + configs.join("\n	") if @verbosity >= 2
+
+# Too much of what follows expects this. Revisit it later.
+Dir.chdir(File.join(File.dirname(__FILE__), '..'))
+
+FileUtils.rm_rf(stage_dir, :verbose => @verbosity > 0)
+FileUtils.mkdir_p(stage_dir, :verbose => @verbosity > 0)
+
+ENV['BUILD_VERBOSITY'] = @verbosity.to_s
+
+# Check the ages of the configs for validity
+mtime = File.mtime("#{bindir}/mocksetup.sh")
+if configs.any? {|c| mtime > File.mtime("#{mock_etc_dir}/passenger-#{c}.cfg") rescue true }
+	unless noisy_system("#{bindir}/mocksetup.sh", mock_repo_dir, mock_etc_dir)
+		abort <<EndErr
+Unable to run "#{bindir}/mocksetup.sh #{mock_repo_dir}". It is likely that you
+need to run this command as root the first time, but if you have already done
+that, it could also be that the current user (or this shell) is not in the
+'mock' group.
+EndErr
+	end
+end
+
+srcdir=`rpm -E '%{_sourcedir}'`.chomp
+
+FileUtils.ln_sf(Dir["#{Dir.getwd}/{config/,patches/,release/RPM-GPG}*"], srcdir, :verbose => @verbosity > 0)
+
+# Force the default versions in the spec file to be the ones in the source so a given SRPM doesn't need a --define to set versions.
+specdir="/tmp/#{`whoami`.strip}-specfile-#{Process.pid}"
+FileUtils.rm_rf(specdir, :verbose => @verbosity > 0)
+begin
+	FileUtils.mkdir_p(specdir, :verbose => @verbosity > 0)
+	FileUtils.cp('passenger.spec', specdir, :verbose => @verbosity > 0)
+	# + must be escaped, but * doesn't? And people wonder why I hate sed.
+	abort "Can't edit specfile" unless noisy_system('sed', '-i',
+		'-e', "s/^\\(\\([[:space:]]*\\)%define[[:space:]]\\+passenger_version[[:space:]]\\)\\+[0-9.]\\+.*/\\2# From Passenger Source\\n\\1#{PhusionPassenger::VERSION_STRING}/",
+		'-e', "s/^\\(\\([[:space:]]*\\)%define[[:space:]]\\+nginx_version[[:space:]]\\)\\+[0-9.]\\+.*/\\2# From Passenger Source\\n\\1#{PhusionPassenger::PREFERRED_NGINX_VERSION}/",
+		"#{specdir}/passenger.spec")
+	# No dist for SRPM
+	unless noisy_system(rpmbuild, *((@verbosity > 0 ? [] : %w{--quiet}) + ['--define', 'dist %nil', '-bs', "#{specdir}/passenger.spec"]))
+		abort "No SRPM was built. See above for the error"
+	end
+ensure
+	 FileUtils.rm_rf(specdir, :verbose => @verbosity > 0)
+end
+
+srpm="rubygem-passenger-#{PhusionPassenger::VERSION_STRING}-#{`grep '%define passenger_release' passenger.spec | awk '{print $3}'`.strip}.src.rpm".sub(/%\{[^}]+\}/, '')
+
+FileUtils.mkdir_p(stage_dir + '/SRPMS', :verbose => @verbosity > 0)
+
+FileUtils.cp("#{rpmtopdir}/SRPMS/#{srpm}", "#{stage_dir}/SRPMS", :verbose => @verbosity > 0)
+
+if options[:release]
+	# It's not EXACTLY equivalent, is it? (REALLY doesn't want to symlink to a different name)
+	# FileUtils.ln_sf(Dir["#{Dir.getwd}/release/mirrors"], "#{srcdir}/mirrors-passenger", :verbose => @verbosity > 0)
+	FileUtils.ln_sf(Dir["#{Dir.getwd}/release/mirrors"], srcdir, :verbose => @verbosity > 0)
+	FileUtils.rm_f( "#{srcdir}/mirrors-passenger", :verbose => @verbosity > 0)
+	FileUtils.mv("#{srcdir}/mirrors", "#{srcdir}/mirrors-passenger", :force => true, :verbose => @verbosity > 0)
+	unless noisy_system(rpmbuild, *((@verbosity > 0 ? [] : %w{--quiet}) + ['--define', 'dist %nil', '-bs', "passenger-release.spec"]))
+		abort "No passenger-release SRPM was built. See above for the error"
+	end
+	rel_version = `grep '^Version:' passenger-release.spec | awk '{print $2}'`.to_i
+	rel_release = `grep '^Release:' passenger-release.spec | awk '{print $2}'`.to_i
+	@rel_srpm = "passenger-release-#{rel_version}-#{rel_release}.src.rpm"
+	FileUtils.cp("#{rpmtopdir}/SRPMS/passenger-release-#{rel_version}-#{rel_release}.src.rpm",
+							 "#{stage_dir}/SRPMS", :verbose => @verbosity > 0)
+end
+
+mockvolume = @verbosity >= 2 ? %w{-v} : @verbosity < 0 ? %w{-q} : []
+
+@release_cache = {}
+
+configs.each do |cfg|
+	puts "---------------------- Building #{cfg}" if @verbosity >= 0
+	pcfg = 'passenger-' + cfg
+
+	idir = './pkg'
+
+	unless options.key?(:single)
+		idir = File.join stage_dir, cfg.split(/-/)
+	end
+
+	# Move *mockvolume to the end, since it causes Ruby to cry in the middle
+	# Alt sol'n: *(foo + ['bar'] )
+	unless noisy_system('mock', '-r', pcfg, "#{stage_dir}/SRPMS/#{srpm}", *mockvolume)
+		abort "Mock failed. See above for details"
+	end
+	FileUtils.mkdir_p(idir, :verbose => @verbosity > 0)
+	FileUtils.cp(Dir["#{mock_base_dir}/#{pcfg}/result/*.rpm"],
+							 idir, :verbose => @verbosity > 0)
+	if options.key?(:extra_packages)
+		FileUtils.cp(Dir["#{options[:extra_packages]}/*.rpm"], idir, :verbose => @verbosity > 0)
+	end
+
+	if options[:release]
+		cache_key = cfg.split(/-/).first(2).join('-')
+		# There is little sense in rebuilding a noarch package over & over
+		if @release_cache[cache_key]
+			FileUtils.cp(@release_cache[cache_key], idir, :verbose => @verbosity > 0)
+		else
+			unless noisy_system('mock', '-r', pcfg, "#{stage_dir}/SRPMS/#{@rel_srpm}", *mockvolume)
+				abort "Release Mock failed. See above for details"
+			end
+
+			FileUtils.cp(Dir["#{mock_base_dir}/#{pcfg}/result/*.rpm"],
+									 idir, :verbose => @verbosity > 0)
+			@release_cache[cache_key] = Dir["#{idir}/passenger-release*noarch.rpm"].last
+		end
+	end
+
+	FileUtils.rm_f(Dir["#{idir}/*.src.rpm"], :verbose => @verbosity > 1)
+end
+
+unless options.key?(:single)
+	if File.directory?("#{stage_dir}/epel")
+		FileUtils.mv "#{stage_dir}/epel", "#{stage_dir}/rhel", :verbose => @verbosity > 0
+	end
+end
+
+if options[:release]
+	Dir["#{stage_dir}/*/*"].each do |distro_version|
+		next unless File.directory?(distro_version)
+		arch = Dir["#{distro_version}/{#{@can_build.sort.join ','}}"].last
+		pkg = Dir["#{arch}/passenger-release*rpm"].last
+		pkg = pkg.split(/#{File::SEPARATOR}/).last(2)
+		FileUtils.ln_sf(File.join(pkg), "#{distro_version}/passenger-release.noarch.rpm", :verbose => @verbosity > 0)
+	end
+end
+
+unless `rpm -E '%{?_gpg_name}'`.strip == ''
+	signor=`rpm -E '%{_gpg_name}'`.strip
+	key=`gpg --list-key #{signor} | grep '^pub' | awk '{print $2}' | cut -d/ -f2`
+	# Don't re-sign packages already signed by your key
+	files=Dir["#{options.key?(:single) ? 'pkg' : stage_dir}/**/*.rpm"].select do |rpm|
+		!File.symlink?(rpm) && (`rpm --checksig #{rpm}` !~ /#{key}/)
+	end
+
+	noisy_system('rpm', '--addsign', *files)
+end

data/rpm/release/create-mirrors.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+dir=`dirname $0`
+mirrors="$dir/mirrors"
+
+echo "D: $dir"
+
+for path in fedora rhel
+do
+	for mirror in $(cat $mirrors); do
+		if [ "${mirror:(-1)}" != "/" ] ; then
+			mirror="$mirror/"
+		fi
+		echo "$mirror$path/\$releasever/\$basearch/"
+	done > $path/mirrors
+done