File suse.patch of Package rubygem-passenger

Overview Repositories Revisions Requests Users Attributes Meta

File suse.patch of Package rubygem-passenger (Revision 4b783c7f2945302922a70e04cf4e934c)

Currently displaying revision 4b783c7f2945302922a70e04cf4e934c , Show latest

commit 715d7cc7781264c27b7294b35f1647f5b648e783
Author: Marcus Rückert <darix@nordisch.org>
Date:   Wed Sep 30 17:39:13 2015 +0200

suse patch

diff --git a/dev/vagrant/nginx_start b/dev/vagrant/nginx_start
index 0b84ad5..f65d1cb 100755
--- a/dev/vagrant/nginx_start
+++ b/dev/vagrant/nginx_start
@@ -1,4 +1,3 @@
-#!/usr/bin/ruby
 # This file is overwritten by 'vagrant provision'. For the source,
 # see dev/vagrant/nginx_start in the Phusion Passenger source
 # tree.
diff --git a/src/cxx_supportlib/ResourceLocator.h b/src/cxx_supportlib/ResourceLocator.h
index f4cc731..7fc6c88 100644
--- a/src/cxx_supportlib/ResourceLocator.h
+++ b/src/cxx_supportlib/ResourceLocator.h
@@ -87,12 +87,12 @@ public:
 		} else {
 			string root = rootOrFile;
 			binDir              = root + "/bin";
-			supportBinariesDir  = root + "/buildout/support-binaries";
-			helperScriptsDir    = root + "/src/helper-scripts";
+			supportBinariesDir  = root + "/support-binaries";
+			helperScriptsDir    = root + "/helper-scripts";
 			resourcesDir        = root + "/resources";
 			docDir              = root + "/doc";
 			rubyLibDir          = root + "/src/ruby_supportlib";
-			nodeLibDir          = root + "/src/nodejs_supportlib";
+			nodeLibDir          = root + "/nodejs_supportlib";
 		}
 	}
 
diff --git a/src/cxx_supportlib/Utils.cpp b/src/cxx_supportlib/Utils.cpp
index 76531c5..78722f0 100644
--- a/src/cxx_supportlib/Utils.cpp
+++ b/src/cxx_supportlib/Utils.cpp
@@ -637,7 +637,7 @@ const char *
 getSystemTempDir() {
 	const char *temp_dir = getenv("TMPDIR");
 	if (temp_dir == NULL || *temp_dir == '\0') {
-		temp_dir = "/tmp";
+		temp_dir = "/var/run/passenger";
 	}
 	return temp_dir;
 }
diff --git a/src/helper-scripts/meteor-loader.rb b/src/helper-scripts/meteor-loader.rb
index da61091..2c45742 100755
--- a/src/helper-scripts/meteor-loader.rb
+++ b/src/helper-scripts/meteor-loader.rb
@@ -56,7 +56,7 @@ module PhusionPassenger
     end
 
     def self.init_passenger
-      require "#{options["ruby_libdir"]}/phusion_passenger"
+      require "phusion_passenger"
       PhusionPassenger.locate_directories(options["passenger_root"])
       PhusionPassenger.require_passenger_lib 'message_channel'
       PhusionPassenger.require_passenger_lib 'utils/tmpio'
diff --git a/src/helper-scripts/rack-loader.rb b/src/helper-scripts/rack-loader.rb
index 702c748..3ab2ada 100644
--- a/src/helper-scripts/rack-loader.rb
+++ b/src/helper-scripts/rack-loader.rb
@@ -69,7 +69,7 @@ module PhusionPassenger
     end
 
     def self.init_passenger
-      require "#{options["ruby_libdir"]}/phusion_passenger"
+      require "phusion_passenger"
       PhusionPassenger.locate_directories(options["passenger_root"])
       PhusionPassenger.require_passenger_lib 'native_support'
       PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
diff --git a/src/helper-scripts/rack-preloader.rb b/src/helper-scripts/rack-preloader.rb
index 8c52577..f1c31fa 100644
--- a/src/helper-scripts/rack-preloader.rb
+++ b/src/helper-scripts/rack-preloader.rb
@@ -71,7 +71,7 @@ module PhusionPassenger
     end
 
     def self.init_passenger
