[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-25-g1d48d8f

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 1d48d8f56cd17c1a623edca27c299e220da5d8b8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Feb 3 22:45:22 2018 +0300

    Update patches for 5.10.1.
---
 debian/changelog                     |  2 ++
 debian/patches/dead_key_symbols.diff |  4 +--
 debian/patches/nonlinux_utime.diff   |  2 +-
 debian/patches/qdnslookup_crash.diff | 62 ------------------------------------
 debian/patches/series                |  1 -
 5 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5655e92..c128e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtbase-opensource-src (5.10.1+dfsg-1) UNRELEASED; urgency=medium
     Add two more places where config tests are currently false positives.
   * Merge 5.9.2+dfsg-8 upload from unstable.
   * Update symbols files from buildds’ logs.
+  * Drop qdnslookup_crash.diff, included in the new release.
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 19:16:38 +0300
 
diff --git a/debian/patches/dead_key_symbols.diff b/debian/patches/dead_key_symbols.diff
index 47257c6..ef00c20 100644
--- a/debian/patches/dead_key_symbols.diff
+++ b/debian/patches/dead_key_symbols.diff
@@ -4,7 +4,7 @@ Last-Update: 2018-01-19
 
 --- a/src/corelib/global/qnamespace.h
 +++ b/src/corelib/global/qnamespace.h
-@@ -846,6 +846,36 @@
+@@ -848,6 +848,36 @@
          Key_Dead_Belowdot       = 0x01001260,
          Key_Dead_Hook           = 0x01001261,
          Key_Dead_Horn           = 0x01001262,
@@ -82,7 +82,7 @@ Last-Update: 2018-01-19
      
alue Key_Stop
 --- a/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
 +++ b/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
-@@ -281,7 +281,7 @@
+@@ -287,7 +287,7 @@
          *modifiers |= Qt::KeypadModifier;
      } else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
                                    && text.unicode()->unicode() != 0x7f
diff --git a/debian/patches/nonlinux_utime.diff b/debian/patches/nonlinux_utime.diff
index 7790584..384229f 100644
--- a/debian/patches/nonlinux_utime.diff
+++ b/debian/patches/nonlinux_utime.diff
@@ -6,7 +6,7 @@ Last-Update: 2017-07-04
 
 --- a/qmake/library/ioutils.cpp
 +++ b/qmake/library/ioutils.cpp
-@@ -215,7 +215,7 @@
+@@ -222,7 +222,7 @@
          *errorString = fL1S("Cannot stat() reference file %1: %2.").arg(referenceFileName, fL1S(strerror(errno)));
          return false;
      }
diff --git a/debian/patches/qdnslookup_crash.diff b/debian/patches/qdnslookup_crash.diff
deleted file mode 100644
index 48d678d..0000000
--- a/debian/patches/qdnslookup_crash.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: fix out of bounds reads in qdnslookup_unix
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=306c32f50e289c40
-Last-Update: 2017-12-03
-
---- a/src/network/kernel/qdnslookup_unix.cpp
-+++ b/src/network/kernel/qdnslookup_unix.cpp
-@@ -42,6 +42,7 @@
- #if QT_CONFIG(library)
- #include <qlibrary.h>
- #endif
-+#include <qvarlengtharray.h>
- #include <qscopedpointer.h>
- #include <qurl.h>
- #include <private/qnativesocketengine_p.h>
-@@ -58,6 +59,8 @@
- #  include <gnu/lib-names.h>
- #endif
- 
-+#include <cstring>
-+
- QT_BEGIN_NAMESPACE
- 
- #if QT_CONFIG(library)
-@@ -137,7 +140,7 @@
- 
-     // Initialize state.
-     struct __res_state state;
--    memset(&state, 0, sizeof(state));
-+    std::memset(&state, 0, sizeof(state));
-     if (local_res_ninit(&state) < 0) {
-         reply->error = QDnsLookup::ResolverError;
-         reply->errorString = tr("Resolver initialization failed");
-@@ -189,11 +192,25 @@
-     QScopedPointer<struct __res_state, QDnsLookupStateDeleter> state_ptr(&state);
- 
-     // Perform DNS query.
--    unsigned char response[PACKETSZ];
--    memset(response, 0, sizeof(response));
--    const int responseLength = local_res_nquery(&state, requestName, C_IN, requestType, response, sizeof(response));
-+    QVarLengthArray<unsigned char, PACKETSZ> buffer(PACKETSZ);
-+    std::memset(buffer.data(), 0, buffer.size());
-+    int responseLength = local_res_nquery(&state, requestName, C_IN, requestType, buffer.data(), buffer.size());
-+    if (Q_UNLIKELY(responseLength > PACKETSZ)) {
-+        buffer.resize(responseLength);
-+        std::memset(buffer.data(), 0, buffer.size());
-+        responseLength = local_res_nquery(&state, requestName, C_IN, requestType, buffer.data(), buffer.size());
-+        if (Q_UNLIKELY(responseLength > buffer.size())) {
-+            // Ok, we give up.
-+            reply->error = QDnsLookup::ResolverError;
-+            reply->errorString.clear(); // We cannot be more specific, alas.
-+            return;
-+        }
-+    }
- 
--    // Check the response header.
-+    unsigned char *response = buffer.data();
-+    // Check the response header. Though res_nquery returns -1 as a
-+    // responseLength in case of error, we still can extract the
-+    // exact error code from the response.
-     HEADER *header = (HEADER*)response;
-     const int answerCount = ntohs(header->ancount);
-     switch (header->rcode) {
diff --git a/debian/patches/series b/debian/patches/series
index f6a82fc..d337dab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Backported from upstream.
-qdnslookup_crash.diff
 dead_key_symbols.diff
 
 # Debian specific.

-- 
qtbase packaging