rpms/qt/F-10 qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, NONE, 1.1 qt.spec, 1.235, 1.236

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4729

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
Log Message:
fix for CVE-2009-2700



qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch:
 qsslcertificate.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp
--- qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp.orig	2009-08-31 16:46:48.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp	2009-08-31 16:49:47.000000000 +0200
@@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType, 
             }
 
             const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
-            const QString altName = QLatin1String(QByteArray(altNameStr, len));
+            const QString altName = QString::fromLatin1(altNameStr, len);
             if (genName->type == GEN_DNS)
                 result.insert(QSsl::DnsEntry, altName);
             else if (genName->type == GEN_EMAIL)


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- qt.spec	18 Aug 2009 10:42:51 -0000	1.235
+++ qt.spec	31 Aug 2009 15:24:39 -0000	1.236
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -65,6 +65,7 @@ Patch0288: 0288-more-x-keycodes.patch
 
 # security fixes
 Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
+Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
 
 %define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
@@ -384,6 +385,7 @@ test -x apply_patches && ./apply_patches
 
 # security fixes
 %patch100 -p1 -b .CVE-2009-1725
+%patch101 -p1 -b .CVE-2009-2700
 
 %patch287 -p1 -b .287-qmenu-respect
 %patch0288 -p1 -b .0288-more-x-keycodes
@@ -886,6 +888,9 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+- fix for CVE-2009-2700
+
 * Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-2
 - security fix for CVE-2009-1725