[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-8-g5abf271
Jérémy Lal
kapouer at melix.org
Tue May 31 09:40:31 UTC 2011
The following commit has been merged in the master-experimental branch:
commit 7fbf9d3773ca1f6d0fac28238e7bad921919f829
Author: Ondřej Surý <ondrej at sury.org>
Date: Tue May 31 09:25:16 2011 +0200
Updated patches to 1.2.0 release
Signed-off-by: Ondřej Surý <ondrej at sury.org>
Signed-off-by: Jérémy Lal <kapouer at melix.org>
diff --git a/debian/patches/2001_fix_shebang_interpreter.patch b/debian/patches/2001_fix_shebang_interpreter.patch
index 8e42ea0..500250b 100644
--- a/debian/patches/2001_fix_shebang_interpreter.patch
+++ b/debian/patches/2001_fix_shebang_interpreter.patch
@@ -10,4 +10,3 @@ Last-Update: 2010-01-09
# = faster_csv.rb -- Faster CSV Reading and Writing
#
---
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 6624f45..24236fd 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -4,13 +4,13 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-01-10
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ class Attachment < ActiveRecord::Base
"LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
cattr_accessor :storage_path
-- @@storage_path = "#{RAILS_ROOT}/files"
-+ @@storage_path = ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], 'files') : "#{RAILS_ROOT}/files"
-
+- @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{RAILS_ROOT}/files"
++ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], 'files') : "#{RAILS_ROOT}/files"
+
def validate
if self.filesize > Setting.attachment_max_size.to_i.kilobytes
--- a/config/environment.rb
@@ -31,8 +31,8 @@ Last-Update: 2010-01-10
+ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
# Specifies gem version of Rails to use when vendor/rails is not present
- RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
-@@ -30,9 +38,18 @@
+ RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+@@ -30,9 +38,18 @@ Rails::Initializer.run do |config|
# (by default production uses :info, the others :debug)
# config.log_level = :debug
@@ -53,27 +53,16 @@ Last-Update: 2010-01-10
# config.active_record.observers = :cacher, :garbage_collector
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
-@@ -79,6 +79,9 @@
+@@ -79,6 +79,9 @@ end
ActionMailer::Base.send :include, AsynchronousMailer
+# the session store
+ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
+
- # TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6.
- # See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608
- module I18n
---- a/config/initializers/40-email.rb
-+++ b/config/initializers/40-email.rb
-@@ -1,7 +1,7 @@
- # Loads action_mailer settings from email.yml
- # and turns deliveries on if configuration file is found
-
--filename = File.join(File.dirname(__FILE__), '..', 'email.yml')
-+filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(File.dirname(__FILE__), '..', 'email.yml')
- if File.file?(filename)
- mailconfig = YAML::load_file(filename)
-
+ # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
+ # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
+ module TMail
--- a/public/dispatch.fcgi.example
+++ b/public/dispatch.fcgi.example
@@ -20,5 +20,8 @@
@@ -87,3 +76,23 @@ Last-Update: 2010-01-10
+else
+ RailsFCGIHandler.process!
+end
+--- a/lib/redmine/configuration.rb
++++ b/lib/redmine/configuration.rb
+@@ -31,7 +31,7 @@ module Redmine
+ # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml)
+ # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env)
+ def load(options={})
+- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml')
++ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml')
+ env = options[:env] || Rails.env
+
+ @config = @defaults.dup
+@@ -96,7 +96,7 @@ module Redmine
+ end
+
+ def load_deprecated_email_configuration(env)
+- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml')
++ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml')
+ if File.file?(deprecated_email_conf)
+ warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting."
+ @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index 47bcca8..3cdb2ef 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -4,7 +4,7 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-01-10
--- a/config/environment.rb
+++ b/config/environment.rb
-@@ -18,6 +18,20 @@
+@@ -18,6 +18,20 @@ RAILS_GEM_VERSION = '2.3.11' unless defi
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -48,7 +48,7 @@ Last-Update: 2010-01-10
# and should not be made visible to public.
# If you have a load-balancing Redmine cluster, you will need to use the
# same version of this file on each machine. And be sure to restart your
-@@ -15,20 +18,19 @@
+@@ -15,20 +18,19 @@ file 'config/initializers/session_store.
# change this key, all old sessions will become invalid! Make sure the
# secret is at least 30 characters and all random, no regular words or
# you'll be exposed to dictionary attacks.
diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
index 403adab..dd1e703 100644
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ b/debian/patches/2004_FHS_plugins_assets.patch
@@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/570308
Last-Update: 2010-02-18
--- a/config/environment.rb
+++ b/config/environment.rb
-@@ -35,6 +35,7 @@
+@@ -35,6 +35,7 @@ ActionController::Base.session = {
# Load Engine plugin if available
begin
require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
diff --git a/debian/patches/2005_FHS_schema_dump.patch b/debian/patches/2005_FHS_schema_dump.patch
index 1cc1c59..4a26902 100644
--- a/debian/patches/2005_FHS_schema_dump.patch
+++ b/debian/patches/2005_FHS_schema_dump.patch
@@ -6,11 +6,11 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-05-25
--- a/config/environment.rb
+++ b/config/environment.rb
-@@ -11,6 +11,7 @@
+@@ -11,6 +11,7 @@ ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV
ENV['RAILS_LOG'] ||= "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"
ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
+ENV['SCHEMA'] ||= "#{ENV['RAILS_CACHE']}/schema.db"
# Specifies gem version of Rails to use when vendor/rails is not present
- RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+ RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
diff --git a/debian/patches/2009_FHS_thin_config.patch b/debian/patches/2009_FHS_thin_config.patch
index b8258d5..06bb9b8 100644
--- a/debian/patches/2009_FHS_thin_config.patch
+++ b/debian/patches/2009_FHS_thin_config.patch
@@ -5,7 +5,7 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-11-01
--- a/config/environment.rb
+++ b/config/environment.rb
-@@ -6,6 +6,7 @@
+@@ -6,6 +6,7 @@ ENV['RAILS_ENV'] ||= 'production'
# for debian package : setup proper environment variables and paths
# To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian
diff --git a/debian/patches/2010_use_i18n_0.4.1.patch b/debian/patches/2010_use_i18n_0.4.1.patch
index a519e24..049df92 100644
--- a/debian/patches/2010_use_i18n_0.4.1.patch
+++ b/debian/patches/2010_use_i18n_0.4.1.patch
@@ -5,7 +5,7 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2011-05-30
--- a/config/boot.rb
+++ b/config/boot.rb
-@@ -110,13 +110,13 @@
+@@ -110,13 +110,13 @@ end
# 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
--
redmine.git
More information about the Pkg-ruby-extras-commits
mailing list