rpms/pygtk2/F-11 pygtk-2.14.1-fix-invalid-free.patch, NONE, 1.1 pygtk2.spec, 1.23, 1.24

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10495

Modified Files:
	pygtk2.spec 
Added Files:
	pygtk-2.14.1-fix-invalid-free.patch 
Log Message:

* Thu Aug 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-2.fc11
- Add patch for GNOME bug #585458 (invalid freeing of string).


pygtk-2.14.1-fix-invalid-free.patch:
 gtk.override |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pygtk-2.14.1-fix-invalid-free.patch ---
diff -up pygtk-2.14.1/gtk/gtk.override.fix-invalid-free pygtk-2.14.1/gtk/gtk.override
--- pygtk-2.14.1/gtk/gtk.override.fix-invalid-free	2009-03-05 17:06:49.000000000 -0500
+++ pygtk-2.14.1/gtk/gtk.override	2009-08-06 17:37:20.000000000 -0400
@@ -7496,7 +7496,8 @@ _wrap_gtk_recent_info_get_application_in
                                                &time_);
     if (ret) {
         py_ret = Py_BuildValue("(sii)", app_exec, count, time_);
-        g_free(app_exec);
+        /* Note that we mustn't free 'app_exec' even though it's not
+         * 'const'.  See bug #585458. */
     } else {
         py_ret = Py_None;
     }


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/F-11/pygtk2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- pygtk2.spec	6 Mar 2009 12:54:08 -0000	1.23
+++ pygtk2.spec	6 Aug 2009 21:39:29 -0000	1.24
@@ -15,7 +15,7 @@
 
 Name: pygtk2
 Version: 2.14.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -30,6 +30,9 @@ Patch0: pygtk-nodisplay-exception.patch
 # RH bug #379051 / GNOME bug #523001
 Patch1: pygtk2-2.12.1-pygtk-generic-cell-renderer-activate.patch
 
+# GNOME bug #585458
+Patch2: pygtk-2.14.1-fix-invalid-free.patch
+
 ### Dependencies ###
 
 # Leave these requirements alone!  RPM isn't smart enough
@@ -102,6 +105,7 @@ This package contains documentation file
 %setup -q -n pygtk-%{version}
 %patch0 -p1
 %patch1 -p1 -b .pygtk-generic-cell-renderer-activate
+%patch2 -p1 -b .fix-invalid-free
 
 %build
 %configure --enable-thread --enable-numpy
@@ -163,6 +167,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Thu Aug 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-2.fc11
+- Add patch for GNOME bug #585458 (invalid freeing of string).
+
 * Fri Mar 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.1-1.fc11
 - Update to 2.14.1
 - Bump gtk2_version to 2.9.0 for gtkunixprint requirement.