[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.9.3+dfsg-0ubuntu2-5-g0c394cc
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Mon Jan 29 00:46:59 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=a71e044
The following commit has been merged in the ubuntu+1 branch:
commit a71e044213f3e37636b84f668be7f51b12d17469
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Sun Jan 28 13:53:27 2018 -0600
Full patch refresh.
---
debian/changelog | 2 ++
debian/patches/dead_key_symbols.diff | 12 +++----
debian/patches/qdnslookup_crash.diff | 62 ------------------------------------
debian/patches/series | 1 -
4 files changed, 8 insertions(+), 69 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 28f5348..5764d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
qtbase-opensource-src (5.9.4+dfsg-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches, and delete reverse-applicable ones:
+ - qdnslookup_crash.diff
-- Simon Quigley <tsimonq2 at ubuntu.com> Sun, 28 Jan 2018 13:36:30 -0600
diff --git a/debian/patches/dead_key_symbols.diff b/debian/patches/dead_key_symbols.diff
index 5ba260e..0c39e27 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
-@@ -840,6 +840,36 @@
+@@ -842,6 +842,36 @@ public:
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 @@ int QLibInputKeyboard::keysymToQtKey(xkb
*modifiers |= Qt::KeypadModifier;
} else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
&& text.unicode()->unicode() != 0x7f
@@ -93,7 +93,7 @@ Last-Update: 2018-01-19
// any other keys
--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
-@@ -82,7 +82,37 @@
+@@ -82,7 +82,37 @@ static const int composingKeys[] = {
Qt::Key_Dead_Semivoiced_Sound,
Qt::Key_Dead_Belowdot,
Qt::Key_Dead_Hook,
@@ -134,7 +134,7 @@ Last-Update: 2018-01-19
QComposeInputContext::QComposeInputContext()
--- a/src/plugins/platforms/mirclient/qmirclientinput.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientinput.cpp
-@@ -156,6 +156,36 @@
+@@ -156,6 +156,36 @@ static const uint32_t KeyTable[] = {
XKB_KEY_dead_belowdot, Qt::Key_Dead_Belowdot,
XKB_KEY_dead_hook, Qt::Key_Dead_Hook,
XKB_KEY_dead_horn, Qt::Key_Dead_Horn,
@@ -253,7 +253,7 @@ Last-Update: 2018-01-19
#ifndef XK_Codeinput
#define XK_Codeinput 0xFF37
#endif
-@@ -429,6 +490,36 @@
+@@ -429,6 +490,36 @@ static const unsigned int KeyTbl[] = {
XK_dead_belowdot, Qt::Key_Dead_Belowdot,
XK_dead_hook, Qt::Key_Dead_Hook,
XK_dead_horn, Qt::Key_Dead_Horn,
@@ -290,7 +290,7 @@ Last-Update: 2018-01-19
// Special keys from X.org - This include multimedia keys,
// wireless/bluetooth/uwb keys, special launcher keys, etc.
-@@ -1124,7 +1215,7 @@
+@@ -1124,7 +1215,7 @@ int QXcbKeyboard::keysymToQtKey(xcb_keys
modifiers |= Qt::KeypadModifier;
} else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
&& text.unicode()->unicode() != 0x7f
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 b1184c7..ee8dbee 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
More information about the pkg-kde-commits
mailing list