From 139d71a9fbe832e520358759f88c4ea4310e7a68 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Dec 29 2011 15:36:28 +0000
Subject: Update to 1.8.7p352

Randomize hash on process startup (CVE-2011-4815, bug 750564)

---

diff --git a/.gitignore b/.gitignore
index a4c19e9..c1f83dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
 /ruby-1.8.7-p334.tar.bz2
 /ruby-1.8.7-p352.tar.bz2
 /ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz
+/ruby-1.8.7-p357.tar.bz2
diff --git a/ruby.spec b/ruby.spec
index a993613..9c74507 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,6 +1,6 @@
 %global	rubyxver	1.8
 %global	rubyver	1.8.7
-%global	_patchlevel	352
+%global	_patchlevel	357
 
 %global	dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %global	patchlevel	%{?_patchlevel:-p%{_patchlevel}}
@@ -11,13 +11,13 @@
 %{!?sitelibbase:	%global sitelibbase	%{vendorlibbase}/site_ruby}
 %{!?sitearchbase:	%global sitearchbase	%{vendorarchbase}/site_ruby}
 
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/')
 # Fri Jul 15 21:28:10 2011 +0000
 %global	ruby_tk_git_revision	c2dfaa7d40531aef3706bcc16f38178b0c6633ee
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	1%{?dist}
 # Please check if ruby upstream changes this to "Ruby or GPLv2+"
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
@@ -544,6 +544,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ri
 
 %changelog
+* Thu Dec 29 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.8.7.357-1
+- Update to 1.8.7p352
+- Randomize hash on process startup (CVE-2011-4815, bug 750564)
+
+* Fri Dec 23 2011 Dennis Gilmore <dennis@ausil.us> - 1.8.7.352-2
+- dont normalise arm cpus to arm
+- there is something weird about how ruby choses where to put bits
+
 * Thu Nov 16 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.8.7.352-3
 - F-17: kill gdbm support for now due to licensing compatibility issue
 
diff --git a/sources b/sources
index e7e916e..1d94212 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-fcc35655da3047f64650a526c179ade8  ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz
-2f14f604bf981bb938ab5fc8b09eb1a6  ruby-1.8.7-p334.tar.bz2
-0c61ea41d1b1183b219b9afe97f18f52  ruby-1.8.7-p352.tar.bz2
+3abd9e2a29f756a0d30c7bfca578cdeb  ruby-1.8.7-p357.tar.bz2
 01b1053cf357459349bf74363756ad41  ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz