rpms
/
qt5-qtbase
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.3.2

This commit is contained in:
Rex Dieter 2014-09-16 09:38:15 -05:00
parent 7826aba02d
commit 12f82100c5
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,3 +1 @@
/qtbase-opensource-src-5.2.1.tar.xz
/qtbase-opensource-src-5.3.0.tar.xz
/qtbase-opensource-src-5.3.1.tar.xz
/qtbase-opensource-src-5.3.2.tar.xz

12
qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
View File

@ -1,12 +0,0 @@
diff -ur qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp
--- qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp 2013-12-05 19:23:33.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp 2014-01-13 20:13:59.000000000 +0100
@@ -428,7 +428,7 @@
// for the DTD currently being parsed.
static const int dtdRecursionLimit = 2;
// The maximum amount of characters an entity value may contain, after expansion.
- static const int entityCharacterLimit = 1024;
+ static const int entityCharacterLimit = 65536;
const QString &string();
void stringClear();

9
qt5-qtbase.spec
View File

@ -28,8 +28,8 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.3.1
Release: 8%{?dist}
Version: 5.3.2
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -59,7 +59,7 @@ Patch1: qtbase-opensource-src-5.3.0-old-xcb.patch
Patch2: qtbase-multilib_optflags.patch
# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
Patch4: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
# Prefer QPA implementation in qsystemtrayicon_x11 if available
Patch5: qtbase-5.3.1-prefer-qpa-implementation.patch
@ -747,6 +747,9 @@ fi
%changelog
* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-1
- 5.3.2
* Wed Aug 27 2014 David Tardon <dtardon@redhat.com> - 5.3.1-8
- do a normal build with docs

13
qtbase-opensource-src-5.3.2-QTBUG-35459.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp
diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h
--- qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 2014-09-11 05:48:05.000000000 -0500
+++ qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h 2014-09-16 09:35:01.189255615 -0500
@@ -223,7 +223,7 @@ private:
// for the DTD currently being parsed.
static const int dtdRecursionLimit = 2;
// The maximum amount of characters an entity value may contain, after expansion.
- static const int entityCharacterLimit = 1024;
+ static const int entityCharacterLimit = 65536;
const QString &string();
void stringClear();

2
sources
View File

@ -1 +1 @@
572c9953847d391f2d33b420bbcdca46 qtbase-opensource-src-5.3.1.tar.xz
563e2b10274171f1184b3fd7260b4991 qtbase-opensource-src-5.3.2.tar.xz