[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-27-gc2ea068

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 87ea14dd46e5e703ab0763752a83db02de7cfeab
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 2 14:51:10 2013 -0300

    Remove CVE-2011-3922.patch
---
 debian/changelog                   |    1 +
 debian/patches/CVE-2011-3922.patch |   17 -----------------
 debian/patches/series              |    1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2399ebe..47b903b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qt4-x11 (4:4.8.5+dfsg-1) UNRELEASED; urgency=low
     - SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch
     - Fix_binary_incompatibility_between_openssl_versions.patch
     - QGtkStyle-remove-an-unnecessary-sanity-check-for-the.patch
+    - CVE-2011-3922.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
diff --git a/debian/patches/CVE-2011-3922.patch b/debian/patches/CVE-2011-3922.patch
deleted file mode 100644
index 8a51b92..0000000
--- a/debian/patches/CVE-2011-3922.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Stack-buffer-overflow in glyph handling.
- Credit to Google Chrome Security Team (Cris Neckar).
-
----
- src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
-@@ -359,6 +359,7 @@ static HB_Bool myanmar_shape_syllable(HB
-         if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) {
-             reordered[len] = Mymr_C_NGA;
-             reordered[len+1] = Mymr_C_VIRAMA;
-+            if (len > 0)
-             properties[len-1] = AboveForm;
-             properties[len] = AboveForm;
-             len += 2;
diff --git a/debian/patches/series b/debian/patches/series
index 273497b..7b0b9c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,6 +39,5 @@ powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
 s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch
-CVE-2011-3922.patch
 no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch

-- 
Qt 4 packaging