diff --git a/.gitignore b/.gitignore index d63d1aa..93c4a9b 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch deleted file mode 100644 index dede832..0000000 --- a/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch +++ /dev/null @@ -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(); diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index ff30f75..294b99a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -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 5.3.2-1 +- 5.3.2 + * Wed Aug 27 2014 David Tardon - 5.3.1-8 - do a normal build with docs diff --git a/qtbase-opensource-src-5.3.2-QTBUG-35459.patch b/qtbase-opensource-src-5.3.2-QTBUG-35459.patch new file mode 100644 index 0000000..1ef698b --- /dev/null +++ b/qtbase-opensource-src-5.3.2-QTBUG-35459.patch @@ -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(); diff --git a/sources b/sources index a2714dc..49ec7bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -572c9953847d391f2d33b420bbcdca46 qtbase-opensource-src-5.3.1.tar.xz +563e2b10274171f1184b3fd7260b4991 qtbase-opensource-src-5.3.2.tar.xz