[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-14-g8fa4460

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=38a0ed0

The following commit has been merged in the experimental branch:
commit 38a0ed0e12c336562e925db9fa27003134baf876
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 8 19:05:16 2015 -0300

    Remove cve-2015-0295.diff
    
    Applied upstream.
---
 debian/changelog                  |  1 +
 debian/patches/cve-2015-0295.diff | 25 -------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55d703f..9781391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
     - aarch64_arm64_fix_arch_detection.patch
     - fix_libmng_test.patch
     - ppc64el_configure_support.patch
+    - cve-2015-0295.diff
 
   [ Dmitry Shachnev ]
   * Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/cve-2015-0295.diff b/debian/patches/cve-2015-0295.diff
deleted file mode 100644
index 1a60865..0000000
--- a/debian/patches/cve-2015-0295.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: fix a division by zero when processing malformed BMP files
-Origin: upstream, http://code.qt.io/cgit/qt/qt.git/commit?id=e50aa2252cdd5cb5
-Bug-Upstream: https://bugreports.qt.io/browse/QTBUG-44547
-Bug-Debian: https://bugs.debian.org/779550
-Last-Update: 2015-03-02
-
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -319,10 +319,16 @@
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
diff --git a/debian/patches/series b/debian/patches/series
index 59a5578..368f4b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,4 +50,3 @@ qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
 remove_addsense.patch
 parisc-atomic.patch
-cve-2015-0295.diff

-- 
Qt 4 packaging