rpms/numpy/F-12 numpy_doublefree.patch,NONE,1.1 numpy.spec,1.40,1.41

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/numpy/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29052

Modified Files:
	numpy.spec 
Added Files:
	numpy_doublefree.patch 
Log Message:
* Thu Jun 24 2010 Jef Spaleta <jspaleta at fedoraproject.org> 1.3.0-9
- Backport fix for doublefree situation from upstream trunk, BZ 607683.


numpy_doublefree.patch:
 arrayobject.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE numpy_doublefree.patch ---
+++ numpy/core/src/arrayobject.c	2009-04-05 00:19:55.000000000 -0800
--- numpy/core/src/arrayobject.c.new	2010-06-24 08:47:52.271457871 -0800
@@ -3527,6 +3527,7 @@
 #define SET(op)   temp=PyDict_GetItemString(dict, #op); \
     if (temp != NULL) {                                 \
         if (!(PyCallable_Check(temp))) return -1;       \
+        Py_INCREF(temp);                                  \
         Py_XDECREF(n_ops.op);                           \
         n_ops.op = temp;                                \
     }


Index: numpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/numpy/F-12/numpy.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- numpy.spec	26 Apr 2010 20:52:00 -0000	1.40
+++ numpy.spec	24 Jun 2010 17:14:36 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:		1
 Summary:        A fast multidimensional array facility for Python
 
@@ -13,7 +13,7 @@ License:        BSD
 URL:            http://numeric.scipy.org/
 Source0:        http://downloads.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-1.0.1-f2py.patch
-#Patch1:         numpy-arm.patch
+Patch1:         numpy_doublefree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose
@@ -45,7 +45,7 @@ This package includes a version of f2py 
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .f2py
-#%patch1 -p1 -b .arm
+%patch1 -p0 
 
 %build
 env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 24 2010 Jef Spaleta <jspaleta at fedoraproject.org> 1.3.0-9
+- Backport fix for doublefree situation from upstream trunk, BZ 607683.
+
 * Mon Apr 26 2010 Jon Ciesla <limb at jcomserv.net> 1.3.0-8
 - Moved distutils back to the main package, BZ 572820.