From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- mail-client/trojita/Manifest | 3 +- .../files/trojita-0.7-crash-w-attachments.patch | 68 ++++++++++++++++ mail-client/trojita/trojita-0.7-r5.ebuild | 89 --------------------- mail-client/trojita/trojita-0.7-r6.ebuild | 90 ++++++++++++++++++++++ 4 files changed, 160 insertions(+), 90 deletions(-) create mode 100644 mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch delete mode 100644 mail-client/trojita/trojita-0.7-r5.ebuild create mode 100644 mail-client/trojita/trojita-0.7-r6.ebuild (limited to 'mail-client/trojita') diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest index 1d689bca1b50..bd984341b61c 100644 --- a/mail-client/trojita/Manifest +++ b/mail-client/trojita/Manifest @@ -1,6 +1,7 @@ AUX trojita-0.7-CVE-2019-10734.patch 4701 BLAKE2B d7c41789e57fcab16f616702d427bffce348376f0d9fc16fc02c37257409a819bc2d157652e5671a6a2c6f7b06b64b325b3f08d8977654cf52028f7cda25f2dd SHA512 db96a566924b5d7b80787ab624af3726d5dd3459653192436a377d6482ab73801a7dcca1df1b1d937cf0d0798b827e04f8ef2c1124f91dc9da3e8036ef61e28a AUX trojita-0.7-CVE-2020-15047.patch 3286 BLAKE2B 4cccc6eb6ad6826f176c19d8fd2cc1c23c661b222d8e884bd45ee700d8db856b45d76f90ad387bdd2b3996c3f97af89f60bd9b44c3bf4e8456a607b4f3c1e91f SHA512 82ed94860b8e71b66093548535cd5970dc28bbc5c023cb73e0474bfe33e49f889d08c095536cbda6242e260b742c59a7ada7a0a003bb4f6302f3e547da52cd48 AUX trojita-0.7-cmake-cxx11.patch 2442 BLAKE2B ce2f29c96c93f254ccade934cfa6ad38f863c5e6b30cb9c45e92c6299a10e28a58a32a0515fe122e5beee0f82b154f9421519a6a211e6b9a3b6d1238ce09dd08 SHA512 2b2723be49d097fb1ca9d51ecbb30d2a4b3e766edc232eb8cc25b537f32c0dd0b8aeb24c3ae3b38929775f31262e36a0ba078e335076cab9b20d5ac8b41c0e60 +AUX trojita-0.7-crash-w-attachments.patch 3759 BLAKE2B 7542a8393f19573cd944c8fc36d92d319bd31390ecb92b557df876363c5ade88b59381fc24b561df23420bad43fa778ea6e5fcc1b33ce9cf48eaefb7aae8f49c SHA512 714b6d3b8a791783039f51d98b5d14b2b01ec3228993500623c980c09d04c38e6f26d236efa7fc722d68cd72692b646e5c4b2ca13d3d9b342e2072afb466ded0 AUX trojita-0.7-desktop-spec-namespace.patch 2982 BLAKE2B feb83e5e2f3499973ce7c1a7401447d1c78969fc5072a58b6f55056e9105c61949f2b270eb564c2d036e7ccaeb357531a3ce4ab46c228b5d37b2e1548e73bf15 SHA512 7b3e89c5c889b61e3074923eec6d7365908ff2641730a12cbccc235859733770e120029a7f2e3a395317120fc45556ad3cbbc11c2d6e3cd2a06bd1d7abb93534 AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d83374b7d509dbd8b39e7a12f6f8b14b86c6405ea55882192601163cee9eadaf9ab306bfbdcae347857bf4dc2f3c5908a SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1 @@ -9,6 +10,6 @@ AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40 AUX trojita-0.7-qt-5.13.patch 1044 BLAKE2B 4c110d49c9352f526470b2af255c98c8f8b80df0ddc6da5a8fdecee9a1d5000c473a17f64790ffa95e20f03431ddb7fc294bb1e20d11fd549ca4451bb030ebba SHA512 bce7713fb5bef29b2b189d281dee57ddfc57f1c0601f424aba2185668215878b9bfd3bb80f0d2f8b73219e782db5e64973e79190fe62afa8ba98327535139146 AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82b7d792f167783857e8544f29f0a29284923a9b5f2974a5dbf8b9b3e6147c14654d78a57b67b8151407a63863b6 SHA512 42d45246c49ae99d9a49ed2c2186042427c8ea35b84123c876951f1d9ddcf9236acd14fd36e592041296ca6f6200e20eca786c967dade37bf8be8148dd7b3cca DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 -EBUILD trojita-0.7-r5.ebuild 2077 BLAKE2B 786ee921fdecc4da2eca6790ee7119b1ccd966d867353c522cdc26ec75db065f9bb0567811b823b09d26bc4e2a60dd3de2c430c68ac38bd8508eb675464531aa SHA512 bdc62843ececb61eb30726cd1f35a5fec5406f0c1e34d95977605b7c69d3ef0a26b77d369019ea84486ec843a18c86c415e31605eb4fec81c8909df05aa04c72 +EBUILD trojita-0.7-r6.ebuild 2140 BLAKE2B 922d98c9a52bd7f65e572898eb8015daf08eeb791600b9baded7cc316fc05362ac8b646c872e3477516d60686d1a1d480f4f44d69bcf7d94278fbfe911f71b71 SHA512 61fa729de435589b39d61fb7faba570ef2422fb502960ce742eea41f6853c89020afcef918dcb00820fdb0c38610f68948601feb7910a543d37f4bb39456288e EBUILD trojita-9999.ebuild 1842 BLAKE2B 80189d12128508e5cfbb520fe3ca38f05c27966e5b4448037d638b2001cd326e5cbce94999a599b19ce55a2a30d9b23926108a0138d96e7ae89b0586ce1b6726 SHA512 1ca293cafab7231724698f14cce7304d63fe4ba06ad9b963361f0a52de3da04d16df6b8f0f7775c40666a9a607e42825ad698c3e73f1bed0db94db50921a927a MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633 diff --git a/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch b/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch new file mode 100644 index 000000000000..38d11316e5ef --- /dev/null +++ b/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch @@ -0,0 +1,68 @@ +From cf2364b80fa8ae844df8350cd5833d47cce235f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= +Date: Mon, 9 Mar 2020 08:24:48 -0700 +Subject: [PATCH] Fix possible crash when downloading attachments + +Turns out we've been happily deleting network replies from the +QNetworkReply::finished(). That was never a good thing to do, but it did +not use to crash with older Qt. Now it does. + +After changing to deleteLater(), there's a window for +already-deregistered replies to generate events, therefore the assert +has to go, too, otherwise Bad Things happen: + + (gdb) bt + #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 + #1 0x00007ffff16bdcd2 in __GI_abort () at abort.c:89 + #2 0x00007ffff2400bcb in qt_message_fatal (context=..., message=...) at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:1904 + #3 QMessageLogger::fatal (this=this@entry=0x7fffffffc990, msg=msg@entry=0x7ffff2690b10 "ASSERT: \"%s\" in file %s, line %d") at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:888 + #4 0x00007ffff23fff7c in qt_assert (assertion=assertion@entry=0x5555558451d7 "reply", file=file@entry=0x555555841a38 "/home/jkt/work/prog/trojita/src/Imap/Network/FileDownloadManager.cpp", line=line@entry=142) + at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qglobal.cpp:3247 + #5 0x00005555555da840 in Imap::Network::FileDownloadManager::onPartDataTransfered (this=0x555556a20990) + #6 0x00007ffff25f1bdf in QtPrivate::QSlotObjectBase::call (a=0x7fffffffcaa0, r=0x555556a20990, this=0x5555569f99c0) at ../../include/QtCore/../../../qtcore-5.13.9999/src/corelib/kernel/qobjectdefs_impl.h:394 + #7 QMetaObject::activate(QObject*, int, int, void**) () at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3787 + #8 0x00007ffff25f20b7 in QMetaObject::activate (sender=sender@entry=0x555556a21370, m=m@entry=0x7ffff3f96b00 , local_signal_index=local_signal_index@entry=1, argv=argv@entry=0x0) + at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3658 + #9 0x00007ffff3d3cbf3 in QNetworkReply::finished (this=this@entry=0x555556a21370) at .moc/moc_qnetworkreply.cpp:385 + #10 0x0000555555709485 in Imap::Network::MsgPartNetworkReply::slotMyDataChanged() () at /home/jkt/work/prog/trojita/src/Imap/Network/MsgPartNetworkReply.cpp:112 + +BUG: 417697 +Reported-by: Stefan de Konink +Change-Id: I79f340c5a471430a14474472513d0a055c7238d6 +--- + src/Imap/Network/FileDownloadManager.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/Imap/Network/FileDownloadManager.cpp b/src/Imap/Network/FileDownloadManager.cpp +index 16b6c8df..c3f72176 100644 +--- a/src/Imap/Network/FileDownloadManager.cpp ++++ b/src/Imap/Network/FileDownloadManager.cpp +@@ -139,7 +139,9 @@ void FileDownloadManager::downloadMessage() + + void FileDownloadManager::onPartDataTransfered() + { +- Q_ASSERT(reply); ++ if (!reply) { ++ return; ++ } + if (reply->error() == QNetworkReply::NoError) { + if (!saving.open(QIODevice::WriteOnly)) { + emit transferError(saving.errorString()); +@@ -192,11 +194,11 @@ void FileDownloadManager::onCombinerTransferError(const QString &message) + + void FileDownloadManager::deleteReply(QNetworkReply *reply) + { +- if (reply == this->reply) { ++ if (reply && reply == this->reply) { + if (!saved) + onPartDataTransfered(); +- delete reply; +- this->reply = 0; ++ reply->deleteLater(); ++ this->reply = nullptr; + } + } + +-- +GitLab + diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild b/mail-client/trojita/trojita-0.7-r5.ebuild deleted file mode 100644 index f7b60c366360..000000000000 --- a/mail-client/trojita/trojita-0.7-r5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://anongit.kde.org/${PN}.git" - inherit git-r3 -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi -inherit cmake virtualx xdg - -DESCRIPTION="A Qt IMAP e-mail client" -HOMEPAGE="http://trojita.flaska.net/" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -IUSE="+crypt +dbus debug +password test +zlib" - -REQUIRED_USE="password? ( dbus )" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - zlib? ( virtual/pkgconfig ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - crypt? ( - >=app-crypt/gpgme-1.8.0[cxx,qt5] - dev-libs/mimetic - ) - dbus? ( dev-qt/qtdbus:5 ) - password? ( dev-libs/qtkeychain[qt5(+)] ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -DOCS=( README LICENSE ) - -PATCHES=( - "${FILESDIR}/${P}-gpgme.patch" - "${FILESDIR}/${P}-gpg-tests.patch" - "${FILESDIR}/${P}-qt-5.11b3.patch" - "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058 - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697 - "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596 - "${FILESDIR}/${P}-cmake-cxx11.patch" - "${FILESDIR}/${P}-desktop-spec-namespace.patch" - "${FILESDIR}/${P}-metainfo.patch" # bug 730140 -) - -src_prepare() { - cmake_src_prepare - - # the build system is taking a look at `git describe ... --dirty` and - # gentoo's modifications to CMakeLists.txt break these - sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check" -} - -src_configure() { - local mycmakeargs=( - -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7 - -DWITH_CRYPTO_MESSAGES=$(usex crypt) - -DWITH_GPGMEPP=$(usex crypt) - -DWITH_MIMETIC=$(usex crypt) - -DWITH_DBUS=$(usex dbus) - -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) - -DWITH_TESTS=$(usex test) - -DWITH_ZLIB=$(usex zlib) - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/mail-client/trojita/trojita-0.7-r6.ebuild b/mail-client/trojita/trojita-0.7-r6.ebuild new file mode 100644 index 000000000000..7c1b4c0b6fac --- /dev/null +++ b/mail-client/trojita/trojita-0.7-r6.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://anongit.kde.org/${PN}.git" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + KEYWORDS="amd64 x86" +fi +inherit cmake virtualx xdg + +DESCRIPTION="A Qt IMAP e-mail client" +HOMEPAGE="http://trojita.flaska.net/" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +IUSE="+crypt +dbus debug +password test +zlib" + +REQUIRED_USE="password? ( dbus )" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-qt/linguist-tools:5 + zlib? ( virtual/pkgconfig ) +" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + crypt? ( + >=app-crypt/gpgme-1.8.0[cxx,qt5] + dev-libs/mimetic + ) + dbus? ( dev-qt/qtdbus:5 ) + password? ( dev-libs/qtkeychain[qt5(+)] ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +DOCS=( README LICENSE ) + +PATCHES=( + "${FILESDIR}/${P}-gpgme.patch" + "${FILESDIR}/${P}-gpg-tests.patch" + "${FILESDIR}/${P}-qt-5.11b3.patch" + "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058 + "${FILESDIR}/${P}-qt-5.15.patch" + "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697 + "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596 + "${FILESDIR}/${P}-cmake-cxx11.patch" + "${FILESDIR}/${P}-desktop-spec-namespace.patch" + "${FILESDIR}/${P}-metainfo.patch" # bug 730140 + "${FILESDIR}/${P}-crash-w-attachments.patch" # KDE-Bug 417697 +) + +src_prepare() { + cmake_src_prepare + + # the build system is taking a look at `git describe ... --dirty` and + # gentoo's modifications to CMakeLists.txt break these + sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check" +} + +src_configure() { + local mycmakeargs=( + -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7 + -DWITH_CRYPTO_MESSAGES=$(usex crypt) + -DWITH_GPGMEPP=$(usex crypt) + -DWITH_MIMETIC=$(usex crypt) + -DWITH_DBUS=$(usex dbus) + -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) + -DWITH_TESTS=$(usex test) + -DWITH_ZLIB=$(usex zlib) + ) + + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} -- cgit v1.2.3