ports/www/redmine/files/patch-Gemfile
Sunpoet Po-Chuan Hsieh b9d225045d Fix Gemfile for rubygem-net-ldap 0.16.0 update
- Bump PORTREVISION for package change
2017-02-25 09:56:05 +00:00

101 lines
3.2 KiB
Text

--- Gemfile.orig 2016-06-05 07:30:30 UTC
+++ Gemfile
@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) <
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
end
-gem "rails", "4.2.5.2"
-gem "jquery-rails", "~> 3.1.4"
+gem "rails", ">= 4.2.5.2"
+gem "jquery-rails"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"
-gem "request_store", "1.0.5"
+gem "request_store", ">= 1.0.5"
gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
gem "protected_attributes"
gem "actionpack-action_caching"
@@ -17,7 +17,7 @@ gem "roadie-rails"
gem "mimemagic"
# Request at least nokogiri 1.6.7.2 because of security advisories
-gem "nokogiri", ">= 1.6.7.2"
+gem "nokogiri"
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"
@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0"
# Optional gem for LDAP authentication
group :ldap do
- gem "net-ldap", "~> 0.12.0"
+ gem "net-ldap", "~> 0.12"
end
# Optional gem for OpenID authentication
group :openid do
- gem "ruby-openid", "~> 2.3.0", :require => "openid"
+ gem "ruby-openid", ">= 2.3.0", :require => "openid"
gem "rack-openid"
end
-platforms :mri, :mingw, :x64_mingw do
- # Optional gem for exporting the gantt to a PNG file, not supported with jruby
- group :rmagick do
- gem "rmagick", ">= 2.14.0"
- end
-
- # Optional Markdown support, not for JRuby
- group :markdown do
- gem "redcarpet", "~> 3.3.2"
- end
-end
-
platforms :jruby do
# jruby-openssl is bundled with JRuby 1.7.0
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
@@ -67,12 +55,12 @@ if File.exist?(database_file)
adapters.each do |adapter|
case adapter
when 'mysql2'
- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
+ gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when 'mysql'
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when /postgresql/
- gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
+ gem "pg", ">= 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
when /sqlite3/
gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
@@ -92,21 +80,6 @@ else
warn("Please configure your config/database.yml first")
end
-group :development do
- gem "rdoc", ">= 2.4.2"
- gem "yard"
-end
-
-group :test do
- gem "minitest"
- gem "rails-dom-testing"
- gem "mocha"
- gem "simplecov", "~> 0.9.1", :require => false
- # For running UI tests
- gem "capybara"
- gem "selenium-webdriver"
-end
-
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)
eval_gemfile local_gemfile
@@ -116,3 +89,7 @@ end
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
eval_gemfile file
end
+
+Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|
+ self.instance_eval(Bundler.read_file(bundle))
+end