Hello community, here is the log from the commit of package kdepim3 for openSUSE:Factory checked in at 2012-03-09 21:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old) and /work/SRC/openSUSE:Factory/.kdepim3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim3", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2012-03-01 17:20:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2012-03-09 21:24:06.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 8 16:07:43 UTC 2012 - anixx@opensuse.org + +- two patches by Serghei Amelian (Gentoo) + * fix infinite loop in IMAP + * proper fix for crashes when building with new GCC (bnc#735064) + +------------------------------------------------------------------- Old: ---- kdepim-slackware-kmail-composer-crash-fix.patch New: ---- kdepim-gentoo-composer_crash_fix.diff kdepim-gentoo-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.rMLPag/_old 2012-03-09 21:24:09.000000000 +0100 +++ /var/tmp/diff_new_pack.rMLPag/_new 2012-03-09 21:24:09.000000000 +0100 @@ -32,7 +32,6 @@ BuildRequires: pilot-link-devel BuildRequires: gpg2 BuildRequires: gpgme-devel -BuildRequires: gcc43-c++ Summary: Personal Information Manager Software for KDE License: GPL-2.0 Group: System/GUI/KDE @@ -71,7 +70,8 @@ Patch130: kdepim-gcc-fix-call2.patch Patch131: kdepim-trinity-editorwatcher-crash-fix.patch Patch132: kdepim-pardus-kmail-imapfetchmaxsize.patch -Patch133: kdepim-slackware-kmail-composer-crash-fix.patch +Patch134: kdepim-gentoo-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch +Patch135: kdepim-gentoo-composer_crash_fix.diff Provides: cryptplug Obsoletes: cryptplug # authentification plugins can be useful @@ -263,13 +263,12 @@ %patch130 -p1 %patch131 -p3 %patch132 -p1 -#%patch133 -p1 +%patch134 -p1 +%patch135 -p1 . /etc/opt/kde3/common_options update_admin %build -export CC=gcc-4.3 -export CXX=g++-4.3 . /etc/opt/kde3/common_options export CXXFLAGS="$CXXFLAGS -Wl,--add-needed" configopts="--disable-final" @@ -277,7 +276,7 @@ --without-arts --disable-final \ --enable-newdistrlists=no # may fail with higher number of jobs -do_make -j2 +do_make -j1 %install . /etc/opt/kde3/common_options ++++++ kdepim-gentoo-composer_crash_fix.diff ++++++ diff -ur kdepim-3.5.10.orig/kmail/mailcomposerIface.h kdepim-3.5.10/kmail/mailcomposerIface.h --- kdepim-3.5.10.orig/kmail/mailcomposerIface.h 2005-09-10 11:24:01.000000000 +0300 +++ kdepim-3.5.10/kmail/mailcomposerIface.h 2012-03-08 17:13:42.553318699 +0200 @@ -13,6 +13,9 @@ class MailComposerIface : virtual public DCOPObject { K_DCOP + + public: MailComposerIface() : DCOPObject("MailComposerIface") {} + k_dcop: /** Send message. ++++++ kdepim-gentoo-kioslaves-3.5.10-kio_imap4_fix_infinite_loop.patch ++++++ 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()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org