From 52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 30 Jul 2020 19:45:19 +0200 Subject: Cleanup unused KDE patches Thanks to Patrick Volkerding for the effort. --- kde/patch/kopete/kopete_kdebug376348.patch | 127 ----------------------------- kde/patch/kopete/kopete_kdebug393372.patch | 30 ------- 2 files changed, 157 deletions(-) delete mode 100644 kde/patch/kopete/kopete_kdebug376348.patch delete mode 100644 kde/patch/kopete/kopete_kdebug393372.patch (limited to 'kde/patch/kopete') diff --git a/kde/patch/kopete/kopete_kdebug376348.patch b/kde/patch/kopete/kopete_kdebug376348.patch deleted file mode 100644 index d9bb057..0000000 --- a/kde/patch/kopete/kopete_kdebug376348.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 6243764c4fd0985320d4a10b48051cc418d584ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Sat, 11 Feb 2017 13:24:59 +0100 -Subject: Fix CVE 2017-5593 (User Impersonation Vulnerability) in jabber - protocol - -BUG: 376348 -FIXED-IN: 16.12.3 ---- - .../jabber/libiris/patches/01_cve_2017-5593.patch | 52 ++++++++++++++++++++++ - .../jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.cpp | 14 +++--- - 2 files changed, 61 insertions(+), 5 deletions(-) - create mode 100644 protocols/jabber/libiris/patches/01_cve_2017-5593.patch - -diff --git a/protocols/jabber/libiris/patches/01_cve_2017-5593.patch b/protocols/jabber/libiris/patches/01_cve_2017-5593.patch -new file mode 100644 -index 0000000..573ca66 ---- /dev/null -+++ b/protocols/jabber/libiris/patches/01_cve_2017-5593.patch -@@ -0,0 +1,52 @@ -+diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp -+index 0e74b71..0837548 100644 -+--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp -++++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp -+@@ -888,14 +888,18 @@ bool JT_PushMessage::take(const QDomElement &e) -+ QDomElement forward; -+ Message::CarbonDir cd = Message::NoCarbon; -+ -++ Jid fromJid = Jid(e1.attribute(QLatin1String("from"))); -+ // Check for Carbon -+ QDomNodeList list = e1.childNodes(); -+ for (int i = 0; i < list.size(); ++i) { -+ QDomElement el = list.at(i).toElement(); -+ -+- if (el.attribute("xmlns") == QLatin1String("urn:xmpp:carbons:2") && (el.tagName() == QLatin1String("received") || el.tagName() == QLatin1String("sent"))) { -++ if (el.attribute("xmlns") == QLatin1String("urn:xmpp:carbons:2") -++ && (el.tagName() == QLatin1String("received") || el.tagName() == QLatin1String("sent")) -++ && fromJid.compare(Jid(e1.attribute(QLatin1String("to"))), false)) { -+ QDomElement el1 = el.firstChildElement(); -+- if (el1.tagName() == QLatin1String("forwarded") && el1.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -++ if (el1.tagName() == QLatin1String("forwarded") -++ && el1.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -+ QDomElement el2 = el1.firstChildElement(QLatin1String("message")); -+ if (!el2.isNull()) { -+ forward = el2; -+@@ -904,7 +908,8 @@ bool JT_PushMessage::take(const QDomElement &e) -+ } -+ } -+ } -+- else if (el.tagName() == QLatin1String("forwarded") && el.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -++ else if (el.tagName() == QLatin1String("forwarded") -++ && el.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -+ forward = el.firstChildElement(QLatin1String("message")); // currently only messages are supportted -+ // TODO element support -+ if (!forward.isNull()) { -+@@ -913,7 +918,6 @@ bool JT_PushMessage::take(const QDomElement &e) -+ } -+ } -+ -+- QString from = e1.attribute(QLatin1String("from")); -+ Stanza s = client()->stream().createStanza(addCorrectNS(forward.isNull()? e1 : forward)); -+ if(s.isNull()) { -+ //printf("take: bad stanza??\n"); -+@@ -926,7 +930,7 @@ bool JT_PushMessage::take(const QDomElement &e) -+ return false; -+ } -+ if (!forward.isNull()) { -+- m.setForwardedFrom(Jid(from)); -++ m.setForwardedFrom(fromJid); -+ m.setCarbonDirection(cd); -+ } -+ -diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.cpp -index 0e74b71..0837548 100644 ---- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.cpp -+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.cpp -@@ -888,14 +888,18 @@ bool JT_PushMessage::take(const QDomElement &e) - QDomElement forward; - Message::CarbonDir cd = Message::NoCarbon; - -+ Jid fromJid = Jid(e1.attribute(QLatin1String("from"))); - // Check for Carbon - QDomNodeList list = e1.childNodes(); - for (int i = 0; i < list.size(); ++i) { - QDomElement el = list.at(i).toElement(); - -- if (el.attribute("xmlns") == QLatin1String("urn:xmpp:carbons:2") && (el.tagName() == QLatin1String("received") || el.tagName() == QLatin1String("sent"))) { -+ if (el.attribute("xmlns") == QLatin1String("urn:xmpp:carbons:2") -+ && (el.tagName() == QLatin1String("received") || el.tagName() == QLatin1String("sent")) -+ && fromJid.compare(Jid(e1.attribute(QLatin1String("to"))), false)) { - QDomElement el1 = el.firstChildElement(); -- if (el1.tagName() == QLatin1String("forwarded") && el1.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -+ if (el1.tagName() == QLatin1String("forwarded") -+ && el1.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { - QDomElement el2 = el1.firstChildElement(QLatin1String("message")); - if (!el2.isNull()) { - forward = el2; -@@ -904,7 +908,8 @@ bool JT_PushMessage::take(const QDomElement &e) - } - } - } -- else if (el.tagName() == QLatin1String("forwarded") && el.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { -+ else if (el.tagName() == QLatin1String("forwarded") -+ && el.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) { - forward = el.firstChildElement(QLatin1String("message")); // currently only messages are supportted - // TODO element support - if (!forward.isNull()) { -@@ -913,7 +918,6 @@ bool JT_PushMessage::take(const QDomElement &e) - } - } - -- QString from = e1.attribute(QLatin1String("from")); - Stanza s = client()->stream().createStanza(addCorrectNS(forward.isNull()? e1 : forward)); - if(s.isNull()) { - //printf("take: bad stanza??\n"); -@@ -926,7 +930,7 @@ bool JT_PushMessage::take(const QDomElement &e) - return false; - } - if (!forward.isNull()) { -- m.setForwardedFrom(Jid(from)); -+ m.setForwardedFrom(fromJid); - m.setCarbonDirection(cd); - } - --- -cgit v0.11.2 - diff --git a/kde/patch/kopete/kopete_kdebug393372.patch b/kde/patch/kopete/kopete_kdebug393372.patch deleted file mode 100644 index 2d1b1f0..0000000 --- a/kde/patch/kopete/kopete_kdebug393372.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Tue, 24 Apr 2018 06:30:19 +0200 -Subject: oscar: include buffer.h - -This header uses Buffer as by-value parameter, so make sure it knows -about it. - -BUG: 393372 -FIXED-IN: 18.04.1 ---- - protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h -index 8f52cd7..908e903 100644 ---- a/protocols/oscar/liboscar/tasks/messagereceivertask.h -+++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h -@@ -21,6 +21,7 @@ - #include - #include "oscarmessage.h" - #include "oscartypeclasses.h" -+#include "buffer.h" - - class QTextCodec; - --- -cgit v0.11.2 - - -- cgit v1.2.3-79-gdb01