gentoo resync : 09.06.2018

15 files changed, 348 insertions, 7 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 465c8a555b7a..33e9620d3662 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index b7d44a79d5cd..d2ad8e47ece1 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 EBUILD breeze-icons-rcc-5.43.0.ebuild 569 BLAKE2B 21e3a83934e04a4de03a5198e2a7d3b217ee5d7cdaf1d4008f8dce29f84de8635652cadd3b60c9a542ab2434d5d65afd815bb757ce0cd88df8be115a78731db7 SHA512 3760d506222833bf904edf51b5aa6b334ecfff3b94b7e072df45203e5fed0dfb8d57b8d43f7af19d697cc9b6761f766647386e654df9c9cc630665f1f6253200
-EBUILD breeze-icons-rcc-5.46.0.ebuild 571 BLAKE2B 478ba0537ce2a381e9fe24e461525419e8aa35b11b79d250848094bb5c06441b332139827e8521235f70fa524bd256a5d8f8863f45dbad2618a47e469d10cd2f SHA512 3ae8d5969305e5e99256102a67d41571bfab241166a1e707a40b6f0502f1154b01d12e006b2b8c04948fc742a85e74a663cd7e35fafef8886e9c15b3793e97c4
+EBUILD breeze-icons-rcc-5.46.0.ebuild 660 BLAKE2B 11217b620b6d8009ceed8a38564b961c4bdc11d6a76c268ab836ac8ee124835aaa6911fe2423c370fe3a2493538a2d81f585e1521c6a5670f3fb20c0648cd64a SHA512 8b6e0735eadb1be833ff24f974a7075cd10c13cb4350e7c7276af1568e9f82f74ae5576800786cba2fb535c1c799c800d25c6421097e238ec1c9de4c9f8aae82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
index 93736a98856c..86f1e24841b4 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
@@ -31,3 +31,12 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 39f2fe8544f3..e6bbddf89b23 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
 EBUILD breeze-icons-5.43.0.ebuild 525 BLAKE2B ddbd3095dab5fd24de2a4d1cc6e3335471653ea002c6cdd764c89118a0ae04a3a691a52e08982549d5017f68ff673e8a7f152f3a80f314c2201699a8f9bab8dd SHA512 465183143eff6527be88bbe1ea2b56c59ed75227dc89531d22b735cbe02ab2bd0ff1e4e71a0721356b6cf5c958688d264b17943b49e4364cb10db03beb0d24c3
-EBUILD breeze-icons-5.46.0.ebuild 527 BLAKE2B 14f6ee3048dd35f588990049657065f814f45fd07532932d7f610762e6d3494b8f89c737f285568ddb7ef96068fb35a890d97658bd051cfc953a59a988f2eceb SHA512 c21b69fa244a2da927b7e9dc9eea75427b53f746b02299290f5a581c2533d3073eeed62f704c01806046e27d68afa9f2acf5bfa3c0fc91c1e93b0f0bb4d73288
+EBUILD breeze-icons-5.46.0.ebuild 622 BLAKE2B 2474feab406f40bc12ada0ae7f9e6d4678e25a5d295096c7388380377e45e3b357c2bca77b5203ca01175f4dce46c64356466fa75e4387c3e9d579d69228c7bd SHA512 ea72e1e19649291bb51174b308388ddcf3db0db8341907500292d572e57ef13ab5d6a666af338212212d17a7dd54120878586a31136a400bcc3b80730977f2e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
index 137584fea4d7..fad25ff406bb 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
@@ -29,3 +29,13 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-j1
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index b069bb046e2a..3d90416f729a 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,6 @@
+AUX kcoreaddons-5.46.0-kformattest.patch 3537 BLAKE2B 8f662df8a950c6cd102dc18c67c18628ac1318d1a76a076af08e0e7d6dc7aa92b502196d209b0e544c67ab83bd6cfa6b86098f305b9bbd8f10cd7f6cfdab9d6b SHA512 8cd914a542f5ba35857f8378b28413649fe27761d4a000589972b8ec25d1effda8e4f7d9e07c04f9e168af1d892051b263b8b61da42cb6b7be6a7643c2c31729
 DIST kcoreaddons-5.43.0.tar.xz 355784 BLAKE2B dd76abee04ba0e3772b1e1c8b03192ad3ae2768e1ef54059cffdf0fbac5e1d75d31495951ebf37470823121b4dfef9dca19246c44ba31b2751589820361e1607 SHA512 895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b
 DIST kcoreaddons-5.46.0.tar.xz 350224 BLAKE2B dee0f20b3f35a1f787f263e080a0e4641222b4a9e7f3a8eca736b97a4688ecfa30f26c3040cb655bdb47852381a6810dec712f8a426181bb24b680270a41e6bb SHA512 3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a
 EBUILD kcoreaddons-5.43.0.ebuild 729 BLAKE2B 37c862eae2a91b817843435b50c3d90db529584f05b38dea876173dadda8721ad691fd83e5cb05d283d2a6541b12d7f28cab6438f9b35126ab8a71fb091b991a SHA512 22cf03b4cdd444a1829584a84efe5984caf8cd5aeb31c4b249173bfc19d91f448e20da2366eab5c94c8a2375af35e73cdcea3afcba1ef2cc1d0fb85abf82ab88
