passenger 4.0.5 → 4.0.6

data/build/preprocessor.rb

@@ -0,0 +1,314 @@
+# encoding: utf-8
+#  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.
+
+# Implements a simple preprocessor language:
+# 
+#     Today
+#     #if @today == :fine
+#         is a fine day.
+#     #elif @today == :good
+#         is a good day.
+#     #else
+#         is a sad day.
+#     #endif
+#     Let's go walking.
+# 
+# When run with...
+# 
+#     Preprocessor.new.start('input.txt', 'output.txt', :today => :fine)
+# 
+# ...will produce:
+# 
+#     Today
+#     is a fine day.
+#     Let's go walking.
+# 
+# Highlights:
+# 
+#  * #if blocks can be nested.
+#  * Expressions are Ruby expressions, evaluated within the binding of a
+#    Preprocessor::Evaluator object.
+#  * Text inside #if/#elif/#else are automatically unindented.
+class Preprocessor
+	def initialize
+		@indentation_size = 4
+		@debug = boolean_option('DEBUG')
+	end
+
+	def start(filename, output_filename, variables = {})
+		if output_filename
+			temp_output_filename = "#{output_filename}._new"
+			output = File.open(temp_output_filename, 'w')
+		else
+			output = STDOUT
+		end
+		the_binding  = create_binding(variables)
+		context      = []
+		@lineno      = 1
+		@indentation = 0
+
+		each_line(filename) do |line|
+			debug("context=#{context.inspect}, line=#{line.inspect}")
+
+			name, args_string, cmd_indentation = recognize_command(line)
+			case name
+			when "if"
+				case context.last
+				when nil, :if_true, :else_true
+					check_indentation(cmd_indentation)
+					result = the_binding.eval(args_string, filename, @lineno)
+					context.push(result ? :if_true : :if_false)
+					inc_indentation
+				when :if_false, :else_false, :if_ignore
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context.push(:if_ignore)
+				else
+					terminate "#if is not allowed in this context"
+				end
+			when "elif"
+				case context.last
+				when :if_true
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :if_false
+				when :if_false
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					result = the_binding.eval(args_string, filename, @lineno)
+					context[-1] = result ? :if_true : :if_false
+				when :else_true, :else_false
+					terminate "#elif is not allowed after #else"
+				when :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+				else
+					terminate "#elif is not allowed outside #if block"
+				end
+			when "else"
+				case context.last
+				when :if_true
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :else_false
+				when :if_false
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :else_true
+				when :else_true, :else_false
+					terminate "it is not allowed to have multiple #else clauses in one #if block"
+				when :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+				else
+					terminate "#else is not allowed outside #if block"
+				end
+			when "endif"
+				case context.last
+				when :if_true, :if_false, :else_true, :else_false, :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					context.pop
+				else
+					terminate "#endif is not allowed outside #if block"
+				end
+			when "", nil
+				# Either a comment or not a preprocessor command.
+				case context.last
+				when nil, :if_true, :else_true
+					output.puts(unindent(line))
+				else
+					# Check indentation but do not output.
+					unindent(line)
+				end
+			else
+				terminate "Unrecognized preprocessor command ##{name.inspect}"
+			end
+
+			@lineno += 1
+		end
+	ensure
+		if output_filename && output
+			output.close
+			stat = File.stat(filename)
+			File.chmod(stat.mode, temp_output_filename)
+			File.chown(stat.uid, stat.gid, temp_output_filename) rescue nil
+			File.rename(temp_output_filename, output_filename)
+		end
+	end
+
+private
+	UBUNTU_DISTRIBUTIONS = {
+		"lucid"    => "10.04",
+		"maverick" => "10.10",
+		"natty"    => "11.04",
+		"oneiric"  => "11.10",
+		"precise"  => "12.04",
+		"quantal"  => "12.10",
+		"raring"   => "13.04",
+		"saucy"    => "13.10"
+	}
+
+	# Provides the DSL that's accessible within.
+	class Evaluator
+		def _infer_distro_table(name)
+			if UBUNTU_DISTRIBUTIONS.has_key?(name)
+				return UBUNTU_DISTRIBUTIONS
+			end
+		end
+
+		def is_distribution?(expr)
+			if @distribution.nil?
+				raise "The :distribution variable must be set"
+			else
+				if expr =~ /^(>=|>|<=|<|==|\!=)[\s]*(.+)/
+					comparator = $1
+					name = $2
+				else
+					raise "Invalid expression #{expr.inspect}"
+				end
+
+				table1 = _infer_distro_table(@distribution)
+				table2 = _infer_distro_table(name)
+				raise "Distribution name #{@distribution.inspect} not recognized" if !table1
+				raise "Distribution name #{name.inspect} not recognized" if !table2
+				v1 = table1[@distribution]
+				v2 = table2[name]
+				
+				case comparator
+				when ">"
+					return v1 > v2
+				when ">="
+					return v1 >= v2
+				when "<"
+					return v1 < v2
+				when "<="
+					return v1 <= v2
+				when "=="
+					return v1 == v2
+				when "!="
+					return v1 != v2
+				else
+					raise "BUG"
+				end
+			end
+		end
+	end
+
+	def each_line(filename)
+		File.open(filename, 'r') do |f|
+			while true
+				begin
+					line = f.readline.chomp
+				rescue EOFError
+					break
+				end
+				yield line
+			end
+		end
+	end
+	
+	def recognize_command(line)
+		if line =~ /^([\s\t]*)#(.+)/
+			indentation_str = $1
+			command = $2
+
+			# Declare tabs as equivalent to 4 spaces. This is necessary for
+			# Makefiles in which the use of tabs is required.
+			indentation_str.gsub!("\t", "    ")
+
+			name = command.scan(/^\w+/).first
+			# Ignore shebangs and comments.
+			return if name.nil?
+
+			args_string = command.sub(/^#{Regexp.escape(name)}[\s\t]*/, '')
+			return [name, args_string, indentation_str.to_s.size]
+		else
+			return nil
+		end
+	end
+
+	def create_binding(variables)
+		object = Evaluator.new
+		variables.each_pair do |key, val|
+			object.send(:instance_variable_set, "@#{key}", val)
+		end
+		return object.instance_eval do
+			binding
+		end
+	end
+
+	def inc_indentation
+		@indentation += @indentation_size
+	end
+
+	def dec_indentation
+		@indentation -= @indentation_size
+	end
+
+	def check_indentation(expected)
+		if expected != @indentation
+			terminate "wrong indentation: found #{expected} characters, should be #{@indentation}"
+		end
+	end
+
+	def unindent(line)
+		line =~ /^([\s\t]*)/
+		# Declare tabs as equivalent to 4 spaces. This is necessary for
+		# Makefiles in which the use of tabs is required.
+		found = $1.to_s.gsub("\t", "    ").size
+		
+		if found >= @indentation
+			# Tab-friendly way to remove indentation.
+			remaining = @indentation
+			line = line.dup
+			while remaining > 0
+				if line[0..0] == " "
+					remaining -= 1
+				else
+					# This is a tab.
+					remaining -= 4
+				end
+				line.slice!(0, 1)
+			end
+			return line
+		else
+			terminate "wrong indentation: found #{found} characters, should be at least #{@indentation}"
+		end
+	end
+
+	def debug(message)
+		puts "DEBUG:#{@lineno}: #{message}" if @debug
+	end
+
+	def terminate(message)
+		abort "*** ERROR: line #{@lineno}: #{message}"
+	end
+end

data/build/test_basics.rb

@@ -49,6 +49,7 @@ task 'test:install_deps' do
 	gem_install = "#{PlatformInfo.ruby_sudo_command} #{gem_install}" if boolean_option('SUDO')
 	sh "#{gem_install} rails -v 2.3.15"
 	sh "#{gem_install} bundler rspec mime-types daemon_controller json rack"
+	sh "#{gem_install} mizuho bluecloth" if boolean_option('DOCTOOLS', true)
 	if boolean_option('RAILS_BUNDLES', true)
 		sh "cd test/stub/rails3.0 && bundle install"
 		sh "cd test/stub/rails3.1 && bundle install"

data/{debian → debian.template}/changelog

@@ -1,3 +1,134 @@
+ruby-passenger (1:4.0.5-1bbox1~precise1) precise; urgency=high
+
+  * New upstream release, 4.0.5. Fixes CVE-2013-2119
+
+ -- John Leach <john@brightbox.co.uk>  Wed, 29 May 2013 16:02:35 +0100
+
+ruby-passenger (1:4.0.4-1bbox1~precise1) precise; urgency=low
+
+  * New upstream release, 4.0.4
+
+ -- John Leach <john@brightbox.co.uk>  Tue, 28 May 2013 12:02:36 +0100
+
+ruby-passenger (1:4.0.3-bbox1~lucid1) lucid; urgency=low
+
+  * New upstream release, 4.0.3
+  * Remove packaging fix patches now applied upstream
+  * Set Breaks field to remove old passenger packages
+
+ -- John Leach <john@brightbox.co.uk>  Sat, 25 May 2013 11:50:16 +0100
+
+ruby-passenger (1:4.0.2-bbox2~lucid1) lucid; urgency=low
+
+  * New upstream release, 4.0.2
+
+ -- John Leach <john@brightbox.co.uk>  Wed, 22 May 2013 14:04:01 +0000
+
+passenger (1:3.0.14-1bbox1+ng) precise; urgency=low
+
+  * New upstream release, 3.0.14
+  * Bumped epoch to 1 to always prefer over the non-ruby-ng packages
+
+ -- John Leach <john@brightbox.co.uk>  Wed, 25 Jul 2012 18:21:17 +0100
+
+passenger (3.0.13-1bbox2+ng) precise; urgency=low
+
+  * Removed 01_disable_html5_documentation.patch
+
+ -- John Leach <john@brightbox.co.uk>  Fri, 15 Jun 2012 16:10:50 +0100
+
+passenger (3.0.13-1bbox1+ng) precise; urgency=low
+
+  * New upstream release, 3.0.13
+
+ -- John Leach <john@brightbox.co.uk>  Fri, 15 Jun 2012 12:16:50 +0100
+
+passenger (3.0.12-1bbox1+ng) lucid; urgency=low
+
+  * New upstream release, 3.0.12
+
+ -- John Leach <john@brightbox.co.uk>  Fri, 13 Apr 2012 17:19:42 +0100
+
+passenger (3.0.11-2bbox5) lucid; urgency=low
+
+  * Fix dependencies to avoid conflicts when upgrading from old
+    passenger-common packages
+
+ -- John Leach <john@brightbox.co.uk>  Thu, 05 Apr 2012 12:51:50 +0100
+
+passenger (3.0.11-2bbox4) lucid; urgency=low
+
+  * Added libgoogle-perftools-dev build dependency, for building with Ruby
+    Enterprise Edition
+
+ -- John Leach <john@brightbox.co.uk>  Thu, 23 Feb 2012 20:19:41 +0000
+
+passenger (3.0.11-2bbox3) lucid; urgency=low
+
+  * Added ruby1.9.1-dev build dependency
+
+ -- John Leach <john@brightbox.co.uk>  Wed, 22 Feb 2012 23:34:40 +0000
+
+passenger (3.0.11-2bbox2) lucid; urgency=low
+
+  * Support for ruby 1.9.x (adds passenger-common1.8 and
+    passenger-common1.9.1)
+
+ -- John Leach <john@brightbox.co.uk>  Wed, 22 Feb 2012 17:43:02 +0000
+
+passenger (3.0.11-1bbox1) lucid; urgency=low
+
+  * New upstream release, 3.0.11
+
+ -- John Leach <john@brightbox.co.uk>  Mon, 28 Nov 2011 12:32:08 +0000
+
+passenger (3.0.9-1bbox1) lucid; urgency=low
+
+  * New upstream release, 3.0.9
+
+ -- John Leach <john@brightbox.co.uk>  Mon, 05 Sep 2011 22:21:03 +0100
+
+passenger (3.0.8-1bbox1) lucid; urgency=low
+
+  * New upstream release, 3.0.8
+  * Added 01_disable_html5_documentation.patch to fix documentation build with
+    older versions of asciidoc
+
+ -- John Leach <john@brightbox.co.uk>  Thu, 04 Aug 2011 22:28:58 +0100
+
+passenger (3.0.7-1bbox2) lucid; urgency=low
+
+  * Made passenger-dev suitable for building nginx-passenger
+
+ -- John Leach <john@brightbox.co.uk>  Fri, 15 Apr 2011 11:36:04 +0100
+
+passenger (3.0.7-1bbox1) lucid; urgency=low
+
+  * New upstream version, 3.0.7
+
+ -- John Leach <john@brightbox.co.uk>  Thu, 14 Apr 2011 21:54:24 +0100
+
+passenger (3.0.4-1bbox1) lucid; urgency=low
+
+  * New upstream version
+  * Removed 01_add_missing_packaging_constants.patch as it's now upstream
+  * Initial passenger-dev package
+
+ -- John Leach <john@brightbox.co.uk>  Thu, 03 Mar 2011 11:56:57 +0000
+
+passenger (3.0.1-1bbox2) hardy; urgency=low
+
+  * Fixed packaging bug with vendored libev
+
+ -- John Leach <john@brightbox.co.uk>  Sun, 12 Dec 2010 16:57:41 +0000
+
+passenger (3.0.1-1bbox1) hardy; urgency=low
+
+  * New Upstream Version, 3.0.1
+  * Added 01_add_missing_packaging_constants.patch to fix issue #592
+
+ -- John Leach <john@brightbox.co.uk>  Sun, 12 Dec 2010 14:20:31 +0000
+
 passenger (3.0.0-1bbox3) hardy; urgency=low
 
   * Fixed clean of vendored libev