summaryrefslogtreecommitdiff
path: root/kde-frameworks/kcoreaddons
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/kcoreaddons')
-rw-r--r--kde-frameworks/kcoreaddons/Manifest7
-rw-r--r--kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch54
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild)2
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.53.1.ebuild (renamed from kde-frameworks/kcoreaddons/kcoreaddons-5.52.0.ebuild)0
4 files changed, 60 insertions, 3 deletions
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 77f19a09745d..415ebbe821c1 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,6 @@
-DIST kcoreaddons-5.50.0.tar.xz 352664 BLAKE2B 656cbdc21fc97596ab51f23050f3c4eebdb8c73df37fb1799521da19d16ba97c8bd5c31749dc3c881d8064a011028b94ec29dadcb5a367f65523d85294172c5d SHA512 3b8f50b2775425363b83048ab78bb7999dcdfa522a4d8d002292cbaf6975747b5159687c2ce4737b17404b999ec2d6894a3acd23873480ae7376e9134f1ea887
+AUX kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch 2167 BLAKE2B 0460d3d0ef902149b2f40be6f5a1270415eece9b188c5daeb33f8a6bf46e4df55298fb9b8731297fe2f02bc0129cc2a2fd55e8cc4aab537cf15041cde30ad182 SHA512 e6a1fdaaabecea193a55c9768d5efe4cf8562fee20a62e4fed01f1f8a549f3fb40057db6942d5a865acafc34c762524d62319ac2473a48e3e5e9fc0ebbfff34a
DIST kcoreaddons-5.52.0.tar.xz 351716 BLAKE2B 041ead718713beaea9d87fcdbf124e1379eb3b7f9d6c82e43f60b74d23a87de7f55565b722e63db789eb5b11c0a7cf8b975ae42306297583979d8ab9c5257b49 SHA512 0f82e703e9071645cde95a89a5dd3b12da8a477be5d2e01a70c7f42a749d46d86ef44b4ccd4557bf3e23d1794607fa990eadcef6f4a431b775cbaa909e5b8442
-EBUILD kcoreaddons-5.50.0.ebuild 746 BLAKE2B 486f998bf3a1e423bddffe4dd15f232ba1ca41edc3e997bf7bce1fd9128c1b92d18b6d10808cb6fbb6e61def2fe64b453653596e1d2f57c57cd4f77e9d528cc8 SHA512 2f3cd8868518178eb605697e56654d77849aaa5b935ae7ea4c40eb1b435d282080c99d3f357cd55fefc5f775e6003cf51bbc47935a6d001984405f196adfe90e
-EBUILD kcoreaddons-5.52.0.ebuild 748 BLAKE2B 0d4607796a2ac6177cce05f439bb8bbe7425f6adc52383e6d1f4572034f8463662ec2289db7f1220be054cf0079da2999eb9e3360df2a5816ae3f0809a252585 SHA512 ed023f1ec7d019bc3ec03820bc8d9966d41c86ba738f4e5652c45c426124abc13a2459d94c84677305ea29ff44bf45382de600b9e821cd78f9cadf661bc6c17e
+DIST kcoreaddons-5.53.1.tar.xz 352408 BLAKE2B 17c6402429bd50c9c2beace1cd7a60baa3af06ba01e06ec564319bf40ae31c3d5afd571f15f2cb5149b48f84fbae23fbd09b1f3e84f633101dcfae718a06c881 SHA512 76c5324a4a4fc8be0863eba176762a009df6ade9b736674035aecf98eb5ecb0357d6a218172cbc94da5c4014c6a6d85a3df20345f6c9783535ed6c0b642b8239
+EBUILD kcoreaddons-5.52.0-r1.ebuild 813 BLAKE2B c3b431ecbc103ad7f2f82eac493f9d94809394532eb7b5e34100e1c994568bd629901d9b81b24985479ad2cf984bfc25ed2503209196914d58605ac943693000 SHA512 d7bb4ce4253e8d6e9c0206224661d7550d4b31f6a99e86fc82e56ce73b5a3f3953b445fe076c082437ed94933226a4290fe7c739f820875817e0f91b5ef51a7f
+EBUILD kcoreaddons-5.53.1.ebuild 748 BLAKE2B 0d4607796a2ac6177cce05f439bb8bbe7425f6adc52383e6d1f4572034f8463662ec2289db7f1220be054cf0079da2999eb9e3360df2a5816ae3f0809a252585 SHA512 ed023f1ec7d019bc3ec03820bc8d9966d41c86ba738f4e5652c45c426124abc13a2459d94c84677305ea29ff44bf45382de600b9e821cd78f9cadf661bc6c17e
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch
new file mode 100644
index 000000000000..7b1a79652927
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/files/kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch
@@ -0,0 +1,54 @@
+From eb916c305a5cd8683e7e8f955740a7c810220e19 Mon Sep 17 00:00:00 2001
+From: Alexey Min <alexey.min@gmail.com>
+Date: Thu, 8 Nov 2018 00:28:30 +0300
+Subject: Fix crash if XDG_CACHE_HOME directory is too small or out of space
+
+Summary:
+Incorrect checking for error return code of posix_fallocate() causes function to think that everything is OK, while it is not, causing crash in some cases.
+
+BUG: 400610
+CCBUG: 339829
+
+Test Plan:
+good test plan provided in https://bugs.kde.org/show_bug.cgi?id=400610 . Works like a charm, tested in KDE Neon dev-ustable
+
+The reason for bug was that return value of posix_fallocate() was assumed to be negative on error, but in fact it is a positive integer. The check was `< 0`, whi should be `!= 0`. ( http://man7.org/linux/man-pages/man3/posix_fallocate.3.html )
+
+With this fix applied test application does not crash, and the output in console widow is:
+```
+No space left on device. Check filesystem free space at your XDG_CACHE_HOME!
+The operating system is unable to promise 10547304 bytes for mapped cache, abandoning the cache for crash-safety.
+org.kde.kcoreaddons: Failed to establish shared memory mapping, will fallback to private memory -- memory usage will increase
+```
+
+Reviewers: dfaure, #frameworks, mpyne
+
+Reviewed By: dfaure
+
+Subscribers: cfeck, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D16744
+---
+ src/lib/caching/kshareddatacache_p.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/caching/kshareddatacache_p.h b/src/lib/caching/kshareddatacache_p.h
+index 625bc5d..c13275b 100644
+--- a/src/lib/caching/kshareddatacache_p.h
++++ b/src/lib/caching/kshareddatacache_p.h
+@@ -472,7 +472,10 @@ static bool ensureFileAllocated(int fd, size_t fileSize)
+ ;
+ }
+
+- if (result < 0) {
++ if (result != 0) {
++ if (result == ENOSPC) {
++ qCritical() << "No space left on device. Check filesystem free space at your XDG_CACHE_HOME!";
++ }
+ qCritical() << "The operating system is unable to promise"
+ << fileSize
+ << "bytes for mapped cache, "
+--
+cgit v0.11.2
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild
index dde9a03ac18f..57a2101a0929 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.50.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0-r1.ebuild
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}
nls? ( $(add_qt_dep linguist-tools) )
"
+PATCHES=( "${FILESDIR}/${P}-xdg_cache_home-nospace-crash.patch" )
+
src_configure() {
local mycmakeargs=(
-D_KDE4_DEFAULT_HOME_POSTFIX=4
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.53.1.ebuild
index 6241035aa32c..6241035aa32c 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.52.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.53.1.ebuild