[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:14 UTC 2012
The following commit has been merged in the master-experimental branch:
commit c56ddd6e54343c3b44caeacf95e26bedfd9ce9a5
Author: Jérémy Lal <kapouer at melix.org>
Date: Mon Dec 26 16:06:23 2011 +0100
Remove unused patches.
diff --git a/debian/patches/1013_cookie_symbol_to_s.patch b/debian/patches/1013_cookie_symbol_to_s.patch
deleted file mode 100644
index b5e2baf..0000000
--- a/debian/patches/1013_cookie_symbol_to_s.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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>, David Martínez Moreno <ender at debian.org>
-Last-Update: 2011-09-01
---- 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
-+ cookies.delete :autologin.to_s
- Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
- self.logged_user = nil
- end
-@@ -204,7 +204,7 @@
- # generate a key and set cookie if autologin
- if params[:autologin] && Setting.autologin?
- token = Token.create(:user => user, :action => 'autologin')
-- cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
-+ cookies[:autologin.to_s] = { :value => token.value, :expires => 1.year.from_now }
- end
- call_hook(:controller_account_success_authentication_after, {:user => user })
- redirect_back_or_default :controller => 'my', :action => 'page'
diff --git a/debian/patches/1013_indent_subject_exported_pdf.patch b/debian/patches/1013_indent_subject_exported_pdf.patch
deleted file mode 100644
index 367a241..0000000
--- a/debian/patches/1013_indent_subject_exported_pdf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Prefix subtasks in generated PDF.
-Bug-Redmine: http://www.redmine.org/issues/8617
-Author: Ondřej Surý <ondrej at sury.org>
-Last-Update: 2011-08-10
---- a/lib/redmine/export/pdf.rb
-+++ b/lib/redmine/export/pdf.rb
-@@ -28,6 +28,7 @@ module Redmine
- module PDF
- include ActionView::Helpers::TextHelper
- include ActionView::Helpers::NumberHelper
-+ include IssuesHelper
-
- class ITCPDF < TCPDF
- include Redmine::I18n
-@@ -182,7 +183,7 @@ module Redmine
- pdf.SetFontStyle('',8)
- pdf.SetFillColor(255, 255, 255)
- previous_group = false
-- issues.each do |issue|
-+ issue_list(issues) do |issue, level|
- if query.grouped? &&
- (group = query.group_by_column.value(issue)) != previous_group
- pdf.SetFontStyle('B',9)
-@@ -199,6 +200,9 @@ module Redmine
- show_value(cv)
- else
- value = issue.send(column.name)
-+ if column.name == :subject
-+ value = " " * level + value
-+ end
- if value.is_a?(Date)
- format_date(value)
- elsif value.is_a?(Time)
diff --git a/debian/patches/1014_send_CSRF_ajax.patch b/debian/patches/1014_send_CSRF_ajax.patch
deleted file mode 100644
index bec3dc4..0000000
--- a/debian/patches/1014_send_CSRF_ajax.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Send the CSRF token with Ajax requests.
- Add a relation between issues pops explicit login window.
- Fixed upstream, but not for redmine 1.1.x.
-Bug-Redmine: http://www.redmine.org/issues/7843
-Author: Etienne Massip <etienne.massip at gmail.com>
-Last-Update: 2011-03-14
---- a/app/views/layouts/base.rhtml
-+++ b/app/views/layouts/base.rhtml
-@@ -5,6 +5,7 @@
- <title><%=h html_title %></title>
- <meta name="description" content="<%= Redmine::Info.app_name %>" />
- <meta name="keywords" content="issue,bug,tracker" />
-+<%= csrf_meta_tag %>
- <%= favicon %>
- <%= stylesheet_link_tag 'application', :media => 'all' %>
- <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
---- a/public/javascripts/application.js
-+++ b/public/javascripts/application.js
-@@ -250,9 +250,27 @@
- }
-
-
--/* shows and hides ajax indicator */
-+/*
-+ * 1 - registers a callback which copies the csrf token into the
-+ * X-CSRF-Token header with each ajax request. Necessary to
-+ * work with rails applications which have fixed
-+ * CVE-2011-0447
-+ * 2 - shows and hides ajax indicator
-+ */
- Ajax.Responders.register({
-- onCreate: function(){
-+ onCreate: function(request){
-+ var csrf_meta_tag = $$('meta[name=csrf-token]')[0];
-+
-+ if (csrf_meta_tag) {
-+ var header = 'X-CSRF-Token',
-+ token = csrf_meta_tag.readAttribute('content');
-+
-+ if (!request.options.requestHeaders) {
-+ request.options.requestHeaders = {};
-+ }
-+ request.options.requestHeaders[header] = token;
-+ }
-+
- if ($('ajax-indicator') && Ajax.activeRequestCount > 0) {
- Element.show('ajax-indicator');
- }
diff --git a/debian/patches/2006_fix_shebang_interpreter.patch b/debian/patches/2006_fix_shebang_interpreter.patch
deleted file mode 100644
index 4d7af55..0000000
--- a/debian/patches/2006_fix_shebang_interpreter.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-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
-
- # = FileType
diff --git a/debian/patches/2007_disable_deprecation_warnings.patch b/debian/patches/2007_disable_deprecation_warnings.patch
deleted file mode 100644
index 3bbac59..0000000
--- a/debian/patches/2007_disable_deprecation_warnings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Disable deprecation warnings
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2010-11-28
---- a/config/environment.rb
-+++ b/config/environment.rb
-@@ -19,6 +19,11 @@
- # Bootstrap the Rails environment, frameworks, and default configuration
- require File.join(File.dirname(__FILE__), 'boot')
-
-+# Disable deprecation warnings
-+if Gem::Dependency.respond_to?('warned_version_requirement')
-+ Gem::Dependency.warned_version_requirement = true
-+end
-+
- # loads cookie based session session and secret keys
- # this is needed here because initializers are loaded after plugins,
- # and some plugins initialize ActionController which requires a secret to be set.
---- a/config/initializers/10-patches.rb
-+++ b/config/initializers/10-patches.rb
-@@ -89,7 +89,7 @@
- module Base
- def warn_syntax_deprecation!(*args)
- return if @skip_syntax_deprecation
-- warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information."
-+ #warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information."
- @skip_syntax_deprecation = true
- end
- end
diff --git a/debian/patches/2010_use_i18n_0.4.1.patch b/debian/patches/2010_use_i18n_0.4.1.patch
deleted file mode 100644
index 049df92..0000000
--- a/debian/patches/2010_use_i18n_0.4.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Use i18n 0.4.1 gem
- This upstream hack is not needed with rails 2.3.11
-Forwarded: not-needed
-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 @@ 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
--require 'rubygems'
--begin
-- gem 'i18n', '0.4.2'
--rescue Gem::LoadError => load_error
-- $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
-- exit 1
--end
-+#require 'rubygems'
-+#begin
-+# gem 'i18n', '0.4.2'
-+#rescue Gem::LoadError => load_error
-+# $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
-+# exit 1
-+#end
-
- # All that for this:
- Rails.boot!
diff --git a/debian/patches/2011_rubygems_need_thread.patch b/debian/patches/2011_rubygems_need_thread.patch
deleted file mode 100644
index beb375c..0000000
--- a/debian/patches/2011_rubygems_need_thread.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Work around "uninitialized constant ActiveSupport::Dependencies::Mutex"
-Bug-Debian: http://bugs.debian.org/587767
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2011-03-22
---- /dev/null
-+++ b/config/preinitializer.rb
-@@ -0,0 +1,3 @@
-+# work around http://bugs.debian.org/587767
-+require 'thread'
-+
diff --git a/debian/patches/2012_rubygems_version_requirement.patch b/debian/patches/2012_rubygems_version_requirement.patch
deleted file mode 100644
index 1a601b7..0000000
--- a/debian/patches/2012_rubygems_version_requirement.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Work around removal of version_requirement method.
- This has been deprecated for a while, unfortunately redmine 1.1.2
- and rails 2.3.5 have not fixed their code yet.
-Bug-Redmine: http://www.redmine.org/issues/7516
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2011-03-22
---- a/config/environment.rb
-+++ b/config/environment.rb
-@@ -20,6 +20,17 @@
- # Bootstrap the Rails environment, frameworks, and default configuration
- require File.join(File.dirname(__FILE__), 'boot')
-
-+# Add support for version_requirement method when rubygems >= 1.5.0
-+if Gem::VERSION >= "1.5.0"
-+ module Rails
-+ class GemDependency
-+ def requirement
-+ r = super
-+ (r == Gem::Requirement.default) ? nil : r
-+ end
-+ end
-+ end
-+end
- # Disable deprecation warnings
- if Gem::Dependency.respond_to?('warned_version_requirement')
- Gem::Dependency.warned_version_requirement = true
--
redmine.git
More information about the Pkg-ruby-extras-commits
mailing list