[DRE-commits] [SCM] ruby-activerecord-2.3.git branch, master, updated. debian/2.3.14-2-7-g90483c0

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 880895e687c03e68f521e440575366d468b73631
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 3 11:31:53 2013 -0300

    Edit patch for standalone AR package

diff --git a/debian/patches/2-3-dynamic_finder_injection.patch b/debian/patches/2-3-dynamic_finder_injection.patch
index 0da4470..001d69f 100644
--- a/debian/patches/2-3-dynamic_finder_injection.patch
+++ b/debian/patches/2-3-dynamic_finder_injection.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] CVE-2012-5664 options hashes should only be extracted if
  there are extra parameters
 
 ---
- activerecord/lib/active_record/base.rb |    6 +++++-
- activerecord/test/cases/finder_test.rb |   12 ++++++++++++
+ lib/active_record/base.rb |    6 +++++-
+ test/cases/finder_test.rb |   12 ++++++++++++
  2 files changed, 17 insertions(+), 1 deletion(-)
 
-diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
+diff --git a/lib/active_record/base.rb b/glib/active_record/base.rb
 index 461007f..809a38c 100755
---- a/activerecord/lib/active_record/base.rb
-+++ b/activerecord/lib/active_record/base.rb
+--- a/lib/active_record/base.rb
++++ b/lib/active_record/base.rb
 @@ -1897,7 +1897,11 @@ module ActiveRecord #:nodoc:
                # end
                self.class_eval <<-EOS, __FILE__, __LINE__ + 1
@@ -26,10 +26,10 @@ index 461007f..809a38c 100755
                    attributes = construct_attributes_from_arguments(
                      [:#{attribute_names.join(',:')}],
                      args
-diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
+diff --git a/test/cases/finder_test.rb b/gtest/cases/finder_test.rb
 index c779a69..9e3ab92 100644
---- a/activerecord/test/cases/finder_test.rb
-+++ b/activerecord/test/cases/finder_test.rb
+--- a/test/cases/finder_test.rb
++++ b/test/cases/finder_test.rb
 @@ -66,6 +66,18 @@ end
  class FinderTest < ActiveRecord::TestCase
    fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers

-- 
ruby-activerecord-2.3.git