-EBUILD kcoreaddons-5.46.0.ebuild 731 BLAKE2B 055f5add0ea3bfd79aa2955aabeb9ea891a82715cf9611884ae07e13ec4ca4f5d8d94e141e91423add3a4d35db2025da22d57b16300b7ca996c20927f28071a3 SHA512 a0559e6e94b565853bba672dbacbdf961fe43f938ad3add4d0dac9b95a6bb5759a2c66bd5e71fb41aa0476bcedfeb6479063e123407d872b6d58b76301776eec
+EBUILD kcoreaddons-5.46.0.ebuild 873 BLAKE2B 3c0480db378ae21111958c90e7b096f038edce33a9843cc0c64910badae73a3e9add9ba7595bfb39cd79bb5027f3456cd17470ba50df56a8c5fcb613f175b788 SHA512 92e14d36fa59ac9d58dc81458ec919e2da2a418990c59c9f82181548c768688e846d386ea63d2429a4a3fcc3be4de761fe011ecbcdcc57cf0c327aecac822b2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
new file mode 100644
index 000000000000..64031659fdda
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.46.0-kformattest.patch
@@ -0,0 +1,56 @@
+From: Maximiliano Curia <maxy@gnuservers.com.ar>
+Date: Tue, 15 May 2018 13:06:53 +0200
+Subject: fix kformattest plural forms
+
+---
+ autotests/kformattest.cpp | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp
+index 15080be..6cc3c52 100644
+--- a/autotests/kformattest.cpp
++++ b/autotests/kformattest.cpp
+@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)"));
+-    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)"));
++    QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds"));
++    QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds"));
+     QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes"));
+@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration()
+ {
+     KFormat format(QLocale::c());
+ 
+-    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)"));
+-    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)"));
++    QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second"));
++    QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds"));
++    QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute"));
++    QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes"));
++    QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour"));
++    QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours"));
++    QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds"));
+     // Problematic case #1 (there is a reference to this case on kformat.cpp)
+-    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes"));
+     // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is
+     // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there
+     // are hours in scene.
+-    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)"));
++    QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes"));
+     // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration
+     // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result.
+-    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)"));
++    QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour"));
+ }
+ 
+ void KFormatTest::formatRelativeDate()
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
index 4e70e58a430e..1848371366c2 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.46.0.ebuild
@@ -19,6 +19,14 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 
+src_prepare() {
+	# bug 650280
+	has_version '<dev-qt/qtcore-5.10.0:5' && \
+		eapply "${FILESDIR}/${P}-kformattest.patch"
+
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-D_KDE4_DEFAULT_HOME_POSTFIX=4
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 796a272b9dda..68ca6b2761eb 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,7 @@
+AUX ktexteditor-5.46.0-CVE-2018-10361.patch 6579 BLAKE2B 9e992f2fc416cf51b30476df46f290069d490c22c09f5f0a7d790789163f1269373c607260ed638c62984cf405944ebd7a36b564ef6d80603827a3f23c4c5662 SHA512 c67557557e8eea7c74426df333301c8e8db6af7d892e7a8aff7e545b450155253b47eabc3a1baeb669e7e34539615d8f8cdf99e4b199204a4decb9962b11b423
 DIST ktexteditor-5.43.0.tar.xz 2302580 BLAKE2B 458e60148b02f59dd2da11a865bb11386b38a483493b3e7cd95b2f9edef4d8b90c03e453a37411f64e70ea66a81f486bba934111ae9e8d1361c1b38e6e7ed69b SHA512 fc2b3b69224e62d1bf240410fa5c3dab04e020f210230474e5e924c7125f626cd2dd30dee449948cb9197adc8f0d6e1886ed85e03312a51d116d86fc13fbf08d
 DIST ktexteditor-5.46.0.tar.xz 2296888 BLAKE2B 45572ff487505c38f6dfa23b96bd84ba83292ae1077bf3615fc2d30aaf6aa0347605a7c2ae4df68cc92552c1ecd8060ce1ba44f11bc78cfe736149476d6af5ab SHA512 b0197a82e9489c4093594c68a6c21dc9e204ec78cd17e5a0117d84e501710d90ad06214ed217332279f3b67ae84119d09d6eb19e33b37b7bde2ebb8a07b6a543
 EBUILD ktexteditor-5.43.0.ebuild 1425 BLAKE2B 00eeb14ac463fc23b391229bb4bf605b9c12c0e91fbdb81773f7bb0bdab0ec3836b0463c43beed8146431b14b28ffb73a456b192c27fdebdecca86da57dd073e SHA512 ba454c8d95abc15b5f746f63bf175b83991c46dccf54117b9769820341fa400ee35dc0bf54d3a7cced63deec5daa3cb49ba55751a7461e48adb7edd89a88abe8
+EBUILD ktexteditor-5.46.0-r1.ebuild 1480 BLAKE2B 4b75e3a34ae782e26e53bc636aef5b0d71b4b54c129239120205bca4db3f1ffca5b4635a473032a486e3948cac1edb9f9860ad6a4df9c7debc89b5b6603e226c SHA512 c857d1bc43c348c825224c4ab05aa1efdc0d19da91580fb95fc8550967014662a8a3de6d5d62bc0bf001b4a95a0e04ba3865234e64f8c57c91fba1f8d3b7bc0d
 EBUILD ktexteditor-5.46.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
new file mode 100644
index 000000000000..d3b9b5d480ac
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
@@ -0,0 +1,187 @@
+From c81af5aa1d4f6e0f8c44b2e85ca007ba2a1e4590 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 7 Jun 2018 16:12:25 +0200
+Subject: CVE-2018-10361: privilege escalation
+
+improve handling of temporary file to avoid possible race-condition
+
+Differential Revision: https://phabricator.kde.org/D12513
+---
+ src/buffer/katesecuretextbuffer.cpp | 99 +++++++++++++++++--------------------
+ src/buffer/katesecuretextbuffer_p.h |  4 --
+ 2 files changed, 46 insertions(+), 57 deletions(-)
+
+diff --git a/src/buffer/katesecuretextbuffer.cpp b/src/buffer/katesecuretextbuffer.cpp
+index 0647bee..c014608 100644
+--- a/src/buffer/katesecuretextbuffer.cpp
++++ b/src/buffer/katesecuretextbuffer.cpp
+@@ -53,39 +53,37 @@ ActionReply SecureTextBuffer::savefile(const QVariantMap &args)
+ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString &targetFile,
+                                         const QByteArray &checksum, const uint ownerId, const uint groupId)
+ {
+-    QFileInfo targetFileInfo(targetFile);
+-    if (!QDir::setCurrent(targetFileInfo.dir().path())) {
++    /**
++     * open source file for reading
++     * if not possible, signal error
++     */
++    QFile readFile(sourceFile);
++    if (!readFile.open(QIODevice::ReadOnly)) {
+         return false;
+     }
+ 
+-    // get information about target file
+-    const QString targetFileName = targetFileInfo.fileName();
+-    targetFileInfo.setFile(targetFileName);
+-    const bool newFile = !targetFileInfo.exists();
+-
+-    // open source and target file
+-    QFile readFile(sourceFile);
+-    //TODO use QSaveFile for saving contents and automatic atomic move on commit() when QSaveFile's security problem
+-    // (default temporary file permissions) is fixed
+-    //
+-    // We will first generate temporary filename and then use it relatively to prevent an attacker
+-    // to trick us to write contents to a different file by changing underlying directory.
+-    QTemporaryFile tempFile(targetFileName);
++    /**
++     * construct file info for target file
++     * we need to know things like path/exists/permissions
++     */
++    const QFileInfo targetFileInfo(targetFile);
++
++    /**
++     * create temporary file in current directory to be able to later do an atomic rename
++     * we need to pass full path, else QTemporaryFile uses the temporary directory
++     * if not possible, signal error, this catches e.g. a non-existing target directory, too
++     */
++    QTemporaryFile tempFile(targetFileInfo.absolutePath() + QStringLiteral("/secureXXXXXX"));
+     if (!tempFile.open()) {
+         return false;
+     }
+-    tempFile.close();
+-    QString tempFileName = QFileInfo(tempFile).fileName();
+-    tempFile.setFileName(tempFileName);
+-    if (!readFile.open(QIODevice::ReadOnly) || !tempFile.open()) {
+-        return false;
+-    }
+-    const int tempFileDescriptor = tempFile.handle();
+ 
+-    // prepare checksum maker
++    /**
++     * copy contents + do checksumming
++     * if not possible, signal error
++     */
+     QCryptographicHash cryptographicHash(checksumAlgorithm);
+-
+-    // copy contents
++    const qint64 bufferLength = 4096;
+     char buffer[bufferLength];
+     qint64 read = -1;
+     while ((read = readFile.read(buffer, bufferLength)) > 0) {
+@@ -95,30 +93,43 @@ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString
+         }
+     }
+ 
+-    // check that copying was successful and checksum matched
+-    QByteArray localChecksum = cryptographicHash.result();
+-    if (read == -1 || localChecksum != checksum || !tempFile.flush()) {
++    /**
++     * check that copying was successful and checksum matched
++     * we need to flush the file, as QTemporaryFile keeps the handle open
++     * and we later do things like renaming of the file!
++     * if not possible, signal error
++     */
++    if ((read == -1) || (cryptographicHash.result() != checksum) || !tempFile.flush()) {
+         return false;
+     }
+ 
+-    tempFile.close();
+-
+-    if (newFile) {
++    /**
++     * try to preserve the permissions
++     */
++    if (!targetFileInfo.exists()) {
+         // ensure new file is readable by anyone
+         tempFile.setPermissions(tempFile.permissions() | QFile::Permission::ReadGroup | QFile::Permission::ReadOther);
+     } else {
+         // ensure the same file permissions
+         tempFile.setPermissions(targetFileInfo.permissions());
++
+         // ensure file has the same owner and group as before
+-        setOwner(tempFileDescriptor, ownerId, groupId);
++        setOwner(tempFile.handle(), ownerId, groupId);
+     }
+ 
+-    // rename temporary file to the target file
+-    if (moveFile(tempFileName, targetFileName)) {
++    /**
++     * try to (atomic) rename temporary file to the target file
++     */
++    if (moveFile(tempFile.fileName(), targetFileInfo.filePath())) {
+         // temporary file was renamed, there is nothing to remove anymore
+         tempFile.setAutoRemove(false);
+         return true;
+     }
++
++    /**
++     * we failed
++     * QTemporaryFile will handle cleanup
++     */
+     return false;
+ }
+ 
+@@ -141,28 +152,10 @@ bool SecureTextBuffer::moveFile(const QString &sourceFile, const QString &target
+ {
+ #if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID)
+     const int result = std::rename(QFile::encodeName(sourceFile).constData(), QFile::encodeName(targetFile).constData());
+-    if (result == 0) {
+-        syncToDisk(QFile(targetFile).handle());
+-        return true;
+-    }
+-    return false;
++    return (result == 0);
+ #else
+     // use racy fallback for windows
+     QFile::remove(targetFile);
+     return QFile::rename(sourceFile, targetFile);
+ #endif
+ }
+-
+-void SecureTextBuffer::syncToDisk(const int fd)
+-{
+-#ifndef Q_OS_WIN
+-#if HAVE_FDATASYNC
+-    fdatasync(fd);
+-#else
+-    fsync(fd);
+-#endif
+-#else
+-    // no-op for windows
+-#endif
+-}
+-
+diff --git a/src/buffer/katesecuretextbuffer_p.h b/src/buffer/katesecuretextbuffer_p.h
+index a38285b..e00721c 100644
+--- a/src/buffer/katesecuretextbuffer_p.h
++++ b/src/buffer/katesecuretextbuffer_p.h
+@@ -56,8 +56,6 @@ public:
+     static const QCryptographicHash::Algorithm checksumAlgorithm = QCryptographicHash::Algorithm::Sha512;
+ 
+ private:
+-    static const qint64 bufferLength = 4096;
+-
+     /**
+      * Saves file contents using sets permissions.
+      */
+@@ -66,8 +64,6 @@ private:
+ 
+     static bool moveFile(const QString &sourceFile, const QString &targetFile);
+ 
+-    static void syncToDisk(const int fd);
+-
+ public Q_SLOTS:
+     /**
+      * KAuth action to perform both prepare or move work based on given parameters.
+-- 
+cgit v0.11.2
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
new file mode 100644
index 000000000000..6920f6f7c32f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2018-10361.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index b5ec0c63e8db..abad900a4258 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.43.0.tar.xz 2180220 BLAKE2B cd82f14bc6d4970377857d0f66a5694473db33459be0337cba863bba206243bdcc1aa4c2c7a3b37df3aded7e88174215c01b5f8be82662cb56ef6d2b56aada2b SHA512 ae7664ab700cdb9aa35334005ae58d49db659cea4112fa81a09a37538809910841494bf97f3f982f99e27a376031645c5d0349e4cc77ab2c0fa6ea9484a08140
 DIST kwidgetsaddons-5.46.0.tar.xz 2183504 BLAKE2B 5f8535b6e0ebb93eed8fd8e5079fc00476278bcdf70cad97b9309026066f0fb7b872210ab5cef21a15f5043ccdc5b73bf74be8083a67bf90be4796f76f1cb621 SHA512 7b5f7ea2d2af4c5d16f4a826031bf452545d55c4041c34610e82ad2d65d28404d4f2bc928dc61ea4a181513d607c6268ea9d9fda93d284396e35f9caa502feaa
 EBUILD kwidgetsaddons-5.43.0.ebuild 498 BLAKE2B 44dc1162aff32eb6069345dce9c3a2f75dddcb5955c952a67958436df706b7d334e23e473842e26501a220bf92e40f5ef3755cdd05f65be75193578475453903 SHA512 a0171abb9e65dc90622692372ea936a3eafbd6385ce56a1ffc40c854e0325c0a602ef23beb4bfc0cd68a637b64802eadc06b72c82929d02b94b0b9246b031ea3
-EBUILD kwidgetsaddons-5.46.0.ebuild 500 BLAKE2B 95a0f3134bb01436d8e78856da003bc0e7eabdf6a7377e9794def8fbe0ebb19450c71bed0e673817ead403bb6a954a6e4453a1e0372ba3442894e924343671f1 SHA512 40b55d6615d540f441401eb4589c1375f684323e940e916891a1350e099158fb4663c035c964b1006c4d1c7ae5084bce0cc9ee9e748eadcd3bcae4c3b070cc73
+EBUILD kwidgetsaddons-5.46.0.ebuild 527 BLAKE2B 4aa9b42503b70985dfe90ea3a726d568ab272cd52bac59734578589a5339cd1608f43b03074cfbcf6978f363812eeae2813b142595569b92d65c941ef33e36b8 SHA512 1dcdceac3c33cc3d9078c4fb10a61b1c1367cd605242d10cb92a34a88e2f8cc316845c7a7d5368a3573ea8ffec581600457c55dd061c0fd1f24ddeb99156141b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
index 7a1f9c81fc77..1b30813bfb33 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.46.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 "
 
 src_test() {
-	# bug 650216
-	local myctestargs=( -E "(kdatecomboboxtest)" )
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
 	kde5_src_test
 }
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 9ba93c5adab0..29fa82fcfa9b 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.43.0.tar.xz 884284 BLAKE2B 01228a6aaae155bce38e44ee64110a2cb29e952c1ac9cf0107e1f09a7003b35487bb23000eeae17bbf0debe8b7b509b03733b4a0d595ff3bae58db9e013a28bc SHA512 ace47a5a01267ba33bc9173058a05cb49cfba7d18a171527df4afb094e437885b697fe5ab02d1609f6e577857f3f27d7d4ac2a25f6ea2dd659291d82fe25aa75
 DIST kxmlgui-5.46.0.tar.xz 884584 BLAKE2B d3beefcdf8ec6bd3e31d6a4a0b505725d7fbe9964f0d6eeefdbe6403b65ac7fd6e040da619fc4d6d87152ef1b6278a9dde34b7baae81a0835f66ba3a8d7e68ee SHA512 2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848
 EBUILD kxmlgui-5.43.0.ebuild 992 BLAKE2B 777d84fa2d932bf9758640531703ef8274f2821a8f85fece9bbe8fee9bde09e2c2bfba48197aca0868b473eca9c04eb1ccf8c2ffc8793a5c854886abb79639b1 SHA512 be4678470f84a04046f91f9b29499eced1c26c534bd0fa58c2b536dbc7840c369bb73a6d13e5160a93a64bafef5ab9229d6c332345370a101b55e211ebd98609
-EBUILD kxmlgui-5.46.0.ebuild 1074 BLAKE2B 9bfeee09c275034b61d631f4ea3ca4c460193e9305f60ab870d9036bedb309c1fe9cc7e45144729951960f9f761e479052a7e0e9224ab5945c5e498e8ecf0fa0 SHA512 0151f461109cd890abc41164cd11f902ca17f07c141f72472b9fa6c2613a5fb6ab481dbf69c151bfd3a80075263a90cd5ad43fad32d24c369c357dba71f11aaa
+EBUILD kxmlgui-5.46.0.ebuild 1206 BLAKE2B 4e36b82216ff2743aa84b0f79d45e84e706033965cf6a168593dea3f7d6f4f0b3d8593c4f665468e5c445306d5a60fdd024c6f9cd0050ad0cf58a1d1c8660633 SHA512 87fd2f59cedde55f733fd2da6bfc74a4c2e6144579dbf76a05e2155d291bffabaff763a0de789d6f6f5a779192f693f850d2c5e7d923a405460d34654b322325
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
index 6ef406394e84..daa137afbf96 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.46.0.ebuild
@@ -41,3 +41,13 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# Files are missing; whatever. Bug: 650290
+	local myctestargs=(
+		-j1
+		-E "(kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}