Bug#596939: future unblock: kdepim-runtime/4:4.4.6-1
Package: release.debian.org
Severity: wishlist
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Hello,
I would like to hear your opinion before uploading. KDE has recently released a
new patch release (4.4.6) for its kdepim suite 4.4.x series (kdepim-runtime and
kdepim source packages in Debian). KDE has a rather strict policy what goes
into its patch releases (no new features, only bug fixes). So I think it makes
much sense to release Squeeze with the latest bugfix version from upstream
because a few months of bug fixing went into kdepim* 4.4.6. Also please note
that 4.4.6 is probably the last release of the old kdepim* codebase while
upstream is actively working on the kdepim* 4.5 which is >70% rewrite so to
speak. In my opinion, this makes the update even more important given the
length of the Debian stable lifecycle.
Speaking strictly about kdepim-runtime source package, the upstream diff is
really small (see below). So would you grant a freeze exception for this
package after it spends some time in unstable? Thank you for considering.
$ diff -uNr kdepim-runtime-4.4.5 kdepim-runtime-4.4.6 | diffstat
.krazy | 3 ---
resources/imap/imapresource.cpp | 2 +-
resources/imap/settings.cpp | 6 ++++--
resources/mailtransport_dummy/Messages.sh | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
$ diff -uNr kdepim-runtime-4.4.5 kdepim-runtime-4.4.6
diff -uNr kdepim-runtime-4.4.5/.krazy kdepim-runtime-4.4.6/.krazy
--- kdepim-runtime-4.4.5/.krazy 2009-12-14 12:54:44.000000000 +0200
+++ kdepim-runtime-4.4.6/.krazy 1970-01-01 03:00:00.000000000 +0300
@@ -1,3 +0,0 @@
-SKIP /libkdepim-copy/\|/resources/openchange/
-EXTRA defines,kdebug,null,qenums,tipsandthis
-STRICT super
diff -uNr kdepim-runtime-4.4.5/resources/imap/imapresource.cpp kdepim-runtime-4.4.6/resources/imap/imapresource.cpp
--- kdepim-runtime-4.4.5/resources/imap/imapresource.cpp 2010-01-06 19:00:55.000000000 +0200
+++ kdepim-runtime-4.4.6/resources/imap/imapresource.cpp 2010-09-10 02:32:13.000000000 +0300
@@ -256,7 +256,7 @@
if ( userRejected ) {
emit status( Broken, i18n( "Could not read the password: user rejected wallet access." ) );
return;
- } else if ( password.isEmpty() ) {
+ } else if ( password.isEmpty() && (Settings::self()->authentication() != 7 /* Not GSSAPI */) ) {
emit status( Broken, i18n( "Authentication failed." ) );
return;
} else {
diff -uNr kdepim-runtime-4.4.5/resources/imap/settings.cpp kdepim-runtime-4.4.6/resources/imap/settings.cpp
--- kdepim-runtime-4.4.5/resources/imap/settings.cpp 2009-12-14 12:54:43.000000000 +0200
+++ kdepim-runtime-4.4.6/resources/imap/settings.cpp 2010-09-10 02:32:13.000000000 +0300
@@ -42,6 +42,8 @@
K_GLOBAL_STATIC( SettingsHelper, s_globalSettings )
+static const int s_ModeGSSAPI = 7;
+
Settings *Settings::self()
{
if ( !s_globalSettings->q ) {
@@ -68,7 +70,7 @@
void Settings::requestPassword()
{
- if ( !m_password.isEmpty() ) {
+ if ( !m_password.isEmpty() || ( authentication() == s_ModeGSSAPI ) ) {
emit passwordRequestCompleted( m_password, false );
} else {
Wallet *wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId, Wallet::Asynchronous );
@@ -118,7 +120,7 @@
*userRejected = false;
}
- if ( !m_password.isEmpty() )
+ if ( !m_password.isEmpty() || ( authentication() == s_ModeGSSAPI ) )
return m_password;
Wallet* wallet = Wallet::openWallet( Wallet::NetworkWallet(), m_winId );
if ( wallet && wallet->isOpen() && wallet->hasFolder( "imap" ) ) {
diff -uNr kdepim-runtime-4.4.5/resources/mailtransport_dummy/Messages.sh kdepim-runtime-4.4.6/resources/mailtransport_dummy/Messages.sh
--- kdepim-runtime-4.4.5/resources/mailtransport_dummy/Messages.sh 2009-12-14 12:54:44.000000000 +0200
+++ kdepim-runtime-4.4.6/resources/mailtransport_dummy/Messages.sh 2010-09-10 02:32:16.000000000 +0300
@@ -1,2 +1,2 @@
#! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/akonadi_mailtransport_resource.pot
+$XGETTEXT *.cpp -o $podir/akonadi_mailtransport_dummy_resource.pot
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=lt_LT.UTF-8, LC_CTYPE=lt_LT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: