passenger 4.0.28 → 4.0.29

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSqk+mAAoJECrHRaUKISqMCXMH/0yR6UfIRO+gegZ6wOXbdWK5
-s4tZI2rTzfPsGCbSJOCqjiQCBPnDxThstj9WYSrQOe1hzeH8XawSg6guscHLt47/
-1FIgUo0Jkls+UTyi3+pDIfpX8LVN+y7TkP4AjSUIhQn2YqcpgmuxeUbfh1sScOQ0
-hDuPuf6QCstmnMyNEXGQgOTzoU7xhYi3kwsl/Xqnw8+WvEKfauHGA4Z+bGg2FX/x
-0ULNgVMsxVb657JHK90VVXltIry5OCt6z+NEm+pX8BdHJepVeNgnaiYt09JECTyS
-1ZH8jffTTaog1teX0Izr7sxWyySxaah4ESIsZ8qf76qJthpnmhjOk+XZDmdOHbI=
-=KvaW
+iQEcBAABAgAGBQJSquxWAAoJECrHRaUKISqMI5IIAKQ5flwiQqUmm4+aKrma7yc+
+45T1C0wIRGWK0s/3QwOduizNFtU1rVhPTxl0nNRoYjn111fAG5eloPVbgOnGlhB1
+Xzw+wX4Ki2hmQCLzwCcw0+OQ7cMNVD7x2d5MCFKpP3AF7W5Ox+9IKHFvFktArTZg
+KCeX5OObw+IlkLPmLMmJBrkyrITSLXtHe9Fj9qVosEGriSiT1RFWHPm7M3qBatB9
+TwH/c/AzcKfmQLZTPlIR5+k1vTC3GI6UdP6qrw8KHH+DCItneXHkV8JKZSygWpjx
+akFIRfMwPMXs7He7Juus2e2GzX4hNQmTZQmum9hl4vPxxVJOiFqAqQkztjnWFI0=
+=LEIN
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,9 @@
+Release 4.0.29
+--------------
+
+ * Fixed a compilation problem on OS X Mavericks.
+
+
 Release 4.0.28
 --------------
 

data/ext/common/Constants.h

@@ -78,7 +78,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.28"
+	#define PASSENGER_VERSION "4.0.29"
 
 	#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.28'
+	VERSION_STRING = '4.0.29'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/common_library.rb

@@ -102,11 +102,11 @@ class CommonLibraryBuilder
 
 	def define_tasks(extra_compiler_flags = nil)
 		flags =  "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
-		flags << EXTRA_CXXFLAGS
-		flags.strip!
+		cflags = (flags + EXTRA_CFLAGS).strip
+		cxxflags = (flags + EXTRA_CXXFLAGS).strip
 
 		group_all_components_by_category.each_pair do |category, object_names|
-			define_category_tasks(category, object_names, flags)
+			define_category_tasks(category, object_names, cflags, cxxflags)
 		end
 
 		task("#{@namespace}:clean") do
@@ -117,7 +117,7 @@ class CommonLibraryBuilder
 	end
 
 private
-	def define_category_tasks(category, object_names, flags)
+	def define_category_tasks(category, object_names, cflags, cxxflags)
 		object_filenames = object_filenames_for(object_names)
 
 		object_names.each do |object_name|
@@ -128,9 +128,9 @@ private
 			file(object_file => dependencies_for(options)) do
 				ensure_directory_exists(File.dirname(object_file))
 				if source_file =~ /\.c$/
-					compile_c(source_file, "#{flags} -o #{object_file}")
+					compile_c(source_file, "#{cflags} -o #{object_file}")
 				else
-					compile_cxx(source_file, "#{flags} -o #{object_file}")
+					compile_cxx(source_file, "#{cxxflags} -o #{object_file}")
 				end
 			end
 		end

metadata

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

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSqk+mAAoJECrHRaUKISqMEfEH/AkQj1HVp+X6SAtqLxf04I2F
-SdBLamPRIlUFZ7uMpzhCVlEiLkCYTRh4btcpO0CI1p6f22YOlL7oxwLfA8ogM052
-CQvsp0GOZcSXDoAKpT+42lGOP8j3EHQABLkFDtl3z5nXwNLsYZ3Dy8XimqUWpgwF
-KPPonJpAuyBWK5nWtJp9AfbMrFGWXC2Ixl86bEhsQPmS9IvWoxF+5VA47lo9rbo3
-gVX9bIzh6YHoYbCPcQsuKkNgaWjZtpzcpVta3qDRbcRDP3OVsUTn0XGuQZathuwd
-p5TrceY4jlXzpiA2+AWo7rPuTGnXrDtSY62AEiBMQNuefhY7eQO3qMd/8iFaaLs=
-=yRII
+iQEcBAABAgAGBQJSquxWAAoJECrHRaUKISqMKNAH/Rmvgt01Yjjp5V8Cor1mINn+
+AOrLlysZoTYX+ABxFasJeAh4q+P1iStyIeWQgT2NTt/6IvlHnFN4I6ys9Wcc3S+f
+rY679w/ypqk8xFHZFqEC2ERbRiKCQHFD1x+T0jR2LYXKghbqOnoKz+jFaezCqtlS
+E4yW0ca03lFAdIlpB4tfbOuGNIsH9O92lc1/AZJcp5VgIQUleynO3fW9c45TUhbh
+WypnBlj5jeXP5g375H3Cqeh5Y2a5ISZD+5rz2DJW4MJA7bWZelDHeZDpUe723PTa
+OyHJDqDMMEXWfrmH21/49CjfOnX4PJs99vaxqzC4sib5sT8BwHZLA+OwbrswU8s=
+=dx5z
 -----END PGP SIGNATURE-----