File passenger-5.0.30-json.patch of Package passenger

Overview Repositories Revisions Requests Users Attributes Meta

File passenger-5.0.30-json.patch of Package passenger

Index: passenger-5.0.30/Rakefile
===================================================================
--- passenger-5.0.30.orig/Rakefile
+++ passenger-5.0.30/Rakefile
@@ -48,7 +48,7 @@ else
   require 'build/agent'
   require 'build/apache2'
   require 'build/nginx'
-  require 'build/documentation'
+#  require 'build/documentation'
   require 'build/packaging'
   require 'build/test_basics'
   require 'build/oxt_tests'
Index: passenger-5.0.30/build/agent.rb
===================================================================
--- passenger-5.0.30.orig/build/agent.rb
+++ passenger-5.0.30/build/agent.rb
@@ -87,6 +87,7 @@ file(AGENT_TARGET => dependencies) do
     :flags => [
       libev_libs,
       libuv_libs,
+      "-ljsoncpp",
       PlatformInfo.curl_libs,
       PlatformInfo.zlib_libs,
       PlatformInfo.portability_cxx_ldflags,
Index: passenger-5.0.30/src/agent/Core/ApplicationPool/Process.h
===================================================================
--- passenger-5.0.30.orig/src/agent/Core/ApplicationPool/Process.h
+++ passenger-5.0.30/src/agent/Core/ApplicationPool/Process.h
@@ -448,7 +448,7 @@ public:
 		initializeSocketsAndStringFields(json);
 		indexSessionSockets();
 
-		const SpawningKit::Result *skResult = dynamic_cast<const SpawningKit::Result *>(&json);
+		const SpawningKit::Result *skResult = static_cast<const SpawningKit::Result *>(&json);
 		if (skResult != NULL) {
 			adminSocket = skResult->adminSocket;
 			errorPipe = skResult->errorPipe;
Index: passenger-5.0.30/src/ruby_supportlib/phusion_passenger/common_library.rb
===================================================================
--- passenger-5.0.30.orig/src/ruby_supportlib/phusion_passenger/common_library.rb
+++ passenger-5.0.30/src/ruby_supportlib/phusion_passenger/common_library.rb
@@ -154,6 +154,7 @@ private
       :flags => [
         LIBEV_CFLAGS,
         LIBUV_CFLAGS,
+        "-ljsoncpp",
         optimize,
         extra_compiler_flags
       ]
@@ -327,10 +328,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.ne
     :source   => 'AppTypes.cpp',
     :category => :other
 
-  define_component 'jsoncpp.o',
-    :source   => 'vendor-modified/jsoncpp/jsoncpp.cpp',
-    :category => :json,
-    :optimize => true
   define_component 'vendor-modified/modp_b64.o',
     :source   => 'vendor-modified/modp_b64.cpp',
     :category => :bas64,
Index: passenger-5.0.30/src/cxx_supportlib/Utils/JsonUtils.h
===================================================================
--- passenger-5.0.30.orig/src/cxx_supportlib/Utils/JsonUtils.h
+++ passenger-5.0.30/src/cxx_supportlib/Utils/JsonUtils.h
@@ -241,7 +241,7 @@ durationToJson(unsigned long long durati
 	Json::Value doc;
 	char buf[64];
 
-	doc["microseconds"] = duration;
+	doc["microseconds"] = static_cast<uint64_t>(duration);
 	if (duration >= 10 * 1000000) {
 		snprintf(buf, sizeof(buf), "%.1fs", duration / 1000000.0);
 	} else {
Index: passenger-5.0.30/src/cxx_supportlib/InstanceDirectory.h
===================================================================
--- passenger-5.0.30.orig/src/cxx_supportlib/InstanceDirectory.h
+++ passenger-5.0.30/src/cxx_supportlib/InstanceDirectory.h
@@ -166,7 +166,7 @@ private:
 
 		props["instance_dir"]["major_version"] = SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION;
 		props["instance_dir"]["minor_version"] = SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION;
-		props["instance_dir"]["created_at"] = (long long) time(NULL);
+		props["instance_dir"]["created_at"] = static_cast<uint64_t>(time(NULL));
 		props["passenger_version"] = PASSENGER_VERSION;
 		props["watchdog_pid"] = (Json::UInt64) getpid();

Places

File passenger-5.0.30-json.patch of Package passenger

Places