rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4

3 files changed, 37 insertions, 12 deletions

diff --git a/.cvsignore b/.cvsignore
index 21357f8..0946ee0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-activerecord-2.3.3.gem
+activerecord-2.3.4.gem
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index 62994ea..e3ba8de 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -4,18 +4,25 @@
 %define gemname activerecord
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
+%define rubyabi 1.8
+
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Version: 2.3.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: ruby(abi) = %{rubyabi}
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
 BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(activesupport) = %{version}
+BuildRequires(check): rubygem(sqlite3-ruby)
+BuildRequires(check): rubygem(mocha)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -26,34 +33,48 @@ Subscription, that can find, save, and destroy themselves without resorting to
 manual SQL.
 
 %prep
+%setup -q -c -T
 
-%build
+# rake test creates debug.log under %%{geminstdir},
+# so let's install gem file under %%{_builddir} first
 
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
+mkdir -p ./%{gemdir}
+gem install --local --install-dir ./%{gemdir} \
             --force --rdoc %{SOURCE0}
 
 # Remove backup files
-find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
+find ./%{geminstdir} -type f -name "*~" -delete
 
 # Delete zero-length files
-find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
+# No! These are needed for rake test
+# find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
 # Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
 done
 
 # Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+for file in `find ./%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}
+
 %clean
 rm -rf %{buildroot}
 
+%check
+# Only test sqlite3 backend
+pushd .%{geminstdir}
+rake test_sqlite3 --trace
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -71,6 +92,10 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Fri Sep 18 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4
+- Enable check
+
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 2.3.3-1
 - New upstream version
 
diff --git a/sources b/sources
index 785a85d..4950c4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1516ff58e4e43987aed43a09d7b342d2  activerecord-2.3.3.gem
+edb29388f671d27c1670c52694f2dd99  activerecord-2.3.4.gem