diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-12 19:54:34 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-17 18:39:11 +0200 |
commit | f84fcbb5131013f9494b9024ec746f68fcbdad36 (patch) | |
tree | da178f10e9e2b088c9d74fc6cbdbf0b2409e9e63 /kde-apps/kmail | |
parent | profiles: Mask legacy KDE Applications for removal (diff) | |
download | gentoo-f84fcbb5131013f9494b9024ec746f68fcbdad36.tar.gz gentoo-f84fcbb5131013f9494b9024ec746f68fcbdad36.tar.bz2 gentoo-f84fcbb5131013f9494b9024ec746f68fcbdad36.zip |
kde-apps: Drop KDE Applications 16.12.3, KDE PIM 4.14.11* and more old
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'kde-apps/kmail')
-rw-r--r-- | kde-apps/kmail/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch | 89 | ||||
-rw-r--r-- | kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild | 107 |
3 files changed, 0 insertions, 197 deletions
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest index 9ac02e660c01..85b15096f124 100644 --- a/kde-apps/kmail/Manifest +++ b/kde-apps/kmail/Manifest @@ -1,3 +1,2 @@ -DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a DIST kmail-17.04.3.tar.xz 4374744 SHA256 ab5bf6a5ca881b2286a5eee48d2a496cda7d82752d811c078510a286e6dc8356 SHA512 73e88d622cd68c27b087ed388109020dee1364acf702230a2e1e40ceb185afeede2dc7ab1c28338ab3b88a8046836ab66f278932e14cef09472fd7472fb5fa9f WHIRLPOOL 35064cb09a7b4475df9606df3a3590581096656997be5c83c3593ef631656e3474d8551b6b58073cdf526dbbb121b94f0ab7bac528edde7731d6ec9125c97a28 diff --git a/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch b/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch deleted file mode 100644 index e36e074e0b27..000000000000 --- a/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c54706e990bbd6498e7b1597ec7900bc809e8197 Mon Sep 17 00:00:00 2001 -From: Montel Laurent <montel@kde.org> -Date: Fri, 2 Jun 2017 13:56:41 +0200 -Subject: Make sure to sign/encrypt message when we send later - -(cherry picked from commit 4048f5e46d0a7d62d93d74fd2861dd70fb2ad660) ---- - messagecomposer/composer/composerviewbase.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp -=================================================================== ---- kdepim-4.14.10.orig/messagecomposer/composer/composerviewbase.cpp -+++ kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp -@@ -435,7 +435,7 @@ void MessageComposer::ComposerViewBase:: - // if so, we create a composer per format - // if we aren't signing or encrypting, this just returns a single empty message - bool wasCanceled = false; -- if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone ) { -+ if( m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone && !mSendLaterInfo) { - MessageComposer::Composer* composer = new MessageComposer::Composer; - composer->setNoCrypto( true ); - m_composers.append( composer ); -From 78c5552be2f00a4ac25bd77ca39386522fca70a8 Mon Sep 17 00:00:00 2001 -From: Montel Laurent <montel@kde.org> -Date: Fri, 2 Jun 2017 13:59:02 +0200 -Subject: Make sure that we use plugin when we use sendlater feature - ---- - src/editor/kmcomposewin.cpp | 9 +++++---- - src/editor/kmcomposewin.h | 3 ++- - 2 files changed, 7 insertions(+), 5 deletions(-) - -Index: kdepim-4.14.10/kmail/editor/kmcomposewin.cpp -=================================================================== ---- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.cpp -+++ kdepim-4.14.10/kmail/editor/kmcomposewin.cpp -@@ -2533,7 +2533,7 @@ void KMComposeWin::printComposeResult( K - - - void KMComposeWin::doSend( MessageComposer::MessageSender::SendMethod method, -- MessageComposer::MessageSender::SaveIn saveIn ) -+ MessageComposer::MessageSender::SaveIn saveIn, bool willSendItWithoutReediting ) - { - if ( mStorageService->numProgressUpdateFile() > 0) { - KMessageBox::sorry( this, i18np( "There is %1 file upload in progress.", -@@ -2549,7 +2549,7 @@ void KMComposeWin::doSend( MessageCompos - } - - -- if ( saveIn == MessageComposer::MessageSender::SaveInNone ) { // don't save as draft or template, send immediately -+ if ( saveIn == MessageComposer::MessageSender::SaveInNone || willSendItWithoutReediting ) { // don't save as draft or template, send immediately - if ( KPIMUtils::firstEmailAddress( from() ).isEmpty() ) { - if ( !( mShowHeaders & HDR_FROM ) ) { - mShowHeaders |= HDR_FROM; -@@ -2716,6 +2716,7 @@ void KMComposeWin::slotSendLater() - return; - if ( !checkRecipientNumber() ) - return; -+ mComposerBase->setSendLaterInfo(NULL); - if ( mComposerBase->editor()->checkExternalEditorFinished() ) { - const bool wasRegistered = (SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled()); - if (wasRegistered) { -@@ -2739,9 +2740,9 @@ void KMComposeWin::slotSendLater() - { - mComposerBase->setSendLaterInfo(info); - if (info->isRecurrence()) { -- doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates ); -+ doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true ); - } else { -- doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts ); -+ doSend( MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true ); - } - break; - } -Index: kdepim-4.14.10/kmail/editor/kmcomposewin.h -=================================================================== ---- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.h -+++ kdepim-4.14.10/kmail/editor/kmcomposewin.h -@@ -549,7 +549,8 @@ private: - * Send the message. - */ - void doSend( MessageComposer::MessageSender::SendMethod method=MessageComposer::MessageSender::SendDefault, -- MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone ); -+ MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone, -+ bool willSendItWithoutReediting = false); - - void doDelayedSend( MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn ); - diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild deleted file mode 100644 index 573550720df3..000000000000 --- a/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -VIRTUALX_REQUIRED="test" -WEBKIT_REQUIRED="always" -inherit flag-o-matic kde4-meta - -DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." -HOMEPAGE="https://www.kde.org/applications/internet/kmail/" - -KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611) - $(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611) - $(add_kdeapps_dep korganizer) -" -RDEPEND="${DEPEND}" - -RESTRICT="test" -# bug 393147 - -KMEXTRACTONLY=" - agents/folderarchiveagent.desktop - agents/sendlateragent/ - akonadi_next/ - calendarviews/ - grantleeeditor/grantleethemeeditor/ - kdgantt2/ - korganizer/ - kresources/ - libkdepimdbusinterfaces/ - libkleo/ - libkpgp/ -" -KMCOMPILEONLY=" - calendarsupport/ - grantleetheme/ - incidenceeditor-ng/ - kaddressbookgrantlee/ - mailcommon/ - mailimporter/ - messagecomposer/ - messagecore/ - messagelist/ - messageviewer/ - mailcommon/ - mailimporter/ - noteshared/ - pimcommon/ - templateparser/ -" -KMEXTRA=" - agents/archivemailagent/ - agents/followupreminderagent/ - agents/mailfilteragent/ - grantleeeditor/headerthemeeditor/ - importwizard/ - kmailcvt/ - ksendemail/ - libksieve/ - mboximporter/ - pimsettingexporter/ - plugins/messageviewer/ -" - -KMLOADLIBS="kdepim-common-libs" - -PATCHES=( "${FILESDIR}/${P}-CVE-2017-9604.patch" ) - -src_compile() { - kde4-meta_src_compile kmail_xml - kde4-meta_src_compile -} - -pkg_postinst() { - kde4-meta_pkg_postinst - - if ! has_version kde-apps/kdepim-kresources:${SLOT}; then - echo - elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}" - echo - fi - if ! has_version kde-apps/kleopatra:${SLOT}; then - echo - elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}" - echo - fi - - if has_version "kde-apps/akonadi[sqlite]"; then - ewarn - ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your" - ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite" - ewarn "backend anymore." - if has_version "kde-apps/akonadi[-mysql]"; then - ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED." - fi - ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." - ewarn - fi -} |