Revision bump adds upstream patch which fixes an infinite loop in kinotify spotted by Dennis Schridde <devurandom@gmx.net>.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 45 insertions, 12 deletions

diff --git a/kde-base/nepomuk-core/ChangeLog b/kde-base/nepomuk-core/ChangeLog
index b8c360e4e165..6ab325e1e64d 100644
--- a/kde-base/nepomuk-core/ChangeLog
+++ b/kde-base/nepomuk-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/nepomuk-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.3 2012/08/07 17:45:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.4 2012/08/08 21:45:06 johu Exp $
+
+*nepomuk-core-4.9.0-r2 (08 Aug 2012)
+
+  08 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/nepomuk-core-4.9.0-kinotify-infinite-loop.patch,
+  +nepomuk-core-4.9.0-r2.ebuild, -nepomuk-core-4.9.0-r1.ebuild:
+  Revision bump adds upstream patch which fixes an infinite loop in kinotify
+  spotted by Dennis Schridde <devurandom@gmx.net>.
 
 *nepomuk-core-4.9.0-r1 (07 Aug 2012)
 
diff --git a/kde-base/nepomuk-core/Manifest b/kde-base/nepomuk-core/Manifest
index 8b25118cbac4..8a07a7ca71e6 100644
--- a/kde-base/nepomuk-core/Manifest
+++ b/kde-base/nepomuk-core/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nepomuk-core-4.9.0-kinotify-infinite-loop.patch 636 SHA256 9a46d4a4686f186ee53fea8b29e311ddf7ea92ce010bf48f809b14eed2b81dba SHA512 23a177591f3db56b27df269d129d4aa57f5112bcefe8a56d63f61b4af8bf8811cbdf1cb01a964037c73f694fc74195b56246457f36439595345a204fd38d6fed WHIRLPOOL fa84c10acd65aeae73a9d01f394c7f590ae7730dd3341d71d99416363f3335eacf0cdd9b810c2d682e6ae683338be71b3627c845c1e6ef763c912b9b7e8e49b6
 AUX nepomuk-core-4.9.0-kinotify-memleak.patch 3686 SHA256 d7dfc92fcf9cb4ec42cd38555dd3aec03a300216f4697ee85e05354617a6a416 SHA512 84a40d7aa9c1cfa4f1294dfcdd2ec62def8fb0ac6e5699147b3d0ba0554c7116a4467cfe9cb397c409e6bb62cf284189bdf5ed98cc50c48514bc867c871833cd WHIRLPOOL ede513228fdb3d3f3a0beb3f2254bd89d4bdddc52c63839a2b493ef6b715ca71de33b9ec0401c2949251f51990005abcc9b1cc3fac9ef379c09a91e6f2e626b4
 DIST nepomuk-core-4.9.0.tar.xz 375924 SHA256 c934437d6a1853e725a5fc3407a022e39c727b9a43419fed5acc11748055ffe8 SHA512 0b0962a159eed2a812ed48ae97ec0ddc82773d26c35613f4d88c449fa2868d309b52f28142ba0119ce70648b3ec87f1b6d59f601bc99941b78da8d089baae5a5 WHIRLPOOL e77a54dff46d5a30cbf1cf66bea3ad09158f32aadd0a05327a53636c2eb9e9763b4a11b26c619e8d1f6b6191ee3bbe7988c7775639f79f311b71b310b557426d
