[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228
Jérémy Lal
kapouer at melix.org
Thu Oct 11 10:25:13 UTC 2012
The following commit has been merged in the master-experimental branch:
commit eb9893a39a03f430721aa409268359aad551da7b
Author: Jérémy Lal <kapouer at melix.org>
Date: Mon Dec 26 16:04:02 2011 +0100
Refresh patches.
diff --git a/debian/patches/1014_logout_cookie_rake.patch b/debian/patches/1014_logout_cookie_rake.patch
index a118c84..7511319 100644
--- a/debian/patches/1014_logout_cookie_rake.patch
+++ b/debian/patches/1014_logout_cookie_rake.patch
@@ -2,10 +2,10 @@ Description: Cookie values need to be strings in some rails/rake versions.
Bug-Redmine: http://www.redmine.org/issues/9118
Author: Eduardo Rocha <folhabranca at gmail.com>
Last-Update: 2011-08-14
---- a/app/controllers/account_controller.rb.orig 2011-08-24 11:41:33.000000000 -0300
-+++ b/app/controllers/account_controller.rb 2011-08-24 09:21:00.000000000 -0300
+--- a/app/controllers/account_controller.rb
++++ b/app/controllers/account_controller.rb
@@ -129,7 +129,7 @@
-
+
def logout_user
if User.current.logged?
- cookies.delete :autologin
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 24236fd..9ecf594 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -4,20 +4,20 @@ 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 @@ class Attachment < ActiveRecord::Base
+@@ -44,7 +44,7 @@
"LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
cattr_accessor :storage_path
-- @@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"
+- @@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
+ before_save :files_to_final_location
+ after_destroy :delete_from_disk
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,7 +2,15 @@
- # Uncomment below to force Rails into production mode when
+ # Uncomment below to force Rails into production mode when
# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
+ENV['RAILS_ENV'] ||= 'production'
@@ -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.11' unless defined? RAILS_GEM_VERSION
-@@ -30,9 +38,18 @@ Rails::Initializer.run do |config|
+ RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+@@ -34,10 +42,18 @@
# (by default production uses :info, the others :debug)
# config.log_level = :debug
@@ -42,27 +42,24 @@ Last-Update: 2010-01-10
# Enable page/fragment caching by setting a file-based store
# (remember to create the caching directory and make it readable to the application)
# config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
-+
-+ # the file cache store
+
+ config.cache_store = :file_store, ENV['RAILS_CACHE']
+
+ # Set Active Record's database.yml path
+ config.database_configuration_file = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
-
++
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
+ config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
-@@ -79,6 +79,9 @@ end
-
- ActionMailer::Base.send :include, AsynchronousMailer
-
+@@ -112,3 +112,6 @@
+ end
+ end
+ end
++
+# the session store
+ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
-+
- # 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 @@
@@ -78,18 +75,18 @@ Last-Update: 2010-01-10
+end
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
-@@ -31,7 +31,7 @@ module Redmine
+@@ -31,7 +31,7 @@
# * <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)
+ # * <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
+@@ -102,7 +102,7 @@
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')
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index 3cdb2ef..92f725f 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 @@ RAILS_GEM_VERSION = '2.3.11' unless defi
+@@ -22,6 +22,20 @@
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -32,7 +32,7 @@ Last-Update: 2010-01-10
+task :generate_session_store do
-file 'config/initializers/session_store.rb' do
-- path = File.join(RAILS_ROOT, 'config', 'initializers', 'session_store.rb')
+- path = File.join(Rails.root, 'config', 'initializers', 'session_store.rb')
- secret = ActiveSupport::SecureRandom.hex(40)
- File.open(path, 'w') do |f|
- f.write <<"EOF"
@@ -40,7 +40,7 @@ Last-Update: 2010-01-10
+ENV['X_DEBIAN_SITEID'] ||= 'default'
+ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
+filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml'
-+path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(RAILS_ROOT, 'config'), filename)
++path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename)
+secret = ActiveSupport::SecureRandom.hex(40)
+File.open(path, 'w') do |f|
+ f.write <<"EOF"
@@ -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 @@ file 'config/initializers/session_store.
+@@ -15,20 +18,19 @@
# 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 dd1e703..74ca55d 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 @@ ActionController::Base.session = {
+@@ -39,6 +39,7 @@
# 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 4a26902..146248b 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 @@ ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV
+@@ -11,6 +11,7 @@
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.11' unless defined? RAILS_GEM_VERSION
+ RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
diff --git a/debian/patches/2006_fix_shebang_interpreter.patch b/debian/patches/2006_fix_shebang_interpreter.patch
index 936815c..4d7af55 100644
--- a/debian/patches/2006_fix_shebang_interpreter.patch
+++ b/debian/patches/2006_fix_shebang_interpreter.patch
@@ -2,8 +2,8 @@ Description: Fix shebang interpreter
Forwarded: not-needed
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-02-28
---- a/vendor/gems/coderay-0.9.7/lib/coderay/helpers/file_type.rb
-+++ b/vendor/gems/coderay-0.9.7/lib/coderay/helpers/file_type.rb
+--- a/vendor/gems/coderay-1.0.0/lib/coderay/helpers/file_type.rb
++++ b/vendor/gems/coderay-1.0.0/lib/coderay/helpers/file_type.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
module CodeRay
diff --git a/debian/patches/2014_relax_RAILS_GEM_VERSION.patch b/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
index f0c6efc..cb2e497 100644
--- a/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
+++ b/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
@@ -8,8 +8,8 @@ Last-Update: 2011-08-23
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.11' unless defined? RAILS_GEM_VERSION
-+# RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
++# RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
- # Bootstrap the Rails environment, frameworks, and default configuration
- require File.join(File.dirname(__FILE__), 'boot')
+ if RUBY_VERSION >= '1.9'
+ Encoding.default_external = 'UTF-8'
diff --git a/debian/patches/2015_use_system_coderay.patch b/debian/patches/2015_use_system_coderay.patch
index db76efc..4004b44 100644
--- a/debian/patches/2015_use_system_coderay.patch
+++ b/debian/patches/2015_use_system_coderay.patch
@@ -4,12 +4,12 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2011-08-23
--- a/config/environment.rb
+++ b/config/environment.rb
-@@ -85,7 +85,7 @@
+@@ -88,7 +88,7 @@
config.action_mailer.perform_deliveries = false
config.gem 'rubytree', :lib => 'tree'
-- config.gem 'coderay', :version => '~>0.9.7'
-+ # config.gem 'coderay', :version => '~>0.9.7'
-
+- config.gem 'coderay', :version => '~>1.0.0'
++ # config.gem 'coderay', :version => '~>1.0.0'
+
# Load any local configuration that is kept out of source control
# (e.g. gems, patches).
diff --git a/debian/patches/series b/debian/patches/series
index 2dc5990..7e5bea9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,11 +3,8 @@
2003_externalize_session_config.patch
2004_FHS_plugins_assets.patch
2005_FHS_schema_dump.patch
-2006_fix_shebang_interpreter.patch
2008_force_table_encoding_mysql.patch
2009_FHS_thin_config.patch
-2010_use_i18n_0.4.1.patch
-1013_indent_subject_exported_pdf.patch
2014_relax_RAILS_GEM_VERSION.patch
2015_use_system_coderay.patch
1014_logout_cookie_rake.patch
--
redmine.git
More information about the Pkg-ruby-extras-commits
mailing list