From 9b422f13381006bd07b96a74a440fc10ce044a80 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 5 Jan 2020 20:07:49 +0100 Subject: [PATCH 1/8] Fix uninitialized memory read when calling rfbEncryptBytes rfbEncryptBytes calls strlen on passwd so we need to make sure there's an empty null character at the end if the password is of MAXPWLEN size --- krfb/rfbclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krfb/rfbclient.cpp b/krfb/rfbclient.cpp index 7109ccc5..ff404ec8 100644 --- a/krfb/rfbclient.cpp +++ b/krfb/rfbclient.cpp @@ -217,11 +217,11 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB return true; } - char passwd[MAXPWLEN]; + char passwd[MAXPWLEN+1]; // +1 to make sure there's a nullptr at the end unsigned char challenge[CHALLENGESIZE]; memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE); - memset(passwd, 0, MAXPWLEN); + memset(passwd, 0, sizeof(passwd)); if (!password.isEmpty()) { strncpy(passwd, password.constData(), From ba87204070115b09377c37aa744da94963fde0b0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jan 2020 08:37:19 +0100 Subject: [PATCH 2/8] GIT_SILENT made messages (after extraction) --- krfb/org.kde.krfb.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krfb/org.kde.krfb.appdata.xml b/krfb/org.kde.krfb.appdata.xml index d83dc510..b1b86383 100644 --- a/krfb/org.kde.krfb.appdata.xml +++ b/krfb/org.kde.krfb.appdata.xml @@ -106,7 +106,7 @@

Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.

xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx

Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。

-

Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 客戶端檢視、甚至控制您的桌面。

+

Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 用戶端檢視、甚至控制您的桌面。

https://userbase.kde.org/Krfb https://bugs.kde.org/enter_bug.cgi?format=guided&product=krfb From 5f53df2e763d93157b93caffa6951af95c83147c Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Mon, 6 Jan 2020 15:07:36 +0100 Subject: [PATCH 3/8] Update Appstream for new release --- krfb/org.kde.krfb.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/krfb/org.kde.krfb.appdata.xml b/krfb/org.kde.krfb.appdata.xml index b1b86383..e47e4ea7 100644 --- a/krfb/org.kde.krfb.appdata.xml +++ b/krfb/org.kde.krfb.appdata.xml @@ -150,6 +150,7 @@ KDE + From f162574aba48513fbcbef49f6caedaca1d14bc03 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Jan 2020 09:14:45 +0100 Subject: [PATCH 4/8] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- events/x11/krfb_events_x11.json | 1 + framebuffers/pipewire/krfb_framebuffer_pw.json | 2 ++ krfb/krfb-events.desktop | 1 + krfb/krfb-events.json | 1 + 4 files changed, 5 insertions(+) diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json index 9ee3d24f..638cf83f 100644 --- a/events/x11/krfb_events_x11.json +++ b/events/x11/krfb_events_x11.json @@ -41,6 +41,7 @@ "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä", "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb", "Name[gl]": "Xestor de eventos de X11 para KRfb", + "Name[ia]": "Gerente de evento de X11 per KRfb", "Name[it]": "Gestore eventi X11 per KRfb", "Name[ko]": "KRfb X11 이벤트 핸들러", "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb", diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json index 58f9b342..1f791111 100644 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ b/framebuffers/pipewire/krfb_framebuffer_pw.json @@ -14,6 +14,7 @@ "Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.", "Description[fr]": "Tampon d'images utilisant PipeWire pour KRfb.", "Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.", + "Description[ia]": "Framebuffer basate sur PipeWire per KRfb", "Description[it]": "Framebuffer basato su PipeWire per KRfb.", "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.", "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.", @@ -44,6 +45,7 @@ "Name[fi]": "KRfb:n PipeWire-kehyspuskuri", "Name[fr]": "Tampon d'images PipeWire pour KRfb", "Name[gl]": "Búfer de fotograma de PipeWire para KRfb", + "Name[ia]": "Framebuffer basate sur PipeWire per KRfb", "Name[it]": "Framebuffer PipeWire per KRfb", "Name[ko]": "KRfb용 PipeWire 프레임버퍼", "Name[nl]": "PipeWire-framebuffer voor KRfb", diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 9f8a4caf..004ccaa4 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -15,6 +15,7 @@ Comment[eu]=KRfb-rako gertaeren pluginak Comment[fi]=KRfb:n tapahtumaliitännäinen Comment[fr]=Modules externes d'événements pour Krfb Comment[gl]=Complementos de eventos para KRfb +Comment[ia]=Plug-ins de evento per KRfb Comment[it]=Estensioni degli eventi per KRfb Comment[ko]=KRfb 이벤트 플러그인 Comment[nl]=Plug-ins voor gebeurtenis voor KRfb diff --git a/krfb/krfb-events.json b/krfb/krfb-events.json index 7a85bce8..2369a6ac 100644 --- a/krfb/krfb-events.json +++ b/krfb/krfb-events.json @@ -13,6 +13,7 @@ "Description[fi]": "KRfb:n tapahtumaliitännäinen", "Description[fr]": "Modules externes d'évènements pour KRfb", "Description[gl]": "Complementos de eventos para KRfb", + "Description[ia]": "Plug-ins de eventos per KRfb", "Description[it]": "Estensioni degli eventi per KRfb", "Description[ko]": "KRfb 이벤트 플러그인", "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb", From 4acb23aa5e84ff62aaa229c8072338d54d94cb2e Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sun, 2 Feb 2020 15:06:53 +0100 Subject: [PATCH 5/8] GIT_SILENT Upgrade KDE Applications version to 19.12.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 994bba6e..728dc80a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(krfb VERSION ${KDE_APPLICATIONS_VERSION}) From f473c88affed6db1d8a3828436b1b5a77a405e60 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Tue, 4 Feb 2020 00:29:19 +0100 Subject: [PATCH 6/8] GIT_SILENT Update Appstream for new release --- krfb/org.kde.krfb.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/krfb/org.kde.krfb.appdata.xml b/krfb/org.kde.krfb.appdata.xml index e47e4ea7..0bd24651 100644 --- a/krfb/org.kde.krfb.appdata.xml +++ b/krfb/org.kde.krfb.appdata.xml @@ -150,6 +150,7 @@ KDE + From a62ef07e9d7d71ada719e677d9b425e987f11041 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 10 Feb 2020 14:23:29 +0100 Subject: [PATCH 7/8] PW framebuffer: send correct type over DBus --- framebuffers/pipewire/pw_framebuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framebuffers/pipewire/pw_framebuffer.cpp b/framebuffers/pipewire/pw_framebuffer.cpp index 768fd8c7..ec99c445 100644 --- a/framebuffers/pipewire/pw_framebuffer.cpp +++ b/framebuffers/pipewire/pw_framebuffer.cpp @@ -260,7 +260,7 @@ void PWFrameBuffer::Private::handleSessionCreated(quint32 &code, QVariantMap &re // select sources for the session auto selectionOptions = QVariantMap { // We have to specify it's an uint, otherwise xdg-desktop-portal will not forward it to backend implementation - { QLatin1String("types"),QVariant::fromValue(7) }, // request all (KeyBoard, Pointer, TouchScreen) + { QLatin1String("types"), QVariant::fromValue(7) }, // request all (KeyBoard, Pointer, TouchScreen) #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) { QLatin1String("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) } #else @@ -304,7 +304,7 @@ void PWFrameBuffer::Private::handleDevicesSelected(quint32 &code, QVariantMap &r // select sources for the session auto selectionOptions = QVariantMap { - { QLatin1String("types"), 1 }, // only MONITOR is supported + { QLatin1String("types"), QVariant::fromValue(1) }, // only MONITOR is supported { QLatin1String("multiple"), false }, #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) { QLatin1String("handle_token"), QStringLiteral("krfb%1").arg(QRandomGenerator::global()->generate()) } From 1da8e3c84a622d35141449a1cac57898d0f6e348 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sat, 29 Feb 2020 23:30:44 +0100 Subject: [PATCH 8/8] GIT_SILENT Upgrade KDE Applications version to 19.12.3. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 728dc80a..559392bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(krfb VERSION ${KDE_APPLICATIONS_VERSION})