-      require "#{options["ruby_libdir"]}/phusion_passenger"
+      require "phusion_passenger"
       PhusionPassenger.locate_directories(options["passenger_root"])
       PhusionPassenger.require_passenger_lib 'native_support'
       PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
diff --git a/src/ruby_supportlib/phusion_passenger.rb b/src/ruby_supportlib/phusion_passenger.rb
index 57bb1da..e693223 100644
--- a/src/ruby_supportlib/phusion_passenger.rb
+++ b/src/ruby_supportlib/phusion_passenger.rb
@@ -111,18 +111,20 @@ module PhusionPassenger
         instance_variable_set("@#{field}", value)
       end
     else
+      require 'rbconfig'
+      shared_basedir         = File.join(RbConfig::CONFIG['libdir'], 'passenger', VERSION_STRING)
       source_root            = File.dirname(File.dirname(File.dirname(FILE_LOCATION)))
       @install_spec          = source_root
       @custom_packaged       = false
-      @bin_dir               = "#{source_root}/bin".freeze
-      @support_binaries_dir  = "#{source_root}/buildout/support-binaries".freeze
-      @lib_dir               = "#{source_root}/buildout".freeze
-      @helper_scripts_dir    = "#{source_root}/src/helper-scripts".freeze
-      @resources_dir         = "#{source_root}/resources".freeze
-      @include_dir           = "#{source_root}/src".freeze
+      @bin_dir               = "#{shared_basedir}/bin".freeze
+      @support_binaries_dir  = "#{shared_basedir}/support-binaries".freeze
+      @lib_dir               = "#{shared_basedir}".freeze
+      @helper_scripts_dir    = "#{shared_basedir}/helper-scripts".freeze
+      @resources_dir         = "#{shared_basedir}/resources".freeze
+      @include_dir           = "#{shared_basedir}".freeze
       @doc_dir               = "#{source_root}/doc".freeze
       @ruby_libdir           = File.dirname(FILE_LOCATION).freeze
-      @node_libdir           = "#{source_root}/src/nodejs_supportlib".freeze
+      @node_libdir           = "#{shared_basedir}/nodejs_supportlib".freeze
       @apache2_module_path   = "#{source_root}/buildout/apache2/mod_passenger.so".freeze
       @ruby_extension_source_dir = "#{source_root}/src/ruby_native_extension".freeze
       @nginx_module_source_dir   = "#{source_root}/src/nginx_module".freeze
@@ -233,7 +235,7 @@ module PhusionPassenger
   #  2. It is faster than plan require() because it doesn't need to
   #     scan the entire load path.
   def self.require_passenger_lib(name)
-    require("#{ruby_libdir}/phusion_passenger/#{name}")
+    require("phusion_passenger/#{name}")
   end
 
 
diff --git a/src/ruby_supportlib/phusion_passenger/admin_tools.rb b/src/ruby_supportlib/phusion_passenger/admin_tools.rb
index 41a0c2a..2695c12 100644
--- a/src/ruby_supportlib/phusion_passenger/admin_tools.rb
+++ b/src/ruby_supportlib/phusion_passenger/admin_tools.rb
@@ -31,7 +31,7 @@ module PhusionPassenger
           return ENV[name]
         end
       end
-      return "/tmp"
+      return "/var/run/passenger"
     end
 
     def self.process_is_alive?(pid)
diff --git a/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb b/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
index 390f1d9..3a7f6f4 100644
--- a/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
+++ b/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
@@ -94,7 +94,7 @@ module PhusionPassenger
         #
         # The RPM packages configure Apache and Nginx to use /var/run/passenger-instreg
         # as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
-        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg"].compact
+        [string_env("TMPDIR"), "/var/run/passenger", "/var/run/passenger-instreg"].compact
       end
 
       def string_env(name)

Places

File suse.patch of Package rubygem-passenger (Revision 4b783c7f2945302922a70e04cf4e934c)

Places