[DRE-commits] [rails] 02/02: CVE-2016-2097.patch: remove chunk that does not apply
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Mar 4 18:31:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch debian/jessie
in repository rails.
commit 74f093799936cb92f7c4416219f3145fe248fbe8
Author: Antonio Terceiro <terceiro at debian.org>
Date: Wed Mar 2 12:11:25 2016 -0300
CVE-2016-2097.patch: remove chunk that does not apply
---
debian/patches/CVE-2016-2097.patch | 51 ++++++++------------------------------
1 file changed, 10 insertions(+), 41 deletions(-)
diff --git a/debian/patches/CVE-2016-2097.patch b/debian/patches/CVE-2016-2097.patch
index cd7e5d8..9afcaca 100644
--- a/debian/patches/CVE-2016-2097.patch
+++ b/debian/patches/CVE-2016-2097.patch
@@ -23,8 +23,6 @@ Fix CVE-2016-2097.
.../test/actionpack/controller/render_test.rb | 23 ++++-------------
6 files changed, 43 insertions(+), 49 deletions(-)
-diff --git a/actionpack/test/controller/new_base/render_file_test.rb b/actionpack/test/controller/new_base/render_file_test.rb
-index a961cbf..0c21bb0 100644
--- a/actionpack/test/controller/new_base/render_file_test.rb
+++ b/actionpack/test/controller/new_base/render_file_test.rb
@@ -13,15 +13,6 @@ module RenderFile
@@ -83,8 +81,6 @@ index a961cbf..0c21bb0 100644
- end
end
end
-diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
-index b7a9cf9..b0c4efb 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -45,6 +45,10 @@ module RenderTemplate
@@ -98,20 +94,18 @@ index b7a9cf9..b0c4efb 100644
def builder_template
render :template => "xml_template"
end
-@@ -101,6 +105,11 @@ module RenderTemplate
+@@ -100,6 +104,11 @@ module RenderTemplate
+ get :with_locals
assert_response "The secret is area51"
end
-
++
+ test "rendering a template with local variables without key" do
+ get :with_locals
+ assert_response "The secret is area51"
+ end
-+
+
test "rendering a builder template" do
get :builder_template, "format" => "xml"
- assert_response "<html>\n <p>Hello</p>\n</html>\n"
-diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
-index 17a019e..0fcbb86 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -261,6 +261,11 @@ end
@@ -126,7 +120,7 @@ index 17a019e..0fcbb86 100644
def test_dynamic_render_with_file
# This is extremely bad, but should be possible to do.
assert File.exist?(File.join(File.dirname(__FILE__), '../../test/abstract_unit.rb'))
-@@ -269,6 +274,18 @@ class ExpiresInRenderTest < ActionController::TestCase
+@@ -269,6 +274,18 @@ class ExpiresInRenderTest < ActionContro
response.body
end
@@ -145,26 +139,6 @@ index 17a019e..0fcbb86 100644
def test_dynamic_render
assert File.exist?(File.join(File.dirname(__FILE__), '../../test/abstract_unit.rb'))
assert_raises ActionView::MissingTemplate do
-diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
-index 80a2a5e..05bda0d 100644
---- a/actionview/CHANGELOG.md
-+++ b/actionview/CHANGELOG.md
-@@ -1,3 +1,13 @@
-+* Changed the meaning of `render "foo/bar"`.
-+
-+ Previously, calling `render "foo/bar"` in a controller action is equivalent
-+ to `render file: "foo/bar"`. This has been changed to mean
-+ `render template: "foo/bar"` instead. If you need to render a file, please
-+ change your code to use the explicit form (`render file: "foo/bar"`) instead.
-+
-+ *Eileen Uchitelle*
-+
-+
- ## Rails 4.1.14 (November 12, 2015) ##
-
- * Fix `mail_to` when called with `nil` as argument.
-diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
-index 017302d..6283830 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -107,7 +107,7 @@ module ActionView
@@ -185,11 +159,9 @@ index 017302d..6283830 100644
options[key] = action
else
options[:partial] = action
-diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
-index 45b8049..a9991fe 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
-@@ -91,17 +91,17 @@ class TestController < ApplicationController
+@@ -91,17 +91,17 @@ class TestController < ApplicationContro
# :ported:
def render_hello_world
@@ -210,7 +182,7 @@ index 45b8049..a9991fe 100644
end
# :ported:
-@@ -111,7 +111,7 @@ class TestController < ApplicationController
+@@ -111,7 +111,7 @@ class TestController < ApplicationContro
# :deprecated:
def render_template_in_top_directory_with_slash
@@ -219,7 +191,7 @@ index 45b8049..a9991fe 100644
end
# :ported:
-@@ -160,13 +160,6 @@ class TestController < ApplicationController
+@@ -160,13 +160,6 @@ class TestController < ApplicationContro
end
# :ported:
@@ -233,7 +205,7 @@ index 45b8049..a9991fe 100644
def render_file_not_using_full_path
@secret = 'in the sauce'
render :file => 'test/render_file_with_ivar'
-@@ -194,7 +187,7 @@ class TestController < ApplicationController
+@@ -194,7 +187,7 @@ class TestController < ApplicationContro
def render_file_as_string_with_locals
path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals'))
@@ -242,7 +214,7 @@ index 45b8049..a9991fe 100644
end
def accessing_request_in_template
-@@ -781,12 +774,6 @@ class RenderTest < ActionController::TestCase
+@@ -781,12 +774,6 @@ class RenderTest < ActionController::Tes
end
# :ported:
@@ -255,6 +227,3 @@ index 45b8049..a9991fe 100644
def test_render_file_not_using_full_path
get :render_file_not_using_full_path
assert_equal "The secret is in the sauce\n", @response.body
---
-2.7.0
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git
More information about the Pkg-ruby-extras-commits
mailing list