diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2015-05-17 04:59:26 +1000 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2015-05-17 05:01:56 +1000 |
| commit | dbff41a50b990598b3f21158122c516ad4ee1c95 (patch) | |
| tree | d8978ee096e893dd48437e318017652cc2c01f5a /qt5/Pkgfile | |
| parent | 41c57e8c8acd2c1da3100ae5d857b545ae32a695 (diff) | |
| download | opt-dbff41a50b990598b3f21158122c516ad4ee1c95.tar.gz opt-dbff41a50b990598b3f21158122c516ad4ee1c95.tar.xz | |
[notify] qt5: security fix CVE-2015-1858, CVE-2015-1859, CVE-2015-1860, CVE-2015-0295 and a few bugfixes
Diffstat (limited to 'qt5/Pkgfile')
| -rw-r--r-- | qt5/Pkgfile | 46 |
1 files changed, 41 insertions, 5 deletions
diff --git a/qt5/Pkgfile b/qt5/Pkgfile index b58a457d5..4daa7e884 100644 --- a/qt5/Pkgfile +++ b/qt5/Pkgfile @@ -6,12 +6,46 @@ name=qt5 version=5.4.1 -release=1 -source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/single/qt-everywhere-opensource-src-$version.tar.xz) +release=2 +source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/single/qt-everywhere-opensource-src-$version.tar.xz + 0001-Revert-Rotate-images-according-to-Exif-orientation.patch + 0001-Require-fPIC-instead-of-just-fPIE-for-reduce-relocat.patch + glib-2.43.patch + qlockfile-deadlock.patch + qnam-corruption.patch + keypad-shortcuts.patch + CVE-2015-0295.patch + CVE-2015-1858_1859.patch + CVE-2015-1860.patch) build() { cd qt-everywhere-opensource-src-$version + # https://bugreports.qt.io/browse/QTBUG-37946 + patch -d qtbase -p1 -i $SRC/0001-Revert-Rotate-images-according-to-Exif-orientation.patch + + # https://bugreports.qt.io/browse/QTBUG-45755 + patch -d qtbase -p1 -i $SRC/0001-Require-fPIC-instead-of-just-fPIE-for-reduce-relocat.patch + + # for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714 + patch -d qtwebkit -p1 -i $SRC/glib-2.43.patch + + # https://bugs.kde.org/show_bug.cgi?id=345901 + patch -d qtbase -p1 -i $SRC/qlockfile-deadlock.patch + + # https://codereview.qt-project.org/#/c/110150/ + patch -d qtbase -p1 -i $SRC/qnam-corruption.patch + + # https://bugs.archlinux.org/task/44676 + patch -d qtbase -p1 -i $SRC/keypad-shortcuts.patch + + # http://lists.qt-project.org/pipermail/announce/2015-February/000059.html + patch -d qtbase -p1 -i $SRC/CVE-2015-0295.patch + + # http://lists.qt-project.org/pipermail/announce/2015-April/000067.html + patch -d qtbase -p1 -i $SRC/CVE-2015-1858_1859.patch + patch -d qtbase -p1 -i $SRC/CVE-2015-1860.patch + # Respect system CXX [ "$CXX" ] || CXX=g++ sed -i "/^QMAKE_CXX\s/s|=.*|= $CXX|" qtbase/mkspecs/common/g++-base.conf @@ -20,11 +54,13 @@ build() { sed -i 's|X11R6/||g' qtbase/mkspecs/*/*.conf # Respect system CXXFLAGS - sed -i "s|-O2|$CXXFLAGS|" qtbase/mkspecs/common/g++-unix.conf - sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf + sed -i "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CXXFLAGS}|" qtbase/mkspecs/common/gcc-base.conf + #sed -i "s|-O2|$CXXFLAGS|" qtbase/mkspecs/common/g++-unix.conf + #sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf # Respect system LDFLAGS - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf + sed -i "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" qtbase/mkspecs/common/g++-unix.conf + #sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf # Fix quoting bug sed -i 's|"$COMPILER" -c|$COMPILER -c|' qtbase/config.tests/unix/fvisibility.test |