[ruby/f16] Update to 1.8.7 p371

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Oct 13 05:33:48 UTC 2012


commit 3f2726e74225b9d2d15fb5e07a8391befec28283
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Oct 13 14:33:32 2012 +0900

    Update to 1.8.7 p371

 .gitignore |    1 +
 ruby.spec  |   11 +++++++----
 sources    |    3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50fe66a..fc9c886 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
 /ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz
 /ruby-1.8.7-p357.tar.bz2
 /ruby-1.8.7-p358.tar.bz2
+/ruby-1.8.7-p371.tar.bz2
diff --git a/ruby.spec b/ruby.spec
index b021b11..65daf90 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,6 +1,6 @@
 %global	rubyxver	1.8
 %global	rubyver	1.8.7
-%global	_patchlevel	358
+%global	_patchlevel	371
 
 %global	dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %global	patchlevel	%{?_patchlevel:-p%{_patchlevel}}
@@ -17,7 +17,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	4%{?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/
@@ -64,7 +64,7 @@ Patch33:	ruby-1.8.7-p249-mkmf-use-shared.patch
 # bug 718695
 Patch34:	ruby-1.8.7-p352-path-uniq.patch
 # Backported fix for CVE-2012-4466 on trunk:rev37068 to 1.8.7 branch
-Patch35:	ruby-1.8.7-p358-CVE-2012-4464-4466.patch
+#Patch35:	ruby-1.8.7-p358-CVE-2012-4464-4466.patch
 # Change ruby load path to conform to Fedora/ruby
 # library placement (various 1.8.6 patches consolidated into this)
 Patch100:	ruby-1.8.7-lib-paths.patch
@@ -186,7 +186,7 @@ pushd %{name}-%{arcver}
 %patch29 -p1
 %patch33 -p1
 %patch34 -p1
-%patch35 -p1
+#%%patch35 -p1
 %patch100 -p1
 
 ( 
@@ -547,6 +547,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ri
 
 %changelog
+* Sat Oct 13 2012 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.8.7.371-1
+- Update to 1.8.7 p371
+
 * Fri Oct 04 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.8.7.358-4
 - Also backport fix for the left part of CVE-2011-1005 (causing the
   same issue as CVE-2012-4464)
diff --git a/sources b/sources
index 91e1a36..a05b866 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-3abd9e2a29f756a0d30c7bfca578cdeb  ruby-1.8.7-p357.tar.bz2
 01b1053cf357459349bf74363756ad41  ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz
-de35f00997f4ccee3e22dff0f2d01b8a  ruby-1.8.7-p358.tar.bz2
+c27526b298659a186bdb5107fcec2341  ruby-1.8.7-p371.tar.bz2


More information about the scm-commits mailing list