sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2282d2508462a4ab5fcc365e1afae95a04b8ab45)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2282d2508462a4ab5fcc365e1afae95a04b8ab45)
Date: Thu, 28 May 2015 13:13:23 +0000

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

x11-toolkits/qt4/CVE-2014-0190.patch |
32 -----
x11-toolkits/qt4/DETAILS |
6 -
x11-toolkits/qt4/HISTORY |
4
x11-toolkits/qt4/PRE_BUILD |
6 -
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch |
57 ----------
5 files changed, 8 insertions(+), 97 deletions(-)

New commits:
commit 2282d2508462a4ab5fcc365e1afae95a04b8ab45
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

qt4 4.8.7, SECURITY_PATCH=7

diff --git a/x11-toolkits/qt4/CVE-2014-0190.patch
b/x11-toolkits/qt4/CVE-2014-0190.patch
deleted file mode 100644
index e97ee7b..0000000
--- a/x11-toolkits/qt4/CVE-2014-0190.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-
-diff -up
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
----
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
2014-04-10 13:37:12.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
2014-04-24 15:58:54.515862458 -0500
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
- memset(bits, 0, image->byteCount());
- }
-
-+ // Check if the previous attempt to create the image
failed. If it
-+ // did then the image is broken and we should give up.
-+ if (image->isNull()) {
-+ state = Error;
-+ return -1;
-+ }
-+
- disposePrevious(image);
- disposed = false;
-
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index c18ebf7..fc4a27f 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,11 +2,11 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.6
+ VERSION=4.8.7
PATCHLEVEL=0
-
SOURCE_HASH=sha512:c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692
+
SOURCE_HASH=sha512:f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
SOURCE=$SPELLX-$VERSION.tar.gz
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION

SOURCE_URL[0]=http://download.qt-project.org/official_releases/qt/4.8/$VERSION/$SOURCE
WEB_SITE=http://qt-project.org/
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 356c19b..523bdd4 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2015-05-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.7, SECURITY_PATCH=7
+ * PRE_BUILD, *.patch: patches removed
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch:
add patch from LFS to fix build with gcc 5
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 2583940..7ab841c 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < $SPELL_DIRECTORY/CVE-2014-0190.patch &&
-
sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&

# fix bad .pro file for 4.6.0-beta1
@@ -43,6 +41,4 @@ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/
s:^#\s*::' \

if [[ $QT_WEBKIT_VIDEO == n ]]; then
sed -i '1iDEFINES += ENABLE_VIDEO=0'
src/3rdparty/webkit/Source/WebCore/WebCore.pro
-fi &&
-
-patch -p1 <
$SPELL_DIRECTORY/qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch
+fi
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch
deleted file mode 100644
index 5441aeb..0000000
--- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2015-04-18
-Initial Package Version: 4.8.6
-Upstream Status: Applied
-Origin: Rex Dieter
-Description: ensures that the WebKit module is enabled with gcc-5.
-
-commit 4badb867bbffbd66762c150258b37b6c0b7e3c22
-Author: Rex Dieter <rdieter AT gmail.com>
-Date: Wed Feb 18 07:17:22 2015 -0600
-
- Configure: Fix detection of GCC 5
-
- - Backport qt5 commit 9fb4c2c412621b63c06dbbd899f44041b2e126c2
- - fix webkit feature enablement
- - set QT_BUILD_KEY (same as gcc4), Qt5 has no QT_BUILD_KEY so no
- change there is necessary
-
- Change-Id: Ie131be711a774052bc42f18e8090b2a3dde69475
- Reviewed-by: Thiago Macieira <thiago.macieira AT intel.com>
- Reviewed-by: Dmitry Shachnev <mitya57 AT gmail.com>
- Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer AT gmail.com>
-
-diff --git a/configure b/configure
-index f3a800a..4144400 100755
---- a/configure
-+++ b/configure
-@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in
- *-g++*)
- # Check gcc's version
- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
-- 4*|3.4*)
-+ 5*|4*|3.4*)
- ;;
- 3.3*)
- canBuildWebKit="no"
-@@ -8031,6 +8031,11 @@ g++*)
- QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed
's,^$[0-9]*$\.$[0-9]*$.*,\2,'`
- QT_GCC_PATCH_VERSION=0
- ;;
-+ *)
-+ QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
-+ QT_GCC_MINOR_VERSION=0
-+ QT_GCC_PATCH_VERSION=0
-+ ;;
- esac
-
- case "$COMPILER_VERSION" in
-@@ -8040,7 +8045,7 @@ g++*)
- 3.*)
- COMPILER_VERSION="3.*"
- ;;
-- 4.*)
-+ 5*|4.*)
- COMPILER_VERSION="4"
- ;;
- *)

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2282d2508462a4ab5fcc365e1afae95a04b8ab45), Ladislav Hagara, 05/28/2015