3 files changed, 7 insertions, 38 deletions

diff --git a/www/redmine/files/patch-config-boot.rb b/www/redmine/files/patch-config-boot.rb
index 96d51fce7df4..1cb087ff283f 100644
--- a/www/redmine/files/patch-config-boot.rb
+++ b/www/redmine/files/patch-config-boot.rb
@@ -1,15 +1,6 @@
---- config/boot.rb.orig	2011-03-07 20:44:40.000000000 +0100
-+++ config/boot.rb	2011-03-17 21:15:51.000000000 +0100
-@@ -1,6 +1,8 @@
- # Don't change this file!
- # Configure your app in config/environment.rb and config/environments/*.rb
- 
-+require 'thread'
-+
- RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
- 
- module Rails
-@@ -110,13 +112,13 @@
+--- config/boot.rb.orig	2011-05-30 18:51:21.000000000 +0200
++++ config/boot.rb	2011-05-31 14:07:01.000000000 +0200
+@@ -110,13 +110,13 @@
  # Loads i18n 0.4.2 before Rails loads any more recent gem
  # 0.5.0 is not compatible with the old interpolation syntax
  # Plugins will have to migrate to the new syntax for 1.2.0
diff --git a/www/redmine/files/patch-config-environment.rb b/www/redmine/files/patch-config-environment.rb
deleted file mode 100644
index 09a11fe8761b..000000000000
--- a/www/redmine/files/patch-config-environment.rb
+++ /dev/null
@@ -1,22 +0,0 @@
---- config/environment.rb.orig	2011-01-28 03:25:48.000000000 +0100
-+++ config/environment.rb	2011-02-26 21:20:07.000000000 +0100
-@@ -17,6 +17,19 @@
-   # Not available
- end
- 
-+# Workaround for RubyGems 1.5.0
-+# http://www.redmine.org/issues/7516
-+if Gem::VERSION >= "1.3.6" 
-+  module Rails
-+    class GemDependency
-+      def requirement
-+        r = super
-+        (r == Gem::Requirement.default) ? nil : r
-+      end
-+    end
-+  end
-+end
-+
- Rails::Initializer.run do |config|
-   # Settings in config/environments/* take precedence those specified here
-   
diff --git a/www/redmine/files/patch-vendor-rails-actionpack-lib-action_controller.rb b/www/redmine/files/patch-vendor-rails-actionpack-lib-action_controller.rb
index 29a1a140dc60..8f504bc4632a 100644
--- a/www/redmine/files/patch-vendor-rails-actionpack-lib-action_controller.rb
+++ b/www/redmine/files/patch-vendor-rails-actionpack-lib-action_controller.rb
@@ -1,11 +1,11 @@
---- vendor/rails/actionpack/lib/action_controller.rb.orig	2010-01-09 12:56:23.000000000 +0100
-+++ vendor/rails/actionpack/lib/action_controller.rb	2010-05-26 11:17:16.000000000 +0200
+--- vendor/rails/actionpack/lib/action_controller.rb.orig	2011-05-30 18:53:34.000000000 +0200
++++ vendor/rails/actionpack/lib/action_controller.rb	2011-05-31 11:50:23.000000000 +0200
 @@ -31,7 +31,7 @@
    end
  end
  
--gem 'rack', '~> 1.0.1'
-+gem 'rack', '>= 1.0.1'
+-gem 'rack', '~> 1.1.0'
++gem 'rack', '>= 1.1.0'
  require 'rack'
  require 'action_controller/cgi_ext'