|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
diff --git a/build/packaging.rb b/build/packaging.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
index aa63b56..25c934a 100644
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
--- a/build/packaging.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
+++ b/build/packaging.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
@@ -41,8 +41,7 @@ spec = Gem::Specification.new do |s|
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.email = "info@phusion.nl"
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.require_paths = ["lib"]
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.add_dependency 'rake', '>= 0.8.1'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
- s.add_dependency 'fastthread', '>= 1.0.1'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
- s.add_dependency 'daemon_controller', '>= 1.0.0'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
+ s.add_dependency 'daemon_controller', '>= 0.2.5'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.add_dependency 'rack'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
diff --git a/lib/phusion_passenger/dependencies.rb b/lib/phusion_passenger/dependencies.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
index e37a212..f39e8ff 100644
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
--- a/lib/phusion_passenger/dependencies.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
+++ b/lib/phusion_passenger/dependencies.rb
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
@@ -578,7 +578,7 @@ module Dependencies # :nodoc: all
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
end
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
Daemon_Controller = Dependency.new do |dep|
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
- dep.name = "daemon_controller >= 1.0.0"
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
+ dep.name = "daemon_controller >= 0.2.5"
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
dep.install_instructions = "Please install RubyGems first, then run " <<
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
"#{PlatformInfo.gem_command || "gem"} install daemon_controller"
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
dep.define_checker do |result|
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
@@ -590,7 +590,7 @@ module Dependencies # :nodoc: all
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
require 'daemon_controller'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
begin
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
require 'daemon_controller/version'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
- too_old = DaemonController::VERSION_STRING < '1.0.0'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
+ too_old = DaemonController::VERSION_STRING < '0.2.5'
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
rescue LoadError
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
too_old = true
|
|
![](https://seccdn.libravatar.org/avatar/761a3289e497089144892db31d6ab713d3a0704a5c3058adf5b5ffdf25d52ca6?s=16&d=retro) |
8d15f25 |
end
|