diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-23 18:10:08 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-23 18:10:43 +0200 |
commit | 514ce567db835710b7d077617740381cebc4c6b1 (patch) | |
tree | 471efa74612dfcb8b662ff73a7b01df03b90b981 /kde-apps | |
parent | app-admin/gkrellm: fix path in systemd unit (diff) | |
download | gentoo-514ce567db835710b7d077617740381cebc4c6b1.tar.gz gentoo-514ce567db835710b7d077617740381cebc4c6b1.tar.bz2 gentoo-514ce567db835710b7d077617740381cebc4c6b1.zip |
kde-apps/kopete: Drop 16.12.2-r2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/kopete/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kopete/files/kopete-16.12.2-CVE-2017-5593.patch | 119 | ||||
-rw-r--r-- | kde-apps/kopete/kopete-16.12.2-r2.ebuild | 158 |
3 files changed, 0 insertions, 278 deletions
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest index 7e22c41e800d..ae410c7df750 100644 --- a/kde-apps/kopete/Manifest +++ b/kde-apps/kopete/Manifest @@ -1,3 +1,2 @@ -DIST kopete-16.12.2.tar.xz 6339196 SHA256 2b0a73771f842998a2d39050367f89686409ac798592e5c191197acd9c5bc02d SHA512 fff8ab7e190b9f66f367c354f4ed75ba33653d7a7e4b42f577ca999a8c9c85f4cf09bb261b079b9d6e9108e3ef8ad9195305c82cfaeb8fe853c57236f4d30391 WHIRLPOOL 2d9905cd83e656723ce745c36685f34ffa75eb1d28e34e2ca83a4dc514f77a0cb6a4e5f70aeba72553880047c86c2343381cb7dcd95d23629dafe5d87b577ce5 DIST kopete-16.12.3.tar.xz 6340128 SHA256 61be9e45cb08e42a00bdc0e99f5d7ad7872299ac2e104124a3c0d939422376b6 SHA512 00327485a367e0daa69dc67bfe0e7cd12293fe57bcc22d48fe0872546b3f757dbd2e349c557ad89452951d59340f615b66a7d4155a7b29fceb3d404d0b6006b7 WHIRLPOOL 9e061459783e15751d795ef4b4d16ca387d8fcbdb745f5ded141c3a7ddbd3a52066e4c7e892d71a838db36c8ee514d17dce1e9861a57d9ad11792e7cfd440c61 DIST kopete-17.04.0.tar.xz 6340128 SHA256 50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1 SHA512 5323362fed37f99cc9a45eead13b4fcf2346cddf270f73716858cf38b36043a56d73d51035e9007975e92f96df4814b0b282cdcc13107cd75e4e8d8273effa59 WHIRLPOOL 6246e2f1b47ef46965b20e361da4b8a5deb8699956369d9ec8d3408b4f7eaacd958c124f80f4f638ecf5ea3651dd1fe6b370330d31c2cb65630052e8fecb8346 diff --git a/kde-apps/kopete/files/kopete-16.12.2-CVE-2017-5593.patch b/kde-apps/kopete/files/kopete-16.12.2-CVE-2017-5593.patch deleted file mode 100644 index 73150c319f22..000000000000 --- a/kde-apps/kopete/files/kopete-16.12.2-CVE-2017-5593.patch +++ /dev/null @@ -1,119 +0,0 @@ -commit 6243764c4fd0985320d4a10b48051cc418d584ad -Author: Pali Rohár <pali.rohar@gmail.com> -Date: Sat Feb 11 13:24:59 2017 +0100 - - Fix CVE 2017-5593 (User Impersonation Vulnerability) in jabber protocol - - BUG: 376348 - FIXED-IN: 16.12.3 - -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 000000000..573ca66bc ---- /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 <delay> 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 0e74b7126..083754867 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 <delay> 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/kde-apps/kopete/kopete-16.12.2-r2.ebuild b/kde-apps/kopete/kopete-16.12.2-r2.ebuild deleted file mode 100644 index 02c454c4a32f..000000000000 --- a/kde-apps/kopete/kopete-16.12.2-r2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -inherit kde4-base - -DESCRIPTION="KDE multi-protocol IM client" -HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete" -KEYWORDS="amd64 ~arm x86" -IUSE="debug ssl v4l" - -# tests hang, last checked for 4.2.96 -RESTRICT+=" test" - -# Available plugins -# -# addbookmarks: NO DEPS -# alias: NO DEPS (disabled upstream) -# autoreplace: NO DEPS -# contactnotes: NO DEPS -# highlight: NO DEPS -# history: NO DEPS -# latex: virtual/latex as RDEPEND -# nowlistening: NO DEPS -# otr: libotr -# pipes: NO DEPS -# privacy: NO DEPS -# statistics: dev-db/sqlite:3 -# texteffect: NO DEPS -# translator: NO DEPS -# urlpicpreview: NO DEPS -# webpresence: libxml2 libxslt -# NOTE: By default we enable all plugins that don't have any dependencies -PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex -+nowlistening otr +pipes +privacy +statistics +texteffect +translator -+urlpicpreview webpresence" - -# Available protocols -# -# gadu: net-libs/libgadu @since 4.3 -# groupwise: app-crypt/qca:2 -# irc: NO DEPS, probably will fail so inform user about it -# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK -# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM -# meanwhile: net-libs/meanwhile -# oscar: NO DEPS -# telepathy: net-libs/decibel -# testbed: NO DEPS -# winpopup: NO DEPS (we're adding samba as RDEPEND so it works) -# yahoo: media-libs/jasper -# zeroconf (bonjour): NO DEPS -PROTOCOLS="gadu groupwise jingle meanwhile oscar skype -testbed winpopup +xmpp yahoo zeroconf" - -# disabled protocols -# telepathy: net-libs/decibel -# irc: NO DEPS -# msn: net-libs/libmsn -# qq: NO DEPS - -IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" - -COMMONDEPEND=" - $(add_kdeapps_dep kdepimlibs) - dev-libs/libpcre - >=dev-qt/qtgui-4.4.0:4[mng] - kde-frameworks/kdelibs:4[zeroconf?] - media-libs/phonon[qt4] - media-libs/qimageblitz - !aqua? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - gadu? ( >=net-libs/libgadu-1.8.0[threads] ) - groupwise? ( app-crypt/qca:2[qt4(+)] ) - jingle? ( - dev-libs/expat - dev-libs/openssl:0 - >=media-libs/mediastreamer-2.3.0 - media-libs/speex - net-libs/libsrtp:= - net-libs/ortp:= - ) - meanwhile? ( net-libs/meanwhile ) - otr? ( >=net-libs/libotr-4.0.0 ) - statistics? ( dev-db/sqlite:3 ) - v4l? ( media-libs/libv4l ) - webpresence? ( - dev-libs/libxml2 - dev-libs/libxslt - ) - xmpp? ( - app-crypt/qca:2[qt4(+)] - dev-libs/qjson - net-dns/libidn - sys-libs/zlib - ) - yahoo? ( media-libs/jasper ) -" -RDEPEND="${COMMONDEPEND} - latex? ( - virtual/imagemagick-tools - virtual/latex-base - ) - ssl? ( app-crypt/qca:2[ssl] ) - winpopup? ( net-fs/samba ) -" -DEPEND="${COMMONDEPEND} - jingle? ( dev-libs/jsoncpp ) - !aqua? ( x11-proto/scrnsaverproto ) -" - -PATCHES=( "${FILESDIR}/${P}-CVE-2017-5593.patch" ) - -src_configure() { - local x x2 - # Handle common stuff - local mycmakeargs=( - -DWITH_GOOGLETALK=$(usex jingle) - -DWITH_LiboRTP=$(usex jingle) - -DWITH_Mediastreamer=$(usex jingle) - -DWITH_Speex=$(usex jingle) - -DDISABLE_VIDEOSUPPORT=$(usex !v4l) - ) - # enable protocols - for x in ${PROTOCOLS}; do - case ${x/+/} in - zeroconf) x2=bonjour ;; - xmpp) x2=jabber ;; - *) x2=${x/+/} ;; - esac - mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) - done - - mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF ) - - # enable plugins - for x in ${PLUGINS}; do - mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) ) - done - - kde4-base_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if ! use ssl; then - if use xmpp ; then # || use irc; then - if ! has_version "app-crypt/qca:2[ssl]" ; then - elog "In order to use ssl in xmpp you'll need to" - elog "install app-crypt/qca package with USE=ssl." - fi - fi - fi -} |