diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-08-08 21:45:06 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-08-08 21:45:06 +0000 |
| commit | 0bddeb9e3517e5f0f2a033af7262953d55f8370e (patch) | |
| tree | fce095552494a5a23f64d8c15073888cc7964916 /kde-base | |
| parent | Version bump (diff) | |
| download | gentoo-2-0bddeb9e3517e5f0f2a033af7262953d55f8370e.tar.gz gentoo-2-0bddeb9e3517e5f0f2a033af7262953d55f8370e.tar.bz2 gentoo-2-0bddeb9e3517e5f0f2a033af7262953d55f8370e.zip | |
Revision bump adds upstream patch which fixes an infinite loop in kinotify spotted by Dennis Schridde <devurandom@gmx.net>.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/nepomuk-core/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-infinite-loop.patch | 21 | ||||
| -rw-r--r-- | kde-base/nepomuk-core/nepomuk-core-4.9.0-r2.ebuild (renamed from kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild) | 7 |
3 files changed, 35 insertions, 3 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/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" +) |