passenger 4.0.32 → 4.0.33

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqM8wwH/j0P0Yff1jjVUyBqR1CVel7s
-lmb4rHr0L0tUZrjcjfvaS6/NjX7VLNzYbFQkHeC5BaldSKo1CKiXjjGhGdJlIj13
-feihJJVEf84r3EAFbt54Ye18CFAYMpGPeOGfjUtex8KidSLtPR5tv+uUpgSH4Sgr
-+icjINLTbyrWL828/nA3Hd4YWTY3w1HbSokVVaVqPgn4lZlOZArLqykNXqzJ6FLe
-+wvWGyIBGnqPPsHgzAYRHK0G86wjheD//Vs+7EcEVRLu08I852XHeCBQh8er9pf2
-gU5R85a1u3/+BaDum1eAobYyliwsg1h+aC+QhLMUSbWE8OmpqhjDI6pymdZG5Zk=
-=GfIW
+iQEcBAABAgAGBQJSxXh6AAoJECrHRaUKISqMPwMH/j/0ykK8uEZ7k7sGv9Ch/aYX
+TCPIgAwnnT1fckLnlKgMrPuLVos2BtMbCTD8gc0MWI2EYCI9JlQsrcgpWU9qAKEI
+JUGiwxVS9D0YbVFhdfSkqzeDu3VzNHCLB57OzRZr32ICCM6bOqkXcmrQ4gbMvk3Q
+dzDnESAbOybGNZ5PLQj5PXgNY6BWPt9FFrZ0zbM8CLLo3Jyk0t2+XEhknvLRrJYs
+M/kNcrrRCxXFiXYygCalsGHySmyYUumC5eZlkiPTfiaVMQBc6sZ2ZAROVSn2OUt+
+6aISpr4WR2Nk2pvhkxIWUjyZL9BP/H44I/v7rDVwSF4Iz3P32YRV0x1XkttuNYg=
+=GZg/
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,10 @@
+Release 4.0.33
+--------------
+
+ * Fixed a compatibility problem in passenger-install-apache2-module with Ruby 1.8.
+   The language selection menu didn't work properly.
+
+
 Release 4.0.32
 --------------
 

data/bin/passenger-install-apache2-module

@@ -334,7 +334,7 @@ private
 			sh! "sudo apt-get install #{DEB_APACHE_MODULE_PACKAGE}"
 			return true
 		when 'rpm'
-			sh! "sudo yum install #{RPM_APACHE_MODULE_PACKAGE}"
+			sh! "sudo yum install #{RPM_APACHE_MODULE_PACKAGE}-#{VERSION_STRING}"
 			return true
 		else
 			puts "<red>The #{PROGRAM_NAME} Apache module package is not installed.</red>"

data/build/rpm.rb

@@ -45,6 +45,23 @@ task 'rpm:local' => 'rpm:gem' do
 	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

data/dev/install_scripts_bootstrap_code.rb

@@ -17,6 +17,10 @@ if type == "--ruby"
 	ruby_libdir = ARGV.shift
 	BOOTSTRAP_CODE = %Q{
 		ENV["PASSENGER_LOCATION_CONFIGURATION_FILE"] = "#{ruby_libdir}/phusion_passenger/locations.ini"
+		begin
+			require 'rubygems'
+		rescue LoadError
+		end
 		require '#{ruby_libdir}/phusion_passenger'
 	}
 elsif type == "--nginx-module-config"

data/ext/common/Constants.h

@@ -86,7 +86,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.32"
+	#define PASSENGER_VERSION "4.0.33"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.32'
+	VERSION_STRING = '4.0.33'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/native_support.rb

@@ -197,7 +197,7 @@ private
 				STDERR.puts "     so that #{PhusionPassenger::PROGRAM_NAME} can compile one on the next run."
 			when 'rpm'
 				STDERR.puts "     This library provides various optimized routines that make"
-				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} faster. Please run 'sudo yum install #{PhusionPassenger::RPM_DEV_PACKAGE}'"
+				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} faster. Please run 'sudo yum install #{PhusionPassenger::RPM_DEV_PACKAGE}-#{PhusionPassenger::VERSION_STRING}'"
 				STDERR.puts "     so that #{PhusionPassenger::PROGRAM_NAME} can compile one on the next run."
 			else
 				STDERR.puts "     #{PhusionPassenger::PROGRAM_NAME} can compile one, but an extra package must be installed"

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -421,7 +421,7 @@ private
 			when "deb"
 				command = "sudo sh -c 'apt-get update && apt-get install #{DEB_DEV_PACKAGE}'"
 			when "rpm"
-				command = "sudo yum install #{RPM_DEV_PACKAGE}"
+				command = "sudo yum install #{RPM_DEV_PACKAGE}-#{VERSION_STRING}"
 			end
 			if command
 				if STDIN.tty?

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -103,7 +103,7 @@ private
 	end
 
 	def process_input
-		case STDIN.getc
+		case getchar(STDIN)
 		when "\x1b"
 			process_cursor_move
 			return false
@@ -118,8 +118,8 @@ private
 	end
 
 	def process_cursor_move
-		if STDIN.getc == "["
-			case STDIN.getc
+		if getchar(STDIN) == "["
+			case getchar(STDIN)
 			when "A" # up
 				@pointer = [@pointer - 1, 0].max
 			when "B" # down
@@ -176,6 +176,12 @@ private
 		return "\x1b[0A"
 	end
 
+	def getchar(io)
+		char = io.getc
+		char = char.chr if char.is_a?(Integer)
+		return char
+	end
+
 	if JRUBY
 		require 'java'
 		require 'readline'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.32
+  version: 4.0.33
   prerelease: 
 platform: ruby
 authors:

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqMeGgH/iBjRNu8fcUM1LTZTcK5xEcZ
-tjCQk/ChS/Y71UKB7QJdG/THQp3cc0O0QxDDbmjLbi6BvRSewZ4/4CagvQguQnQN
-IOh3Ox4j/CIX5OSjQt+FaNzyhV6F1e0Iqy/+bmJ/4jNJRCpoVw+Zy8BYsNn5TYmu
-qy1ueWoB+T42gBOQD31QBdxTqJY1v3+n2wjpy1rQB3tAmKHrey2xGWPgAznHL5mY
-n8FHjj8ESsRJkTdpI8LNdPOFuUfq4HF2U3XG7BUa/rpIskKj4aK5NQszJhpWQKul
-YZsXnDjY40CCGfNeHhKNQgebeAcrH+mX8Q1oh43hLm7jrBUqPWZaJONf02DdIIE=
-=DfHY
+iQEcBAABAgAGBQJSxXh6AAoJECrHRaUKISqMkwsH/1+nzM8YwJfyynuxyBC6DssR
+vXoUokFuVKXAXN1TqO69YQj6/2Et2qabk2UDSo2AXWSGnFbe6KYaAZkoiLPP/oC4
+PT7Wgr3qd13o5SI2ejkr84wgHU8ZL5qG2M3Ck8l3G5jV4nc/2yQUpGK1/WhNHMmX
+wTCdpoD/cLN63SV4hLfMxacy/3l6YfwSv/5hnKgccL98UHLHKyNuiFbkhihvVwaQ
+B50t4dsHE2+JKnbLnizbIrXCUorPK4g7nVPocFPPcLfbGaGNIg/1aQff6hR2erGy
+LZTo8wBFtH7rXrqWw+wZcPjJr8qT78RcN6zv+gTBXhKnFPCVSX/zgkOa4XgHE50=
+=1YLM
 -----END PGP SIGNATURE-----