Implement a system to recognize whether an install came from an offic…

…ial release package

bin/passenger-config

@@ -41,6 +41,7 @@ def help
 	puts "  --nginx-libs               Show Nginx runtime library flags."
 	puts "  --compiled                 Check whether runtime libraries are compiled."
 	puts "  --natively-packaged        Check whether Phusion Passenger is natively packged."
+	puts "  --installed-from-release-package  Check whether this installation came from an official release package."
 	puts "  --detect-apache2           Autodetect Apache installations."
 	puts "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
 	puts "  --rubyext-compat-id        Print the Ruby extension binary compatibility ID."
@@ -85,6 +86,12 @@ when "--natively-packaged"
 	else
 		exit 1
 	end
+when "--installed-from-release-package"
+	if PhusionPassenger.installed_from_release_package?
+		exit 0
+	else
+		exit 1
+	end
 when "--detect-apache2"
 	require 'phusion_passenger/platform_info/apache_detector'
 	detector = PhusionPassenger::PlatformInfo::ApacheDetector.new(STDOUT)

build/packaging.rb

@@ -49,8 +49,12 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 
 task :clobber => 'package:clean'
 
+task 'package:set_official' do
+	ENV['OFFICIAL_RELEASE'] = '1'
+end
+
 desc "Build, sign & upload gem & tarball"
-task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
+task 'package:release' => ['package:set_official', 'package:gem', 'package:tarball', 'package:sign'] do
 	require 'phusion_passenger'
 	require 'yaml'
 	require 'uri'
@@ -119,7 +123,20 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 
 task 'package:gem' => Packaging::PREGENERATED_FILES do
 	require 'phusion_passenger'
-	sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec --sign --key 0x0A212A8C"
+	if ENV['OFFICIAL_RELEASE']
+		release_file = "#{PhusionPassenger.resources_dir}/release.txt"
+		File.unlink(release_file) rescue nil
+	end
+	begin
+		if release_file
+			File.open(release_file, "w").close
+		end
+		sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec --sign --key 0x0A212A8C"
+	ensure
+		if release_file
+			File.unlink(release_file) rescue nil
+		end
+	end
 	sh "mkdir -p pkg"
 	sh "mv #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem pkg/"
 end
@@ -132,6 +149,9 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 	sh "rm -rf pkg/#{basename}"
 	sh "mkdir -p pkg/#{basename}"
 	recursive_copy_files(ORIG_TARBALL_FILES.call, "pkg/#{basename}")
+	if ENV['OFFICIAL_RELEASE']
+		File.open("pkg/#{basename}/resources/release.txt", "w").close
+	end
 	sh "cd pkg && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
 	sh "rm -rf pkg/#{basename}"
 end

debian.template/ruby-passenger.install

@@ -5,6 +5,7 @@ usr/share/passenger/standalone_default_root/
 usr/share/passenger/ruby_extension_source/
 usr/share/passenger/*.types
 usr/share/passenger/*.crt
+usr/share/passenger/*.txt
 usr/lib/ruby/
 debian/locations.ini usr/lib/ruby/vendor_ruby/phusion_passenger/
 usr/sbin/

debian.template/rules.template

@@ -26,6 +26,7 @@ override_dh_auto_install:
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
 	# Do not package Passenger Standalone.
 	rm -rf debian/tmp/usr/bin/passenger
+	touch debian/tmp/usr/share/passenger/release.txt
 
 override_dh_auto_clean:
 	/usr/bin/rake clean CLEAN_DOCS=false

helper-scripts/download_binaries/extconf.rb

@@ -42,6 +42,10 @@
 	puts "Binary downloading is only available when originally packaged. Stopping."
 	exit 0
 end
+if PhusionPassenger.installed_from_release_package?
+	puts "This Phusion Passenger is not installed from an official release package. Stopping."
+	exit 0
+end
 
 # Create download directory and do some preparation
 require 'phusion_passenger/platform_info'

lib/phusion_passenger.rb

@@ -129,6 +129,14 @@ def self.natively_packaged?
 		return @natively_packaged
 	end
 
+	# Whether the current Phusion Passenger installation is installed
+	# from a release package, e.g. an official gem or official tarball.
+	# Retruns false if e.g. the gem was built by the user, or if this
+	# install is from a git repository.
+	def self.installed_from_release_package?
+		File.exist?("#{resources_dir}/release.txt")
+	end
+
 	# When originally packaged, returns the source root.
 	# When natively packaged, returns the location of the location configuration file.
 	def self.source_root

passenger.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 	s.description = "A modern web server and application server for Ruby, Python and Node.js, " +
 		"optimized for performance, low memory usage and ease of use."
 
-	if ENV['WITH_DOWNLOADER']
+	if ENV['OFFICIAL_RELEASE']
 		s.extensions = ["helper-scripts/download_binaries/extconf.rb"]
 	end
 end

test/integration_tests/native_packaging_spec.rb

@@ -122,6 +122,10 @@ def which(command)
 			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 "shows the directory to the runtime library headers" do
 			capture_output("passenger-config --includedir").should == INCLUDEDIR
 		end