diff options
author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2018-05-23 23:08:00 +0300 |
---|---|---|
committer | Aaron Bauman <bman@gentoo.org> | 2018-05-25 18:37:45 -0400 |
commit | 5a985b6fcfa46754da0d7dda4f797996dcd7f037 (patch) | |
tree | 76c59bd7d0bd24ca7320f6ca2fa176372e9669b0 /www-apps/redmine/files | |
parent | x11-wm/enlightenment: call xdg_environment_reset in 0.22.3 (diff) | |
download | gentoo-5a985b6fcfa46754da0d7dda4f797996dcd7f037.tar.gz gentoo-5a985b6fcfa46754da0d7dda4f797996dcd7f037.tar.bz2 gentoo-5a985b6fcfa46754da0d7dda4f797996dcd7f037.zip |
www-apps/redmine: version bump and fixes
Bump to 3.3.7 and 3.4.5. Branch 3.2 support officialy discontinued,
removed. Fixes dependencies conflict that prevents launch application
with installed but unsupported gems (#645178 and #652880). Fixes bug
when fresh installation cannot be configured.
Closes: https://bugs.gentoo.org/645178
Closes: https://bugs.gentoo.org/652880
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8539
Diffstat (limited to 'www-apps/redmine/files')
3 files changed, 85 insertions, 73 deletions
diff --git a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch new file mode 100644 index 000000000000..c338a385a969 --- /dev/null +++ b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch @@ -0,0 +1,44 @@ +diff -Nuar redmine-3.3.7.orig/Gemfile redmine-3.3.7/Gemfile +--- redmine-3.3.7.orig/Gemfile 2018-05-23 22:36:30.756737829 +0300 ++++ redmine-3.3.7/Gemfile 2018-05-23 22:42:20.227720874 +0300 +@@ -4,7 +4,7 @@ + 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.7.1" ++gem "rails", "~> 4.2.10" + gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" + if RUBY_VERSION < "2.1" + gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") +@@ -17,12 +17,12 @@ + gem "protected_attributes" + gem "actionpack-action_caching" + gem "actionpack-xml_parser" +-gem "roadie-rails", "~> 1.1.1" +-gem "roadie", "~> 3.2.1" ++gem "roadie-rails", "~> 1.2.1" ++gem "roadie", "~> 3.3" + gem "mimemagic" +-gem "mail", "~> 2.6.4" ++gem "mail", "~> 2.7" + +-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8") ++gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.2" : "~> 1.6.8") + gem "i18n", "~> 0.7.0" + gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" + +@@ -35,12 +35,12 @@ + + # Optional gem for LDAP authentication + group :ldap do +- gem "net-ldap", "~> 0.12.0" ++ gem "net-ldap", "~> 0.16.0" + end + + # Optional gem for OpenID authentication + group :openid do +- gem "ruby-openid", "~> 2.3.0", :require => "openid" ++ gem "ruby-openid", "~> 2.7.0", :require => "openid" + gem "rack-openid" + end + diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch deleted file mode 100644 index 338f627adb1b..000000000000 --- a/www-apps/redmine/files/redmine-3.4.3_requires.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 diff --git a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch new file mode 100644 index 000000000000..df49ccbe1dc9 --- /dev/null +++ b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch @@ -0,0 +1,41 @@ +diff -Nuar redmine-3.4.5.orig/Gemfile redmine-3.4.5/Gemfile +--- redmine-3.4.5.orig/Gemfile 2018-05-23 02:01:54.591358114 +0300 ++++ redmine-3.4.5/Gemfile 2018-05-23 02:05:19.531348171 +0300 +@@ -4,7 +4,7 @@ + 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.8" ++gem "rails", "~> 4.2.10" + gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" + if RUBY_VERSION < "2.1" + gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") +@@ -15,10 +15,10 @@ + gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") + gem "protected_attributes" + gem "actionpack-xml_parser" +-gem "roadie-rails", "~> 1.1.1" +-gem "roadie", "~> 3.2.1" ++gem "roadie-rails", "~> 1.2.1" ++gem "roadie", "~> 3.3" + gem "mimemagic" +-gem "mail", "~> 2.6.4" ++gem "mail", "~> 2.7" + + gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8") + gem "i18n", "~> 0.7.0" +@@ -33,12 +33,12 @@ + + # Optional gem for LDAP authentication + group :ldap do +- gem "net-ldap", "~> 0.12.0" ++ gem "net-ldap", "~> 0.16.0" + end + + # Optional gem for OpenID authentication + group :openid do +- gem "ruby-openid", "~> 2.3.0", :require => "openid" ++ gem "ruby-openid", "~> 2.7", :require => "openid" + gem "rack-openid" + end + |