From 1d3888b468d4994726028f45f89424fa93dba3b8 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Jan 16 2013 14:23:01 +0000
Subject: Backport fix for the upstream PR7629, save the proc made from the given block


  (bug 895173)

---

diff --git a/ruby-1.9.3-p327-PR7629-save-proc.patch b/ruby-1.9.3-p327-PR7629-save-proc.patch
new file mode 100644
index 0000000..c2dfa12
--- /dev/null
+++ b/ruby-1.9.3-p327-PR7629-save-proc.patch
@@ -0,0 +1,45 @@
+Mon Jan  7 15:50:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_make_proc): save the proc made from the given block so
+	  that it will not get collected.  [ruby-core:50545] [Bug #7507]
+ 
+diff --git a/vm.c b/vm.c
+index 4dd242f..70e8d3b 100644
+--- a/vm.c
++++ b/vm.c
+@@ -468,10 +468,18 @@
+ }
+ 
+ static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block);
++static VALUE vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp, VALUE *blockprocptr);
+ 
+ VALUE
+ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
+ {
++    VALUE blockprocval;
++    return vm_make_env_object(th, cfp, &blockprocval);
++}
++
++static VALUE
++vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp, VALUE *blockprocptr)
++{
+     VALUE envval;
+     VALUE *lfp;
+     rb_block_t *blockptr;
+@@ -489,6 +497,7 @@
+ 	rb_proc_t *p;
+ 	GetProcPtr(blockprocval, p);
+ 	lfp[0] = GC_GUARDED_PTR(&p->block);
++	*blockprocptr = blockprocval;
+     }
+ 
+     envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp);
+@@ -559,7 +568,7 @@
+ 	rb_bug("rb_vm_make_proc: Proc value is already created.");
+     }
+ 
+-    envval = rb_vm_make_env_object(th, cfp);
++    envval = vm_make_env_object(th, cfp, &blockprocval);
+ 
+     if (PROCDEBUG) {
+ 	check_env_value(envval);
diff --git a/ruby.spec b/ruby.spec
index 83f659c..90939c4 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # change.
-Release: 24%{?dist}
+Release: 25%{?dist}
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License: (Ruby or BSD) and Public Domain
@@ -100,6 +100,10 @@ Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch
 #Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch
 # Make mkmf verbose by default
 Patch12: ruby-1.9.3-mkmf-verbose.patch
+# http://bugs.ruby-lang.org/issues/7629
+# https://bugzilla.redhat.com/show_bug.cgi?id=895173
+# save the proc made from the given block
+Patch13: ruby-1.9.3-p327-PR7629-save-proc.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -342,6 +346,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
 %patch10 -p1
 #%%patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 autoconf
@@ -753,7 +758,11 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
-* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-24
+* Wed Jan 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-25
+- Backport fix for the upstream PR7629, save the proc made from the given block
+  (bug 895173)
+
+* Wed Jan  2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.362-24
 - Update to 1.9.3.362
 
 * Mon Dec 03 2012 Jaromir Capik <jcapik@redhat.com> - 1.9.3.327-23