Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Thu Mar 13 19:02:23 CET 2008.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2008-03-07 14:52:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2008-03-13 13:47:37.021344000 +0100
@@ -1,0 +2,9 @@
+Thu Mar 13 11:21:15 CET 2008 - dmueller@suse.de
+
+- update to 4.0.66
+ * fix i18n usage arguments in imap4 ioslave
+ * fix sieve handling
+ * fix for kabc file locking
+ * krazy fixes
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-4.0.65.tar.bz2
New:
----
kdepimlibs-4.0.66.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.NA9429/_old 2008-03-13 19:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.NA9429/_new 2008-03-13 19:02:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 4.0.65)
+# spec file for package kdepimlibs4 (Version 4.0.66)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,9 +16,9 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 4.0.65
+Version: 4.0.66
Release: 1
-%define rversion 4.0.65
+%define rversion 4.0.66
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -68,11 +68,9 @@
--------
The KDE Team
-%post -n libkdepimlibs4
-%run_ldconfig
+%post -n libkdepimlibs4 -p /sbin/ldconfig
-%postun -n libkdepimlibs4
-%run_ldconfig
+%postun -n libkdepimlibs4 -p /sbin/ldconfig
%files -n libkdepimlibs4
%defattr(-,root,root)
@@ -156,6 +154,12 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Thu Mar 13 2008 dmueller@suse.de
+- update to 4.0.66
+ * fix i18n usage arguments in imap4 ioslave
+ * fix sieve handling
+ * fix for kabc file locking
+ * krazy fixes
* Fri Mar 07 2008 dmueller@suse.de
- update to 4.0.65 snapshot:
* fixes kabc signal/slot connections
++++++ kdepimlibs-4.0.65.tar.bz2 -> kdepimlibs-4.0.66.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/common.h new/kdepimlibs-4.0.66/kioslave/common.h
--- old/kdepimlibs-4.0.65/kioslave/common.h 2008-02-07 14:18:47.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/common.h 2008-03-13 09:16:50.000000000 +0100
@@ -1,3 +1,24 @@
+/* This file is part of the KDE project
+ Copyright (C) 2008 Jaroslaw Staniek
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _KIOSLAVE_COMMON_H
+#define _KIOSLAVE_COMMON_H
#ifdef HAVE_LIBSASL2
@@ -12,7 +33,7 @@
inline bool initSASL()
{
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN32 //krazy:exclude=cpp
QByteArray libInstallPath( QFile::encodeName(QDir::toNativeSeparators(KGlobal::dirs()->installPath("lib")+"sasl2")) );
QByteArray configPath( QFile::encodeName(QDir::toNativeSeparators(KGlobal::dirs()->installPath("config")+"sasl2")) );
if ( sasl_set_path(SASL_PATH_TYPE_PLUGIN, libInstallPath.data()) != SASL_OK
@@ -31,3 +52,5 @@
}
#endif // HAVE_LIBSASL2
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/imap4/imap4.cpp new/kdepimlibs-4.0.66/kioslave/imap4/imap4.cpp
--- old/kdepimlibs-4.0.65/kioslave/imap4/imap4.cpp 2008-02-28 18:55:13.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/imap4/imap4.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -87,6 +87,7 @@
#include
#include
#include
+#include
#include "common.h"
#include "kdemacros.h"
@@ -151,7 +152,7 @@
// Reinstall signal handler, since Linux resets to default after
// the signal occurred ( BSD handles it different, but it should do
// no harm ).
- signal (SIGCHLD, sigchld_handler);
+ KDE_signal (SIGCHLD, sigchld_handler);
return;
}
}
@@ -1582,11 +1583,9 @@
imapCommand *cmd = doCommand (imapCommand::clientCustom( command, arguments ));
if (cmd->result () != "OK")
{
- error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 "
- "failed. The server returned: %3")
- .arg(command)
- .arg(arguments)
- .arg(cmd->resultInfo()));
+ error( ERR_SLAVE_DEFINED,
+ i18n( "Custom command %1:%2 failed. The server returned: %3",
+ command, arguments, cmd->resultInfo() ) );
return;
}
completeQueue.removeAll(cmd);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/imap4/imapparser.cpp new/kdepimlibs-4.0.66/kioslave/imap4/imapparser.cpp
--- old/kdepimlibs-4.0.65/kioslave/imap4/imapparser.cpp 2008-02-21 10:27:40.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/imap4/imapparser.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -813,7 +813,7 @@
rights.append( word );
}
- lastResults.append( email + ":" + rights.join( "," ) );
+ lastResults.append( email + ':' + rights.join( "," ) );
}
void imapParser::parseOutOfOffice (parseString & result)
@@ -823,7 +823,7 @@
QByteArray msg = parseLiteral (result, false, false);
- lastResults.append( state + "^" + QString::fromUtf8( msg ) );
+ lastResults.append( state + '^' + QString::fromUtf8( msg ) );
}
void imapParser::parseMyRights (parseString & result)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/.krazy new/kdepimlibs-4.0.66/kioslave/.krazy
--- old/kdepimlibs-4.0.65/kioslave/.krazy 1970-01-01 01:00:00.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/.krazy 2008-03-13 09:16:50.000000000 +0100
@@ -0,0 +1,2 @@
+EXTRA null
+EXCLUDE null
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/sieve/sieve.cpp new/kdepimlibs-4.0.66/kioslave/sieve/sieve.cpp
--- old/kdepimlibs-4.0.65/kioslave/sieve/sieve.cpp 2008-02-07 14:18:47.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/sieve/sieve.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -31,6 +31,7 @@
#include
}
+#include
#include
#include
#include
@@ -235,6 +236,7 @@
ksDebug << "Connected to Sieve server: " << r.getVal() << endl;
ret = true;
setMetaData("implementation", r.getVal());
+ m_implementation = r.getVal();
}
} else if (r.getKey() == "SASL") {
@@ -342,7 +344,7 @@
if (startSsl()) {
ksDebug << "TLS enabled successfully." << endl;
// reparse capabilities:
- parseCapabilities(false);
+ parseCapabilities( requestCapabilitiesAfterStartTLS() );
} else {
ksDebug << "TLS initiation failed." << endl;
disconnect(true);
@@ -1127,7 +1129,10 @@
{
// expecting {quantity}
start = 0;
- end = interpret.indexOf('}', start + 1) - 1;
+ end = interpret.indexOf("+}", start + 1);
+ // some older versions of Cyrus enclose the literal size just in { } instead of { +}
+ if ( end == -1 )
+ end = interpret.indexOf('}', start + 1);
bool ok = false;
r.setQuantity(interpret.mid(start + 1, end - start - 1).toUInt( &ok ));
@@ -1181,7 +1186,7 @@
bool kio_sieveProtocol::operationSuccessful()
{
- while (receiveData(false)) {
+ while (receiveData(true)) {
if (r.getType() == kio_sieveResponse::ACTION) {
QByteArray response = r.getAction().left(2);
if (response == "OK") {
@@ -1209,3 +1214,21 @@
return OTHER;
}
+
+bool kio_sieveProtocol::requestCapabilitiesAfterStartTLS() const
+{
+ // Cyrus didn't send CAPABILITIES after STARTTLS until 2.3.11, which is
+ // not standard conform, but we need to support that anyway.
+ // m_implementation looks like this 'Cyrus timsieved v2.2.12' for Cyrus btw.
+ QRegExp regExp( "Cyrus\\stimsieved\\sv(\\d+)\\.(\\d+)\\.(\\d+)", Qt::CaseInsensitive );
+ if ( regExp.indexIn( m_implementation ) >= 0 ) {
+ const int major = regExp.cap( 1 ).toInt();
+ const int minor = regExp.cap( 2 ).toInt();
+ const int patch = regExp.cap( 3 ).toInt();
+ if ( major < 2 || (major == 2 && (minor < 3 || (major == 3 && patch < 11))) ) {
+ ksDebug << "Enabling compat mode for Cyrus < 2.3.11";
+ return true;
+ }
+ }
+ return false;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/sieve/sieve.h new/kdepimlibs-4.0.66/kioslave/sieve/sieve.h
--- old/kdepimlibs-4.0.65/kioslave/sieve/sieve.h 2008-01-29 10:14:56.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/sieve/sieve.h 2008-03-13 09:16:50.000000000 +0100
@@ -124,6 +124,11 @@
QString m_sAuth;
bool m_shouldBeConnected;
quint16 m_port;
+
+private:
+ bool requestCapabilitiesAfterStartTLS() const;
+
+ QString m_implementation;
};
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/smtp/command.cpp new/kdepimlibs-4.0.66/kioslave/smtp/command.cpp
--- old/kdepimlibs-4.0.65/kioslave/smtp/command.cpp 2008-01-15 02:47:34.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/smtp/command.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -29,19 +29,19 @@
your version.
*/
-#include "smtp-config.h"
#include "command.h"
#include "smtp.h"
#include "response.h"
#include "transactionstate.h"
-#include
#include
#include
#include
#include // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase
+#include
+
#include
namespace KioSMTP {
@@ -125,7 +125,7 @@
mNeedResponse = true;
mComplete = mEHLONotSupported;
const char * cmd = mEHLONotSupported ? "HELO " : "EHLO " ;
- return cmd + QUrl::toAce( mHostname ) + "\r\n";
+ return cmd + QUrl::toAce( mHostname ) + "\r\n"; //krazy:exclude=qclasses
}
bool EHLOCommand::processResponse( const Response & r, TransactionState * ) {
@@ -365,7 +365,7 @@
mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
( mMechusing ? i18n("Your SMTP server does not support %1.", r.errorMessage() )
: i18n("Your SMTP server does not support (unspecified method).") )
- + "\n" + chooseADifferentMsg + "\n" + r.errorMessage() );
+ + '\n' + chooseADifferentMsg + '\n' + r.errorMessage() );
}
else
mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/smtp/request.cpp new/kdepimlibs-4.0.66/kioslave/smtp/request.cpp
--- old/kdepimlibs-4.0.65/kioslave/smtp/request.cpp 2008-01-05 00:53:18.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/smtp/request.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -53,7 +53,7 @@
continue;
const QString key = (*it).left( equalsPos ).toLower();
- const QString value = QUrl::fromPercentEncoding( (*it).mid( equalsPos + 1 ).toLatin1() );
+ const QString value = QUrl::fromPercentEncoding( (*it).mid( equalsPos + 1 ).toLatin1() ); //krazy:exclude=qclasses
if ( key == "to" )
request.addTo( value );
@@ -86,7 +86,7 @@
}
QByteArray Request::heloHostnameCString() const {
- return QUrl::toAce( heloHostname() );
+ return QUrl::toAce( heloHostname() ); //krazy:exclude=qclasses
}
static bool isUsAscii( const QString & s ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kioslave/smtp/smtp.cpp new/kdepimlibs-4.0.66/kioslave/smtp/smtp.cpp
--- old/kdepimlibs-4.0.65/kioslave/smtp/smtp.cpp 2008-02-07 14:18:46.000000000 +0100
+++ new/kdepimlibs-4.0.66/kioslave/smtp/smtp.cpp 2008-03-13 09:16:50.000000000 +0100
@@ -28,6 +28,7 @@
*
*/
+#include "smtp.h"
#include "smtp-config.h"
#ifdef HAVE_LIBSASL2
@@ -37,7 +38,6 @@
#endif
#include "common.h"
-#include "smtp.h"
#include "request.h"
#include "response.h"
#include "transactionstate.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kresources/kresources.desktop new/kdepimlibs-4.0.66/kresources/kresources.desktop
--- old/kdepimlibs-4.0.65/kresources/kresources.desktop 2008-02-28 18:55:12.000000000 +0100
+++ new/kdepimlibs-4.0.66/kresources/kresources.desktop 2008-03-13 09:16:50.000000000 +0100
@@ -37,6 +37,7 @@
Name[sr]=КДЕ ресурси
Name[sr@latin]=KDE resursi
Name[sv]=KDE-resurser
+Name[tr]=KDE Kaynakları
Name[uk]=Ресурси KDE
Name[x-test]=xxKDE Resourcesxx
Name[zh_CN]=KDE 资源
@@ -72,6 +73,7 @@
Comment[sr]=Подеси ресурсе КДЕ‑а
Comment[sr@latin]=Podesi resurse KDE‑a
Comment[sv]=Anpassa KDE-resurser
+Comment[tr]=KDE Kaynaklarını Yapılandır
Comment[uk]=Налаштувати ресурси KDE
Comment[x-test]=xxConfigure KDE Resourcesxx
Comment[zh_CN]=配置 KDE 资源
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kresources/kresources_manager.desktop new/kdepimlibs-4.0.66/kresources/kresources_manager.desktop
--- old/kdepimlibs-4.0.65/kresources/kresources_manager.desktop 2008-02-21 10:27:40.000000000 +0100
+++ new/kdepimlibs-4.0.66/kresources/kresources_manager.desktop 2008-03-13 09:16:50.000000000 +0100
@@ -7,6 +7,7 @@
Name[nds]=KResources-Pleger
Name[pt]=Gestor do KResources
Name[pt_BR]=Gestor do KResources
+Name[tr]=KResources Yöneticisi
Name[zh_CN]=KResource 管理器
Name[zh_TW]=KResource 管理者
Type=ServiceType
@@ -40,6 +41,7 @@
Comment[sr]=Менаџер к‑ресурса
Comment[sr@latin]=Menadžer k‑resursa
Comment[sv]=Resurshantering
+Comment[tr]=KResources Yöneticisi
Comment[uk]=Менеджер KResource
Comment[x-test]=xxKResource Managerxx
Comment[zh_CN]=KResource 管理器
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.65/kresources/kresources_plugin.desktop new/kdepimlibs-4.0.66/kresources/kresources_plugin.desktop
--- old/kdepimlibs-4.0.65/kresources/kresources_plugin.desktop 2008-02-21 10:27:40.000000000 +0100
+++ new/kdepimlibs-4.0.66/kresources/kresources_plugin.desktop 2008-03-13 09:16:50.000000000 +0100
@@ -7,6 +7,7 @@
Name[nds]=KResources-Moduul
Name[pt]='Plugin' do KResources
Name[pt_BR]='Plugin' do KResources
+Name[tr]=KResources Eklentisi
Name[zh_CN]=KResource 插件
Name[zh_TW]=KResource 外掛程式
Type=ServiceType
@@ -37,6 +38,7 @@
Comment[sr]=Прикључак радног оквира к‑ресурса
Comment[sr@latin]=Priključak radnog okvira k‑resursa
Comment[sv]=Insticksprogram för resursramverk
+Comment[tr]=KResources Çalışma Alanı Eklentisi
Comment[uk]=Втулок платформи KResource
Comment[x-test]=xxKResource Framework Pluginxx
Comment[zh_CN]=KResource 框架插件
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org