commit: 36d5d1ee683c56a9fb9d18be0e885c3e849d5d57 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Nov 19 06:13:01 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Nov 19 06:14:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d5d1ee
net-irc/konversation: remove vulnerable Bug: https://bugs.gentoo.org/637112 Package-Manager: Portage-2.3.8, Repoman-2.3.4 net-irc/konversation/Manifest | 1 - .../files/konversation-1.7.2-extjoin-crash.patch | 47 ------------- .../files/konversation-1.7.2-focus.patch | 25 ------- .../files/konversation-1.7.2-memleak.patch | 33 ---------- net-irc/konversation/konversation-1.7.2-r1.ebuild | 77 ---------------------- net-irc/konversation/konversation-1.7.2.ebuild | 71 -------------------- 6 files changed, 254 deletions(-) diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest index 5b151cdd334..6d101b693d0 100644 --- a/net-irc/konversation/Manifest +++ b/net-irc/konversation/Manifest @@ -1,2 +1 @@ -DIST konversation-1.7.2.tar.xz 3736968 SHA256 5ff96e84cee4e1eefc404a31d778067ea50dddd8a6c848911fac70bd52812618 SHA512 91523043afd7d7698c8166256d3eba225d8ff1ba44cad6811b00bf0004b765ce1ed618e900c8cafa7b395217b3fa3703db62a79b0a491bcef6c0bb65037add06 WHIRLPOOL 842fac84013a6915b5acad2c7ee8abab794c01722628fb4cbd7a3c462229fadf1c88b340fd094efadb1ac62e2c1838de80a26114bff0c98064c9f57e87974860 DIST konversation-1.7.4.tar.xz 3737732 SHA256 17ef5b7fe816cf52aaaba9ba1b6de69412675353df4217fc889a07ca1c919978 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a WHIRLPOOL 3ebe17b0bb9d2a2bdc80336d47ff7b45c9da29446095ca2b66eeea534e22d0766d16edd8da83a8520b8774a6f86cb020f6549b6d225f70062f9d876b1776c1c0 diff --git a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch deleted file mode 100644 index 97fc4c1494c..00000000000 --- a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 783dc0f595ecf90e37225a57da0ffa2c030a470d Mon Sep 17 00:00:00 2001 -From: Peter Simonsson <[email protected]> -Date: Sat, 10 Jun 2017 20:41:50 +0200 -Subject: Fix crash in join handling in inputfilter - -Make sure to check size of parameter list for extended join. - -BUG:378854 ---- - src/irc/inputfilter.cpp | 19 ++++++------------- - 1 file changed, 6 insertions(+), 13 deletions(-) - -diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp -index 53f3b2c..f273d30 100644 ---- a/src/irc/inputfilter.cpp -+++ b/src/irc/inputfilter.cpp -@@ -575,21 +575,14 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma - QString account; - QString realName; - -- if (!m_server->hasExtendedJoin()) -- { -- channelName = trailing; -- // Sometimes JOIN comes without ":" in front of the channel name -- } -- else -+ channelName = parameterList[0]; -+ -+ if (m_server->hasExtendedJoin() && plHas(3)) - { -- channelName = parameterList[0]; -- account = parameterList[1]; -- realName = parameterList[2]; -+ if (parameterList[1] != "*") -+ account = parameterList[1]; - -- if (account == "*") -- { -- account = QString(); -- } -+ realName = parameterList[2]; - } - - // Did we join the channel, or was it someone else? --- -cgit v0.11.2 - diff --git a/net-irc/konversation/files/konversation-1.7.2-focus.patch b/net-irc/konversation/files/konversation-1.7.2-focus.patch deleted file mode 100644 index b42bed488f3..00000000000 --- a/net-irc/konversation/files/konversation-1.7.2-focus.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3263b47db2d0aab78d6a6fbc99682ac9b5ef2f2e Mon Sep 17 00:00:00 2001 -From: Eike Hein <[email protected]> -Date: Wed, 21 Jun 2017 06:36:26 +0900 -Subject: Don't commit on focus loss. - ---- - src/irc/channel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp -index a431c80..a5c313e 100644 ---- a/src/irc/channel.cpp -+++ b/src/irc/channel.cpp -@@ -292,7 +292,7 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent) - connect(nicknameCombobox,SIGNAL (activated(int)),this,SLOT(nicknameComboboxChanged())); - - if(nicknameCombobox->lineEdit()) -- connect(nicknameCombobox->lineEdit(), SIGNAL (editingFinished()),this,SLOT(nicknameComboboxChanged())); -+ connect(nicknameCombobox->lineEdit(), SIGNAL (returnPressed()),this,SLOT(nicknameComboboxChanged())); - - - connect(&userhostTimer,SIGNAL (timeout()),this,SLOT (autoUserhost())); --- -cgit v0.11.2 - diff --git a/net-irc/konversation/files/konversation-1.7.2-memleak.patch b/net-irc/konversation/files/konversation-1.7.2-memleak.patch deleted file mode 100644 index c079809f0c6..00000000000 --- a/net-irc/konversation/files/konversation-1.7.2-memleak.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cb2c91f06bc9247520474372d163bd0520f4db42 Mon Sep 17 00:00:00 2001 -From: Gun Park <[email protected]> -Date: Mon, 10 Jul 2017 16:59:28 +0900 -Subject: Fix memory leak - -Reviewers: hein - -Reviewed By: hein - -Differential Revision: https://phabricator.kde.org/D6580 ---- - src/viewer/viewcontainer.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp -index 31ff633..94d498e 100644 ---- a/src/viewer/viewcontainer.cpp -+++ b/src/viewer/viewcontainer.cpp -@@ -2786,9 +2786,8 @@ void ViewContainer::showJoinChannelDialog() - if (dlg->exec() == QDialog::Accepted) - { - Server *server = Application::instance()->getConnectionManager()->getServerByConnectionId(dlg->connectionId()); -- if (!server) -- return; -- server->sendJoinCommand(dlg->channel(), dlg->password()); -+ if (server) -+ server->sendJoinCommand(dlg->channel(), dlg->password()); - } - delete dlg; - } --- -cgit v0.11.2 - diff --git a/net-irc/konversation/konversation-1.7.2-r1.ebuild b/net-irc/konversation/konversation-1.7.2-r1.ebuild deleted file mode 100644 index 3831ca13839..00000000000 --- a/net-irc/konversation/konversation-1.7.2-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="A user friendly IRC Client" -HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"; -SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 x86" -IUSE="+crypt" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - sys-devel/gettext - crypt? ( app-crypt/qca:2[qt5] ) -" -RDEPEND="${DEPEND} - !net-irc/konversation:4 - crypt? ( app-crypt/qca:2[ssl] ) -" - -PATCHES=( - "${FILESDIR}/${P}-extjoin-crash.patch" - "${FILESDIR}/${P}-memleak.patch" - "${FILESDIR}/${P}-focus.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Qca-qt5) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # Bug 616162 - insinto /etc/xdg - doins "${FILESDIR}"/konversationrc -} diff --git a/net-irc/konversation/konversation-1.7.2.ebuild b/net-irc/konversation/konversation-1.7.2.ebuild deleted file mode 100644 index bedb2f5c384..00000000000 --- a/net-irc/konversation/konversation-1.7.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="A user friendly IRC Client" -HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"; -SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+crypt" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - sys-devel/gettext - crypt? ( app-crypt/qca:2[qt5] ) -" -RDEPEND="${DEPEND} - !net-irc/konversation:4 - crypt? ( app-crypt/qca:2[ssl] ) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Qca-qt5) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # Bug 616162 - insinto /etc/xdg - doins "${FILESDIR}"/konversationrc -}
