rpms/qt/F-13 qt.spec,1.396,1.397

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/qt/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31047

Modified Files:
	qt.spec 
Log Message:
disable CVE-2010-1400 patch before proper backporting it


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-13/qt.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- qt.spec	11 Jun 2010 14:23:51 -0000	1.396
+++ qt.spec	14 Jun 2010 15:44:34 -0000	1.397
@@ -72,7 +72,9 @@ Patch110: qt-everywhere-opensource-src-4
 Patch111: qt-everywhere-opensource-src-4.6.3-CVE-2010-1396.patch
 Patch112: qt-everywhere-opensource-src-4.6.3-CVE-2010-1397.patch
 Patch113: qt-everywhere-opensource-src-4.6.3-CVE-2010-1398.patch
-Patch114: qt-everywhere-opensource-src-4.6.3-CVE-2010-1400.patch
+# oldStyle undefined in RenderObject::mapLocalToContainer
+# disable before backporting
+#Patch114: qt-everywhere-opensource-src-4.6.3-CVE-2010-1400.patch
 Patch115: qt-everywhere-opensource-src-4.6.3-CVE-2010-1412.patch
 Patch116: qt-everywhere-opensource-src-4.6.3-CVE-2010-1770.patch
 Patch117: qt-everywhere-opensource-src-4.6.3-CVE-2010-1773.patch
@@ -443,7 +445,7 @@ Qt libraries used for drawing widgets an
 %patch111 -p1 -b .CVE-2010-1396
 %patch112 -p1 -b .CVE-2010-1397
 %patch113 -p1 -b .CVE-2010-1398
-%patch114 -p1 -b .CVE-2010-1400
+#patch114 -p1 -b .CVE-2010-1400
 %patch115 -p1 -b .CVE-2010-1412
 %patch116 -p1 -b .CVE-2010-1770
 %patch117 -p1 -b .CVE-2010-1773
@@ -1053,7 +1055,7 @@ fi
 * Fri Jun 11 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.6.3-2
 - WebKit security update:
   CVE-2010-1303_1304, CVE-2010-1392, CVE-2010-1396, CVE-2010-1397,
-  CVE-2010-1398, CVE-2010-1400, CVE-2010-1412, CVE-2010-1770,
+  CVE-2010-1398, CVE-2010-1412, CVE-2010-1770,
   CVE-2010-1773, CVE-2010-1774
 
 * Tue Jun 08 2010 Than Ngo <than at redhat.com> - 4.6.3-1