[DRE-commits] r5161 - in trunk/redmine/debian: . patches
Jérémy Lal
kapouer-guest at alioth.debian.org
Sun May 2 09:46:50 UTC 2010
Author: kapouer-guest
Date: 2010-05-02 09:46:47 +0000 (Sun, 02 May 2010)
New Revision: 5161
Removed:
trunk/redmine/debian/patches/changeset_r3611.diff
trunk/redmine/debian/patches/changeset_r3612.diff
trunk/redmine/debian/patches/changeset_r3613.diff
Modified:
trunk/redmine/debian/changelog
trunk/redmine/debian/patches/0002-Revert-rails-2.3-changes-in-mailer.patch
trunk/redmine/debian/patches/series
Log:
Redmine 0.9.4-1
Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/changelog 2010-05-02 09:46:47 UTC (rev 5161)
@@ -1,3 +1,9 @@
+redmine (0.9.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Jérémy Lal <kapouer at melix.org> Sun, 02 May 2010 11:46:02 +0200
+
redmine (0.9.3-4) unstable; urgency=low
* /usr/share/redmine/config/environment.rb owned by www-data:root,
@@ -7,7 +13,7 @@
* Additionnal and tested examples for passenger, nginx, spawn-fcgi.
* Security fix : Escape revision on repository view.
- -- Jérémy Lal <kapouer at melix.org> Sat, 27 Mar 2010 19:38:33 +0100
+ -- Jérémy Lal <kapouer at melix.org> Sat, 27 Mar 2010 19:07:05 +0100
redmine (0.9.3-3) unstable; urgency=low
Modified: trunk/redmine/debian/patches/0002-Revert-rails-2.3-changes-in-mailer.patch
===================================================================
--- trunk/redmine/debian/patches/0002-Revert-rails-2.3-changes-in-mailer.patch 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/patches/0002-Revert-rails-2.3-changes-in-mailer.patch 2010-05-02 09:46:47 UTC (rev 5161)
@@ -6,8 +6,6 @@
app/models/mailer.rb | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 deletions(-)
-diff --git a/app/models/mailer.rb b/app/models/mailer.rb
-index 9c409af..864ac6d 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -16,7 +16,6 @@
@@ -18,7 +16,7 @@
helper :application
helper :issues
helper :custom_fields
-@@ -46,7 +45,6 @@ class Mailer < ActionMailer::Base
+@@ -46,7 +45,6 @@
subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
body :issue => issue,
:issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
@@ -26,7 +24,7 @@
end
# Builds a tmail object used to email recipients of the edited issue.
-@@ -73,8 +71,6 @@ class Mailer < ActionMailer::Base
+@@ -73,8 +71,6 @@
body :issue => issue,
:journal => journal,
:issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
@@ -35,7 +33,7 @@
end
def reminder(user, issues, days)
-@@ -84,7 +80,6 @@ class Mailer < ActionMailer::Base
+@@ -84,7 +80,6 @@
body :issues => issues,
:days => days,
:issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc')
@@ -43,7 +41,7 @@
end
# Builds a tmail object used to email users belonging to the added document's project.
-@@ -98,7 +93,6 @@ class Mailer < ActionMailer::Base
+@@ -98,7 +93,6 @@
subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
body :document => document,
:document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
@@ -51,7 +49,7 @@
end
# Builds a tmail object used to email recipients of a project when an attachements are added.
-@@ -129,7 +123,6 @@ class Mailer < ActionMailer::Base
+@@ -129,7 +123,6 @@
body :attachments => attachments,
:added_to => added_to,
:added_to_url => added_to_url
@@ -59,7 +57,7 @@
end
# Builds a tmail object used to email recipients of a news' project when a news item is added.
-@@ -144,7 +137,6 @@ class Mailer < ActionMailer::Base
+@@ -144,7 +137,6 @@
subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
body :news => news,
:news_url => url_for(:controller => 'news', :action => 'show', :id => news)
@@ -67,7 +65,7 @@
end
# Builds a tmail object used to email the recipients of the specified message that was posted.
-@@ -162,7 +154,6 @@ class Mailer < ActionMailer::Base
+@@ -162,7 +154,6 @@
subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
body :message => message,
:message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
@@ -75,7 +73,7 @@
end
# Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
-@@ -179,7 +170,6 @@ class Mailer < ActionMailer::Base
+@@ -179,7 +170,6 @@
subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
@@ -83,7 +81,7 @@
end
# Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
-@@ -197,7 +187,6 @@ class Mailer < ActionMailer::Base
+@@ -197,7 +187,6 @@
body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),
:wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version)
@@ -91,7 +89,7 @@
end
# Builds a tmail object used to email the specified user their account information.
-@@ -212,7 +201,6 @@ class Mailer < ActionMailer::Base
+@@ -212,7 +201,6 @@
body :user => user,
:password => password,
:login_url => url_for(:controller => 'account', :action => 'login')
@@ -99,7 +97,7 @@
end
# Builds a tmail object used to email all active administrators of an account activation request.
-@@ -226,7 +214,6 @@ class Mailer < ActionMailer::Base
+@@ -226,7 +214,6 @@
subject l(:mail_subject_account_activation_request, Setting.app_title)
body :user => user,
:url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
@@ -107,7 +105,7 @@
end
# Builds a tmail object used to email the specified user that their account was activated by an administrator.
-@@ -240,7 +227,6 @@ class Mailer < ActionMailer::Base
+@@ -240,7 +227,6 @@
subject l(:mail_subject_register, Setting.app_title)
body :user => user,
:login_url => url_for(:controller => 'account', :action => 'login')
@@ -115,7 +113,7 @@
end
def lost_password(token)
-@@ -249,7 +235,6 @@ class Mailer < ActionMailer::Base
+@@ -249,7 +235,6 @@
subject l(:mail_subject_lost_password, Setting.app_title)
body :token => token,
:url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
@@ -123,7 +121,7 @@
end
def register(token)
-@@ -258,7 +243,6 @@ class Mailer < ActionMailer::Base
+@@ -258,7 +243,6 @@
subject l(:mail_subject_register, Setting.app_title)
body :token => token,
:url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
@@ -131,7 +129,7 @@
end
def test(user)
-@@ -266,7 +250,6 @@ class Mailer < ActionMailer::Base
+@@ -266,7 +250,6 @@
recipients user.mail
subject 'Redmine test'
body :url => url_for(:controller => 'welcome')
@@ -139,7 +137,7 @@
end
# Overrides default deliver! method to prevent from sending an email
-@@ -349,22 +332,26 @@ class Mailer < ActionMailer::Base
+@@ -358,22 +341,26 @@
super
end
@@ -180,4 +178,3 @@
end
# Makes partial rendering work with Rails 1.2 (retro-compatibility)
---
Deleted: trunk/redmine/debian/patches/changeset_r3611.diff
===================================================================
--- trunk/redmine/debian/patches/changeset_r3611.diff 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/patches/changeset_r3611.diff 2010-05-02 09:46:47 UTC (rev 5161)
@@ -1,16 +0,0 @@
-Upstream security fix : Fixes permission check in QueriesController
-Author : Jean-Philippe Lang
-
-Index: trunk/app/controllers/queries_controller.rb
-===================================================================
---- trunk/app/controllers/queries_controller.rb (revision 3610)
-+++ trunk/app/controllers/queries_controller.rb (revision 3611)
-@@ -74,7 +74,7 @@
-
- def find_optional_project
- @project = Project.find(params[:project_id]) if params[:project_id]
-- User.current.allowed_to?(:save_queries, @project, :global => true)
-+ render_403 unless User.current.allowed_to?(:save_queries, @project, :global => true)
- rescue ActiveRecord::RecordNotFound
- render_404
- end
Deleted: trunk/redmine/debian/patches/changeset_r3612.diff
===================================================================
--- trunk/redmine/debian/patches/changeset_r3612.diff 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/patches/changeset_r3612.diff 2010-05-02 09:46:47 UTC (rev 5161)
@@ -1,70 +0,0 @@
-Upstream security fix : Escape href attribute in auto links
-Author : Jean-Philippe Lang
-
---- a/test/unit/helpers/application_helper_test.rb
-+++ b/test/unit/helpers/application_helper_test.rb
-@@ -59,12 +59,14 @@
- 'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
- # two exclamation marks
- 'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
-+ # escaping
-+ 'http://foo"bar' => '<a class="external" href="http://foo"bar">http://foo"bar</a>',
- }
- to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
- end
-
- def test_auto_mailto
-- assert_equal '<p><a href="mailto:test at foo.bar" class="email">test at foo.bar</a></p>',
-+ assert_equal '<p><a class="email" href="mailto:test at foo.bar">test at foo.bar</a></p>',
- textilizable('test at foo.bar')
- end
-
-@@ -129,6 +131,8 @@
- "\"system administrator\":mailto:sysadmin at example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin at example.com?subject=redmine%20permissions\">system administrator</a>",
- # two exclamation marks
- '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>',
-+ # escaping
-+ '"test":http://foo"bar' => '<a href="http://foo"bar" class="external">test</a>',
- }
- to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
- end
---- a/lib/redmine/wiki_formatting/textile/formatter.rb
-+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
-@@ -22,6 +22,7 @@
- module WikiFormatting
- module Textile
- class Formatter < RedCloth3
-+ include ActionView::Helpers::TagHelper
-
- # auto_link rule after textile rules so that it doesn't break !image_url! tags
- RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
-@@ -162,7 +163,8 @@
- url=url[0..-2] # discard closing parenth from url
- post = ")"+post # add closing parenth to post
- end
-- %(#{leading}<a class="external" href="#{proto=="www."?"http://www.":proto}#{url}">#{proto + url}</a>#{post})
-+ tag = content_tag('a', proto + url, :href => "#{proto=="www."?"http://www.":proto}#{url}", :class => 'external')
-+ %(#{leading}#{tag}#{post})
- end
- end
- end
-@@ -174,7 +176,7 @@
- if text.match(/<a\b[^>]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
- mail
- else
-- %{<a href="mailto:#{mail}" class="email">#{mail}</a>}
-+ content_tag('a', mail, :href => "mailto:#{mail}", :class => "email")
- end
- end
- end
---- a/lib/redcloth3.rb
-+++ b/lib/redcloth3.rb
-@@ -818,7 +818,7 @@
- post = ")"+post # add closing parenth to post
- end
- atts = pba( atts )
-- atts = " href=\"#{ url }#{ slash }\"#{ atts }"
-+ atts = " href=\"#{ htmlesc url }#{ slash }\"#{ atts }"
- atts << " title=\"#{ htmlesc title }\"" if title
- atts = shelve( atts ) if atts
-
Deleted: trunk/redmine/debian/patches/changeset_r3613.diff
===================================================================
--- trunk/redmine/debian/patches/changeset_r3613.diff 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/patches/changeset_r3613.diff 2010-05-02 09:46:47 UTC (rev 5161)
@@ -1,15 +0,0 @@
-Upstream security fix : Escape revision on repository view
-Author : Jean-Philippe Lang
-
-Index: trunk/app/views/repositories/_breadcrumbs.rhtml
-===================================================================
---- trunk/app/views/repositories/_breadcrumbs.rhtml (revision 3612)
-+++ trunk/app/views/repositories/_breadcrumbs.rhtml (revision 3613)
-@@ -16,6 +16,6 @@
- / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
- <% end %>
-
--<%= "@ #{revision}" if revision %>
-+<%= "@ #{h revision}" if revision %>
-
- <% html_title(with_leading_slash(path)) -%>
Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series 2010-05-02 09:28:47 UTC (rev 5160)
+++ trunk/redmine/debian/patches/series 2010-05-02 09:46:47 UTC (rev 5161)
@@ -18,6 +18,3 @@
0018-engines-rails2.2.patch
0019-no-batch_size-in-rails2.2.patch
0020-application-rb-for-rails2.2.patch
-changeset_r3611.diff
-changeset_r3612.diff
-changeset_r3613.diff
More information about the Pkg-ruby-extras-commits
mailing list