-EBUILD nepomuk-core-4.9.0-r1.ebuild 608 SHA256 392f9cd9e20f6bd52b7a30171d15c474c5f5aa139a7ddff1713e563d4f63e489 SHA512 5ade138fed4f24e2fa6c797a59f14ff149c750f1e1c87caad0a9c4e6bffeb2457b84be6db4c268cfc851c0a2909089d9758362986b0e0ca61643dac2d405eaa4 WHIRLPOOL f0c046edb492c36b853e05f39f664cc9a5c67598b7fb0772f195a02b2af04cb821ba1f19dbd8ee91a21f167c9821cc5eb8b792afc631827781d40db6a27f9efb
-MISC ChangeLog 863 SHA256 7d056064c3c4ceb10a6b5aab39e63c9444d69a9e4bf31416ede9abfe2a0777ed SHA512 3572550cd50f6a7ee04a49d65eb0d13edc7231732ddc92300543a4d9a65c79a7c77927bda9a3a4a3804f8d7a1deec3b4d3411fb9b320ed7e267265c127e8de7f WHIRLPOOL e4c0ae0a67b49bd17218a4612622bf8673f3144e9a97ce452d82856551a288a142ac88c76930eb145a36b808fbbb9d7ec815ce8f48a484e186358f03b3622f82
+EBUILD nepomuk-core-4.9.0-r2.ebuild 658 SHA256 5802f81a6669183dd2b0d424f5aee61a3811b20fab1f2ab97cfeee72c455eff7 SHA512 6f2f482f1272acac9699b899adff62fe62230bcd06b1b209179b8ef4470a34f46bde225cd4ee2f5dc2f16e10179537d834fc0f22c212bb1c72df01c318a22515 WHIRLPOOL 3339c5273f52c60359cbe4d9105286792e63f7df03221e8387fc8e630b65e893113c79a299d670ffda0daae8f4e6687cc7134b0d50efc5916bdb8a0141c91be0
+MISC ChangeLog 1200 SHA256 dc6c921d4a18f4cd2f307e28df260729ea107eee3e9b62aa94a8d0b700ac709b SHA512 4ba9ff9809d1672897c4ad68388974b5bcaea527d671bd5230d140150e2a51c169094e8d10194bed8a75ba4f53889610bbdc8b733a0af7ee238cc0bcc787dfdf WHIRLPOOL 0099adc0f8253cd614cfa07b775397ec436209e46980316ac156721b340e5e81babdd672d4cf6dcb10244d7537c3c64494e248b28d19a6e2d0d5e3e9ee210728
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQIVWDAAoJEO+t9ga+3I3alvYIAI+scMTaHFYPeOSH/6/8Zcw3
-dF7MgUeqVevLvTSJhzzdtyNpVy+r16xfgwvQhQ0ml5ne2DufbwJs+s8niGSPqNQJ
-LHTHn+ZePwhttM7AnJCLpHrwkxshH7b+1szd8HCtiibhIzrW1oBieU4Z/sxvxItB
-Ddc/knK25I2hlm0EmbmBzbkWP3yc9dyOzcqCvliFd2uS2zdzFWjkMF8sL+QXEmzX
-qJEWu1O1HieJH1tIwTwjuPmsxGXL7lFQsEuuZNj5p6+ei4+ccaFZfkx5YeXm04GH
-9a24VnrrwMBRRYKmMwX3N5KbvvOP51YdkO+F81u7Rmolitrneit+Pe98w1Q0yYI=
-=cSur
+iQEcBAEBCAAGBQJQIt3lAAoJEO+t9ga+3I3a0SYIAJncnyoZtqp6rwtAFVS6tAzi
+XJ2XZLzLMEAzgIK86a43DnudJhhoa3v/lsmd8Hos8EFC8pGCsU2HSwe+GdKD5SyO
+agtzoRkAmzF0Rs4dVIP9PYx4riRbVlatX5ndhL3QmpvUbAPw7FN9cZkNvEjHfI5u
+CxDS22RvCiUQ/0NxdypMV0ingIE2wzvm00Y+Yxc5LpbKDH1O4GZBmtipoegbmncm
+t8LTrFr1UQoOchFImFM6p1URdpgtV4W6Pum3m22Q3sFSiOOdfgxna5CFC/M29Mn0
+qt+ivlK3ATjZGLzGr3vfxEDazD1D4dLQUjpPSuxLXP5uGAm1Eb/tWRLPxsVhoEg=
+=HXqj
 -----END PGP SIGNATURE-----
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-infinite-loop.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-infinite-loop.patch
new file mode 100644
index 000000000000..95554867c498
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-infinite-loop.patch
@@ -0,0 +1,21 @@
+commit 7322b28f46969adb721daecf5a7fb67b8e0c6ae4
+Author: Vishesh Handa <me@vhanda.in>
+Date:   Wed Aug 8 14:33:02 2012 +0530
+
+    Break out of kinotify's _k_addWatches loop
+    
+    Didn't test the patch out after making a super trivial change in the
+    review request. Stupid Stupid me!
+
+diff --git a/services/filewatch/kinotify.cpp b/services/filewatch/kinotify.cpp
+index 47eb8ed..509abff 100644
+--- a/services/filewatch/kinotify.cpp
++++ b/services/filewatch/kinotify.cpp
+@@ -152,6 +152,7 @@ public:
+             }
+             else {
+                 delete dirIterators.dequeue();
++                break;
+             }
+         }
+ 
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r2.ebuild
index 45a2cebbf348..e078e92b75d3 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild,v 1.1 2012/08/07 17:45:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/nepomuk-core-4.9.0-r2.ebuild,v 1.1 2012/08/08 21:45:06 johu Exp $
 
 EAPI=4
 
@@ -22,4 +22,7 @@ add_blocker nepomuk '<4.8.80'
 RESTRICT="test"
 # bug 392989
 
-PATCHES=( "${FILESDIR}/${P}-kinotify-memleak.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-kinotify-memleak.patch"
+	"${FILESDIR}/${P}-kinotify-infinite-loop.patch"
+)