[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master, updated. debian/3.2.6-2-6-g90102ae

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 045523d47ccf0b1d1456f485fc76f8e6f10085ca
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 3 11:07:55 2013 -0300

    Edit the patch for standalone AR package

diff --git a/debian/patches/3-2-dynamic_finder_injection.patch b/debian/patches/3-2-dynamic_finder_injection.patch
index fe698f0..30af5a4 100644
--- a/debian/patches/3-2-dynamic_finder_injection.patch
+++ b/debian/patches/3-2-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/dynamic_matchers.rb |    7 ++++++-
- activerecord/test/cases/finder_test.rb             |   12 ++++++++++++
+ lib/active_record/dynamic_matchers.rb |    7 ++++++-
+ test/cases/finder_test.rb             |   12 ++++++++++++
  2 files changed, 18 insertions(+), 1 deletion(-)
 
-diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb
+diff --git a/lib/active_record/dynamic_matchers.rb b/lib/active_record/dynamic_matchers.rb
 index b6b8e24..f15d0b7 100644
---- a/activerecord/lib/active_record/dynamic_matchers.rb
-+++ b/activerecord/lib/active_record/dynamic_matchers.rb
+--- a/lib/active_record/dynamic_matchers.rb
++++ b/lib/active_record/dynamic_matchers.rb
 @@ -40,7 +40,12 @@ module ActiveRecord
            METHOD
            send(method_id, *arguments)
@@ -27,10 +27,10 @@ index b6b8e24..f15d0b7 100644
            relation = options.any? ? scoped(options) : scoped
            relation.send :find_by_attributes, match, attribute_names, *arguments, &block
          elsif match.instantiator?
-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/test/cases/finder_test.rb
 index 5d72e35..77ca3b5 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
 @@ -15,6 +15,18 @@ require 'models/toy'
  class FinderTest < ActiveRecord::TestCase
    fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers, :categories, :categorizations

-- 
ruby-activerecord-3.2.git