From fededb172209fc77c7fd3a4a59053920fd0b0599 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Oct 22 2014 05:29:17 +0000
Subject: Update to 2.3.18 in epel5


This is a long overdue security rollup/rebase to 2.3.18 for Activerecord

- Update to 2.3.18 for the last of the 2 series.
- Bug 731438 and 731453 CVE-2011-2930 fixed in 2.3.13
- Bug 948706  - CVE-2013-0276 fixed in 2.3.18
- Bug 831583  - CVE-2012-2695 fixed in 2.3.15
- Bug 744706  - CVE-2010-3933 fixed in 2.3.10
- Bug 921329  - CVE-2013-1854 fixed in 2.3.18
- Bug 891468  - CVE-2012-5664 fixed in 2.5.15
- Bug 924318  - CVE-2013-1854 fixed in 2.3.18
- Bug 1095125 - CVE-2014-0130 fixed in 2.3.18

---

diff --git a/.gitignore b/.gitignore
index 4833b59..a6be945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 activerecord-2.1.1.gem
+/activerecord-2.3.18.gem
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index bad09e7..6a5dd84 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -6,8 +6,8 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.3.18
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -56,6 +56,18 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Tue Oct 21 2014 Michael Stahnke <stahnma@fedoraproject.org> - 2.3.18-1
+- Update to 2.3.18 for the last of the 2 series.
+- Bug 731438 and 731453 CVE-2011-2930 fixed in 2.3.13
+- Bug 948706  - CVE-2013-0276 fixed in 2.3.18
+- Bug 831583  - CVE-2012-2695 fixed in 2.3.15
+- Bug 744706  - CVE-2010-3933 fixed in 2.3.10
+- Bug 921329  - CVE-2013-1854 fixed in 2.3.18
+- Bug 891468  - CVE-2012-5664 fixed in 2.5.15
+- Bug 924318  - CVE-2013-1854 fixed in 2.3.18
+- Bug 1095125 - CVE-2014-0130 fixed in 2.3.18
+
+
 * Thu Nov 20 2008 David Lutterkort <lutter@redhat.com> - 2.1.1-2
 - Do not mark lib/ as doc
 
diff --git a/sources b/sources
index 1c103b0..0409362 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd6587eed1b0dc7b559b469eef5b8647  activerecord-2.1.1.gem
+786e5a7d42d85de43d3688a36fb1efcb  activerecord-2.3.18.gem