diff options
5 files changed, 60 insertions, 2 deletions
diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5 index ad318480..d29213f5 100644 --- a/Documentation/package.unmask/kde-3.5 +++ b/Documentation/package.unmask/kde-3.5 @@ -199,6 +199,7 @@ =kde-base/kdenetwork-kfile-plugins-3.5.10 =kde-base/kdenetwork-meta-3.5.10 =kde-base/kdepasswd-3.5.10 +=kde-base/kdepim-kioslaves-3.5.10-r1 =kde-base/kdepim-kioslaves-3.5.10 =kde-base/kdepim-kresources-3.5.10 =kde-base/kdepim-meta-3.5.10 diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog index 35ac2636..158d4871 100644 --- a/kde-base/kdepim-kioslaves/ChangeLog +++ b/kde-base/kdepim-kioslaves/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for kde-base/kdepim-kioslaves -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.112 2009/10/12 20:52:26 abcd Exp $ +*kdepim-kioslaves-3.5.10-r1 (17 Jan 2010) + + 17 Jan 2010; Serghei Amelian <serghei@gentoo.org> + +kdepim-kioslaves-3.5.10-r1.ebuild, + +files/kdepim-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch: + Fixed infinite loop in kio_imap4 + [http://bugs.kde.org/show_bug.cgi?id=77862] + 12 Oct 2009; Jonathan Callen <abcd@gentoo.org> -kdepim-kioslaves-3.5.9.ebuild: KDE 3.5.9 removal diff --git a/kde-base/kdepim-kioslaves/Manifest b/kde-base/kdepim-kioslaves/Manifest index 96fcfdfc..b9381bba 100644 --- a/kde-base/kdepim-kioslaves/Manifest +++ b/kde-base/kdepim-kioslaves/Manifest @@ -1,5 +1,7 @@ +AUX kdepim-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch 650 RMD160 461d69effe6bd5ff6d056978a1b7410c3ff8b5fd SHA1 1cc7097ec2760d992c733384daa3aaebc4f1e068 SHA256 6e0eaa9d2dc1b80823fd7cbe9e466db139bfa1c53379f156b5d22ab405d2fba2 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61 DIST kdepim-3.5.10.tar.bz2 14559901 RMD160 52a834dc8eb377d397404a16a09c8a59b568b305 SHA1 537da60fe3564ecc0ed2802e744fbf96386909a9 SHA256 95ec92023a25e4868e55389fa4648b337fed870d744d3b63022ed9838ff9b429 +EBUILD kdepim-kioslaves-3.5.10-r1.ebuild 815 RMD160 69f9317bbe3783053131e5c48934580679d10be3 SHA1 3557b0ddb66f1537670bbdeed077ece8bcc7a002 SHA256 14dd49c52bd56da5730282757f2a9a725fa495a32d2aa0b8c87ab68247e6e979 EBUILD kdepim-kioslaves-3.5.10.ebuild 749 RMD160 eaa57e5815853056305a9ffbbb9170acb39d9317 SHA1 f1fa06c393b8075d521c0ea606650ad0cb97ca4b SHA256 20013351389d2b76212ec59a86e439abc8ab2dad9339e7bee31a365a7e1c5e76 -MISC ChangeLog 15520 RMD160 fdfab75ce67fd3a0fbf0a8306cf2639dc2910d98 SHA1 66b5e02f557b930101b22ba911a25bb2cd3df75f SHA256 51f4acd6d451330bf9f219d751f1a3f9c3932966863183452ab4b677db01fcdc +MISC ChangeLog 15803 RMD160 df76b806ed5abd30d5dbfa24803533877342cb02 SHA1 4d26686277ca481449857f635b458b409c59a17d SHA256 79debca2523ba20fadd0643f0dafd343579e9aac2be38367dd02da4174cc9fca MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch new file mode 100644 index 00000000..cc7f9886 --- /dev/null +++ b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch @@ -0,0 +1,18 @@ +diff -u -r kdepim-3.5.10.orig/kioslaves/imap4/imapparser.cc kdepim-3.5.10/kioslaves/imap4/imapparser.cc +--- kdepim-3.5.10.orig/kioslaves/imap4/imapparser.cc 2008-08-19 18:15:48.000000000 +0000 ++++ kdepim-3.5.10/kioslaves/imap4/imapparser.cc 2010-01-16 23:47:28.981048819 +0000 +@@ -277,11 +277,10 @@ + } + cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1())); + +- while ( true ) +- { ++ int pl = 0; ++ while ( pl != -1 && !cmd->isComplete () ) { + //read the next line +- while (parseLoop() == 0) ; +- if ( cmd->isComplete() ) break; ++ while ( ( pl = parseLoop() ) == 0); + + if (!continuation.isEmpty()) + { diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.10-r1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.10-r1.ebuild new file mode 100644 index 00000000..16a5bc32 --- /dev/null +++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.10-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.10.ebuild,v 1.7 2009/07/12 11:33:17 armin76 Exp $ + +KMNAME=kdepim +KMMODULE=kioslaves + +EAPI="1" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdepim-3.5-patchset-04.tar.bz2" + +DESCRIPTION="kioslaves from kdepim package" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="sasl" +DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 ) + >=kde-base/libkmime-${PV}:${SLOT}" + +KMCOPYLIB="libkmime libkmime/" +KMEXTRACTONLY="libkmime/" +KMCOMPILEONLY="libemailfunctions" + +PATCHES=( "${FILESDIR}/${P}-kio_imap4_fix_infinite_loop.patch" ) + +src_compile() { + myconf="$myconf $(use_with sasl)" + kde-meta_src_compile +} |