diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /www-apps/redmine/files | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'www-apps/redmine/files')
-rw-r--r-- | www-apps/redmine/files/redmine-3.3.4_requires.patch | 60 | ||||
-rw-r--r-- | www-apps/redmine/files/redmine-3.4.3_requires.patch | 73 |
2 files changed, 73 insertions, 60 deletions
diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch deleted file mode 100644 index e4510839cf48..000000000000 --- a/www-apps/redmine/files/redmine-3.3.4_requires.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb ---- redmine-3.3.3-orig/app/controllers/application_controller.rb 2017-05-24 21:05:03.515966923 +0500 -+++ redmine-3.3.3/app/controllers/application_controller.rb 2017-05-24 21:07:22.629960174 +0500 -@@ -15,6 +15,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -+require 'request_store' - require 'uri' - require 'cgi' - -diff -Nuar redmine-3.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb ---- redmine-3.3.3-orig/app/controllers/welcome_controller.rb 2017-05-24 21:05:03.514966923 +0500 -+++ redmine-3.3.3/app/controllers/welcome_controller.rb 2017-05-24 21:08:14.895957638 +0500 -@@ -15,6 +15,9 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -+require 'action_controller' -+require 'action_controller/action_caching' -+ - class WelcomeController < ApplicationController - caches_action :robots - -diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb ---- redmine-3.3.3-orig/app/models/custom_field.rb 2017-05-24 21:05:03.513966923 +0500 -+++ redmine-3.3.3/app/models/custom_field.rb 2017-05-24 21:08:32.223956797 +0500 -@@ -15,6 +15,8 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -+require 'protected_attributes' -+ - class CustomField < ActiveRecord::Base - include Redmine::SubclassFactory - -diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb ---- redmine-3.3.3-orig/app/models/mailer.rb 2017-05-24 21:05:03.514966923 +0500 -+++ redmine-3.3.3/app/models/mailer.rb 2017-05-24 21:05:47.039964812 +0500 -@@ -16,6 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - require 'roadie' -+require 'roadie-rails' - - class Mailer < ActionMailer::Base - layout 'mailer' -diff -Nuar redmine-3.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb ---- redmine-3.3.3-orig/config/application.rb 2017-05-24 21:05:03.689966915 +0500 -+++ redmine-3.3.3/config/application.rb 2017-05-24 21:05:35.723965361 +0500 -@@ -1,8 +1,8 @@ - require File.expand_path('../boot', __FILE__) - - require 'rails/all' -+require 'action_dispatch/xml_params_parser' - --Bundler.require(*Rails.groups) - - module RedmineApp - class Application < Rails::Application diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch new file mode 100644 index 000000000000..338f627adb1b --- /dev/null +++ b/www-apps/redmine/files/redmine-3.4.3_requires.patch @@ -0,0 +1,73 @@ +diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb +--- redmine-3.4.3-orig/app/controllers/application_controller.rb 2017-12-11 20:55:04.942299001 +0500 ++++ redmine-3.4.3/app/controllers/application_controller.rb 2017-12-11 20:55:17.285298402 +0500 +@@ -15,6 +15,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ++require 'request_store' + require 'uri' + require 'cgi' + +diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb +--- redmine-3.4.3-orig/app/controllers/welcome_controller.rb 2017-12-11 20:55:04.942299001 +0500 ++++ redmine-3.4.3/app/controllers/welcome_controller.rb 2017-12-11 20:55:17.286298402 +0500 +@@ -15,6 +15,9 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ++require 'action_controller' ++require 'action_controller/action_caching' ++ + class WelcomeController < ApplicationController + self.main_menu = false + +diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb +--- redmine-3.4.3-orig/app/models/custom_field.rb 2017-12-11 20:55:04.926299002 +0500 ++++ redmine-3.4.3/app/models/custom_field.rb 2017-12-11 20:55:17.286298402 +0500 +@@ -15,6 +15,8 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ++require 'protected_attributes' ++ + class CustomField < ActiveRecord::Base + include Redmine::SafeAttributes + include Redmine::SubclassFactory +diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb +--- redmine-3.4.3-orig/app/models/mailer.rb 2017-12-11 20:55:04.926299002 +0500 ++++ redmine-3.4.3/app/models/mailer.rb 2017-12-11 20:55:17.286298402 +0500 +@@ -16,6 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + require 'roadie' ++require 'roadie-rails' + + class Mailer < ActionMailer::Base + layout 'mailer' +diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails +--- redmine-3.4.3-orig/bin/rails 2017-12-11 20:55:04.986298999 +0500 ++++ redmine-3.4.3/bin/rails 2017-12-11 20:58:40.247288555 +0500 +@@ -1,4 +1,6 @@ + #!/usr/bin/env ruby + APP_PATH = File.expand_path('../../config/application', __FILE__) + require_relative '../config/boot' ++ ++gem 'rails', '~> 4.2' + require 'rails/commands' +diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb +--- redmine-3.4.3-orig/config/application.rb 2017-12-11 20:55:04.971298999 +0500 ++++ redmine-3.4.3/config/application.rb 2017-12-11 20:58:20.477289514 +0500 +@@ -1,8 +1,11 @@ + require File.expand_path('../boot', __FILE__) + ++gem 'rails', '~> 4.2' ++gem 'actionpack-xml_parser', '~> 1.0' ++ + require 'rails/all' ++require 'action_dispatch/xml_params_parser' + +-Bundler.require(*Rails.groups) + + module RedmineApp + class Application < Rails::Application |