[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-2-6-g8d1b571

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=8d1b571

The following commit has been merged in the kubuntu_unstable branch:
commit 8d1b57118a772a30cfcac8a5030a71365a2d930f
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Mar 26 14:57:45 2015 +0100

    Remove cve-2015-0295.diff, not required for git build
---
 debian/changelog                  |  7 +++++--
 debian/patches/cve-2015-0295.diff | 29 -----------------------------
 debian/patches/series             |  1 -
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8192eb0..596d77b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.4.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update debian/README.source for new upstream code location
@@ -9,7 +9,10 @@ qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
   * Add libpcre3-dev as build dependency in order to use the new pcre16 library
     instead of the embedded one.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 10:26:29 +0300
+  [ Rohan Garg ]
+  * Remove cve-2015-0295.diff, not required for git build
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Mar 2015 14:57:24 +0100
 
 qtbase-opensource-src (5.4.1+dfsg-2) experimental; urgency=medium
 
diff --git a/debian/patches/cve-2015-0295.diff b/debian/patches/cve-2015-0295.diff
deleted file mode 100644
index af853d4..0000000
--- a/debian/patches/cve-2015-0295.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: fix a division by zero when processing malformed BMP files
-Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit?id=661f6bfd032dacc6
-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
-@@ -314,12 +314,20 @@
-         }
-     } 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);
-         alpha_shift = calc_shift(alpha_mask);
-+        if (((alpha_mask >> alpha_shift) + 1) == 0)
-+            return false;
-         alpha_scale = 256 / ((alpha_mask >> alpha_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 a7d9be1..2c1bf49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-cve-2015-0295.diff
 
 # Debian specific.
 revert_upstream_bsymbolic_change.patch

-- 
qtbase packaging