Hello community, here is the log from the commit of package kdepim3 checked in at Sat Apr 14 17:42:59 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-04-03 18:35:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-04-14 17:17:16.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 14 16:58:29 CEST 2007 - wstephenson@suse.de + +- update 3_5_BRANCH.diff, fix #247903 kmail never gives up, + and #247386, can't load messages consisting of a single non-text + attachment. +- Allow KMail to use PLAIN auth directly (#103799) + +------------------------------------------------------------------- New: ---- kmail_allow_tls_login_auth.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.A22057/_old 2007-04-14 17:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.A22057/_new 2007-04-14 17:42:14.000000000 +0200 @@ -29,7 +29,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.6 -Release: 19 +Release: 21 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -54,6 +54,7 @@ Patch24: kmail_attachment_size.diff Patch25: kmail-crash.diff Patch27: disable-kitchensync.diff +Patch28: kmail_allow_tls_login_auth.diff Provides: cryptplug Obsoletes: cryptplug %if %suse_version > 1000 @@ -209,6 +210,7 @@ %patch24 %patch25 %patch27 +%patch28 . /etc/opt/kde3/common_options update_admin @@ -683,6 +685,11 @@ /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* %changelog +* Sat Apr 14 2007 - wstephenson@suse.de +- update 3_5_BRANCH.diff, fix #247903 kmail never gives up, + and #247386, can't load messages consisting of a single non-text + attachment. +- Allow KMail to use PLAIN auth directly (#103799) * Tue Apr 03 2007 - stbinner@suse.de - update of 3_5_BRANCH.diff, includes new time zone infos * Fri Mar 30 2007 - aj@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.A22057/_old 2007-04-14 17:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.A22057/_new 2007-04-14 17:42:14.000000000 +0200 @@ -116355,3 +116355,68 @@ + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin +Index: kmail/imapaccountbase.cpp +=================================================================== +--- kmail/imapaccountbase.cpp (.../tags/KDE/3.5.6/kdepim) (revision 653905) ++++ kmail/imapaccountbase.cpp (.../branches/KDE/3.5/kdepim) (revision 653905) +@@ -850,7 +892,7 @@ namespace KMail { + bool jobsKilled = true; + switch( errorCode ) { + case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break; +- case KIO::ERR_COULD_NOT_LOGIN: // bad password ++ case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password + mAskAgain = true; + // fallthrough intended + case KIO::ERR_CONNECTION_BROKEN: +@@ -859,6 +901,7 @@ namespace KMail { + // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0. + killAllJobs( true ); + break; ++ case KIO::ERR_COULD_NOT_LOGIN: + case KIO::ERR_USER_CANCELED: + killAllJobs( false ); + break; +@@ -1000,7 +1043,7 @@ namespace KMail { + msg->deleteBodyParts(); + // make the parts and fill the mBodyPartList + constructParts( stream, 1, 0, 0, msg->asDwMessage() ); +- if ( mBodyPartList.count() == 1 ) // we directly set the body later ++ if ( mBodyPartList.count() == 1 ) // we directly set the body later, at partsToLoad below + msg->deleteBodyParts(); + + if ( !as ) +@@ -1026,6 +1069,12 @@ namespace KMail { + ++partsToLoad; + } + } ++ // if the only body part is not text, part->loadPart() would return false ++ // and that part is never loaded, so make sure it loads. ++ // it seems that TEXT does load the single body part even if it is not text/* ++ if ( mBodyPartList.count() == 1 && partsToLoad == 0 ) ++ partsToLoad = 1; ++ + if ( (mBodyPartList.count() * 0.5) < partsToLoad ) + { + // more than 50% of the parts have to be loaded anyway so it is faster +Index: kioslaves/imap4/imap4.cc +=================================================================== +--- kioslaves/imap4/imap4.cc (.../tags/KDE/3.5.6/kdepim) (revision 653905) ++++ kioslaves/imap4/imap4.cc (.../branches/KDE/3.5/kdepim) (revision 653905) +@@ -1963,14 +2020,14 @@ bool IMAP4Protocol::makeLogin () + } + } + if (!clientLogin (myUser, myPass, resultInfo)) +- error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to login. Probably the " ++ error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the " + "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo)); + } + else + { + #ifdef HAVE_LIBSASL2 + if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo)) +- error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to authenticate via %1.\n" ++ error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n" + "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo)); + else { + myUser = authInfo.username; + ++++++ kmail_allow_tls_login_auth.diff ++++++ Index: kmail/kmtransport.cpp =================================================================== --- kmail/kmtransport.cpp (revision 627586) +++ kmail/kmtransport.cpp (working copy) @@ -670,7 +670,7 @@ // LOGIN doesn't offer anything over PLAIN, requires more server // roundtrips and is not an official SASL mechanism, but a MS-ism, // so only enable it if PLAIN isn't available: - mSmtp.authLogin->setEnabled( auth & LOGIN && !(auth & PLAIN)); + mSmtp.authLogin->setEnabled( auth & LOGIN /*&& !(auth & PLAIN)*/); mSmtp.authCramMd5->setEnabled( auth & CRAM_MD5 ); mSmtp.authDigestMd5->setEnabled( auth & DIGEST_MD5 ); mSmtp.authNTLM->setEnabled( auth & NTLM ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org