[rubygem-activesupport] Update to ActiveSupport 3.0.13.
Vít Ondruch
vondruch at fedoraproject.org
Fri Jun 1 14:01:31 UTC 2012
commit 112f5ae9980fc9add4e58b156af6f5d01294c682
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Jun 1 15:48:58 2012 +0200
Update to ActiveSupport 3.0.13.
.gitignore | 2 +
...vesupport-CVE-2012-1098-safe-buffer-slice.patch | 194 --------------------
activesupport-add-bigdecimal-dependency.patch | 6 +-
rubygem-activesupport.spec | 21 +-
sources | 4 +-
5 files changed, 18 insertions(+), 209 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2b03c6..7bed4f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ activesupport-2.3.8.gem
/activesupport-3.0.10.gem
/activesupport-3.0.11-tests.tgz
/activesupport-3.0.11.gem
+/activesupport-3.0.13-tests.tgz
+/activesupport-3.0.13.gem
diff --git a/activesupport-add-bigdecimal-dependency.patch b/activesupport-add-bigdecimal-dependency.patch
index 55b0cb4..b3d24db 100644
--- a/activesupport-add-bigdecimal-dependency.patch
+++ b/activesupport-add-bigdecimal-dependency.patch
@@ -1,7 +1,7 @@
-diff --git a/specifications/activesupport-3.0.11.gemspec.orig b/specifications/activesupport-3.0.11.gemspec
+diff --git a/specifications/activesupport-3.0.13.gemspec.orig b/specifications/activesupport-3.0.13.gemspec
index 0277593..ef9b71d 100644
---- a/specifications/activesupport-3.0.11.gemspec.orig
-+++ b/specifications/activesupport-3.0.11.gemspec
+--- a/specifications/activesupport-3.0.13.gemspec.orig
++++ b/specifications/activesupport-3.0.13.gemspec
@@ -20,8 +20,11 @@ Gem::Specification.new do |s|
s.specification_version = 3
diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec
index b13b66d..6b0b446 100644
--- a/rubygem-activesupport.spec
+++ b/rubygem-activesupport.spec
@@ -6,8 +6,8 @@
Summary: Support and utility classes used by the Rails framework
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 3.0.11
-Release: 5%{?dist}
+Version: 3.0.13
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
@@ -18,8 +18,8 @@ Source0: http://rubygems.org/downloads/activesupport-%{version}.gem
# Rails rpms, you may check it out like so
# git clone http://github.com/rails/rails.git
# cd rails/activesupport/
-# git checkout v3.0.11
-# tar czvf activesupport-3.0.11-tests.tgz test/
+# git checkout v3.0.13
+# tar czvf activesupport-3.0.13-tests.tgz test/
Source2: activesupport-%{version}-tests.tgz
# Removes code which breaks the test suite due to a
@@ -30,10 +30,6 @@ Patch1: activesupport-tests-fix.patch
# is in Fedora http://bugzilla.redhat.com/show_bug.cgi?id=668822
Patch2: activesupport-remove-memcache-build-dep.patch
-# Fixes CVE-2012-1098
-# https://bugzilla.redhat.com/show_bug.cgi?id=799275
-Patch3: activesupport-CVE-2012-1098-safe-buffer-slice.patch
-
# We need to add the bigdecimal dependency to gemspec, otherwise it won't be
# loaded. The reason for this is unbundling it from ruby libdir and moving
# it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
@@ -73,7 +69,6 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
pushd .%{gem_instdir}
%patch1 -p0
%patch2 -p0
-%patch3 -p2
popd
pushd .%{gem_dir}
@@ -89,11 +84,14 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
%check
pushd %{buildroot}%{gem_instdir}
+# Test fails with newer mocha. Keep with older one is not solution.
+# https://github.com/rails/rails/pull/6046
+sed -i '35,41 s|^|#|' test/whiny_nil_test.rb
+
ruby -Itest -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}"
popd
%files
-%defattr(-, root, root, -)
%dir %{gem_instdir}
%doc %{gem_instdir}/CHANGELOG
%{gem_libdir}
@@ -105,6 +103,9 @@ popd
%changelog
+* Fri Jun 01 2012 Vít Ondruch <vondruch at redhat.com> - 1:3.0.13-1
+- Update to ActiveSupport 3.0.13.
+
* Wed Apr 18 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1:3.0.11-5
- Add the bigdecimal dependency to gemspec.
diff --git a/sources b/sources
index 6dc8296..5e7b2cf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4c658e371610208a6956afd007b48e35 activesupport-3.0.11-tests.tgz
-8daae4e695fb7e3e3e7edc02662bd04b activesupport-3.0.11.gem
+851a9bccf9699e1a5a60888b2851f362 activesupport-3.0.13-tests.tgz
+9f84d4c31709f79fd6e12aa89e8b8162 activesupport-3.0.13.gem
More information about the scm-commits
mailing list