1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-10-29 18:07:27 +01:00

Make the version constraint a range

This commit is contained in:
Matt Buck 2014-12-19 13:54:13 -06:00
parent c493ccfc06
commit db0aeb2a05
No known key found for this signature in database
GPG Key ID: 42134E0C9C4E94BB
5 changed files with 9 additions and 8 deletions

View File

@ -2,8 +2,8 @@ PATH
remote: . remote: .
specs: specs:
metasploit-framework (4.11.0.pre.dev) metasploit-framework (4.11.0.pre.dev)
actionpack (< 4.0.0) actionpack (>= 3.2.21, < 4.0.0)
activesupport (>= 3.0.0, < 4.0.0) activesupport (>= 3.2.21, < 4.0.0)
bcrypt bcrypt
jsobfu (~> 0.2.0) jsobfu (~> 0.2.0)
json json
@ -21,7 +21,7 @@ PATH
sqlite3 sqlite3
tzinfo tzinfo
metasploit-framework-db (4.11.0.pre.dev) metasploit-framework-db (4.11.0.pre.dev)
activerecord (< 4.0.0) activerecord (>= 3.2.21, < 4.0.0)
metasploit-credential (~> 0.13.8) metasploit-credential (~> 0.13.8)
metasploit-framework (= 4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev)
metasploit_data_models (~> 0.21.1) metasploit_data_models (~> 0.21.1)

View File

@ -3,9 +3,10 @@
module Metasploit module Metasploit
module Framework module Framework
module RailsVersionConstraint module RailsVersionConstraint
# The Metasploit ecosystem is not ready for Rails 4 as it uses features of # The Metasploit ecosystem is not ready for Rails 4 as it uses features of
# Rails 3.X that are removed in Rails 4. # Rails 3.X that are removed in Rails 4.
RAILS_VERSION = '< 4.0.0' RAILS_VERSION = [ '>= 3.2.21', '< 4.0.0' ]
end end
end end
end end

View File

@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
# no files, just dependencies # no files, just dependencies
spec.files = [] spec.files = []
spec.add_runtime_dependency 'activerecord', Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
# Metasploit::Credential database models # Metasploit::Credential database models
spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.8' spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.8'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.

View File

@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
metasploit_framework_version_constraint = "= #{spec.version}" metasploit_framework_version_constraint = "= #{spec.version}"
spec.add_runtime_dependency 'rails', Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION spec.add_runtime_dependency 'rails', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
spec.add_runtime_dependency 'metasploit-framework', metasploit_framework_version_constraint spec.add_runtime_dependency 'metasploit-framework', metasploit_framework_version_constraint
spec.add_runtime_dependency 'metasploit-framework-db', metasploit_framework_version_constraint spec.add_runtime_dependency 'metasploit-framework-db', metasploit_framework_version_constraint
spec.add_runtime_dependency 'metasploit-framework-pcap', metasploit_framework_version_constraint spec.add_runtime_dependency 'metasploit-framework-pcap', metasploit_framework_version_constraint

View File

@ -49,9 +49,9 @@ Gem::Specification.new do |spec|
# Need 3+ for ActiveSupport::Concern # Need 3+ for ActiveSupport::Concern
spec.add_runtime_dependency 'activesupport', '>= 3.0.0', Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION spec.add_runtime_dependency 'activesupport', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
# Needed for config.action_view for view plugin compatibility for Pro # Needed for config.action_view for view plugin compatibility for Pro
spec.add_runtime_dependency 'actionpack', Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION spec.add_runtime_dependency 'actionpack', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb) # Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
spec.add_runtime_dependency 'bcrypt' spec.add_runtime_dependency 'bcrypt'
# Needed for Javascript obfuscation # Needed for Javascript obfuscation