diff --git a/qt.spec b/qt.spec index 213baab..5ec79b6 100644 --- a/qt.spec +++ b/qt.spec @@ -25,7 +25,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.6 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -533,6 +533,12 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` +# add -fno-delete-null-pointer-checks in attempt to workaround +# https://bugzilla.redhat.com/1091482 +%if 0%{?fedora} > 20 +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-delete-null-pointer-checks" +%endif + %define platform linux-g++ # some 64bit platforms assume -64 suffix, https://bugzilla.redhat.com/569542 @@ -1221,6 +1227,9 @@ fi %changelog +* Fri Apr 25 2014 Rex Dieter 4.8.6-3 +- try -fno-delete-null-pointer-checks to workaround bug #1091482 + * Thu Apr 24 2014 Rex Dieter 4.8.6-2 - DoS vulnerability in the GIF image handler (QTBUG-38367)