- rel 3; upstream nntp fix

Changed files:
    kde4-kdepimlibs-branch.diff -> 1.18
    kde4-kdepimlibs-nntp.patch -> 1.2
    kde4-kdepimlibs.spec -> 1.102

diff --git a/kde4-kdepimlibs-branch.diff b/kde4-kdepimlibs-branch.diff
index 71b8d300bb4081dd7597c31a7f4fdc65a4fb336f..789c650ec33568dbb88bf33546cf2aa5f78545fc 100644 (file)
--- a/kde4-kdepimlibs-branch.diff
+++ b/kde4-kdepimlibs-branch.diff
@@ -1,7 +1,7 @@
 Index: kcal/incidencebase.cpp
 ===================================================================
---- kcal/incidencebase.cpp     (.../tags/KDE/4.3.4/kdepimlibs) (wersja 1061285)
-+++ kcal/incidencebase.cpp     (.../branches/KDE/4.3/kdepimlibs)       (wersja 1061285)
+--- kcal/incidencebase.cpp     (.../tags/KDE/4.3.4/kdepimlibs) (wersja 1062713)
++++ kcal/incidencebase.cpp     (.../branches/KDE/4.3/kdepimlibs)       (wersja 1062713)
 @@ -477,7 +477,9 @@
      d->mUpdatedPending = true;
    } else {
@@ -13,10 +13,25 @@ Index: kcal/incidencebase.cpp
      }
    }
  }
+Index: kabc/plugins/ldapkio/resourceldapkio.cpp
+===================================================================
+--- kabc/plugins/ldapkio/resourceldapkio.cpp   (.../tags/KDE/4.3.4/kdepimlibs) (wersja 1062713)
++++ kabc/plugins/ldapkio/resourceldapkio.cpp   (.../branches/KDE/4.3/kdepimlibs)       (wersja 1062713)
+@@ -216,7 +216,9 @@
+     if ( mod ) {
+       tmp += KLDAP::Ldif::assembleLine( QLatin1String( "replace" ), attr ) + '\n';
+     }
+-    tmp += KLDAP::Ldif::assembleLine( attr, value ) + '\n';
++    if ( !value.isEmpty() ) {
++      tmp += KLDAP::Ldif::assembleLine( attr, value ) + '\n';
++    }
+     if ( mod ) {
+       tmp += "-\n";
+     }
 Index: akonadi/CMakeLists.txt
 ===================================================================
---- akonadi/CMakeLists.txt     (.../tags/KDE/4.3.4/kdepimlibs) (wersja 1061285)
-+++ akonadi/CMakeLists.txt     (.../branches/KDE/4.3/kdepimlibs)       (wersja 1061285)
+--- akonadi/CMakeLists.txt     (.../tags/KDE/4.3.4/kdepimlibs) (wersja 1062713)
++++ akonadi/CMakeLists.txt     (.../branches/KDE/4.3/kdepimlibs)       (wersja 1062713)
 @@ -144,11 +144,11 @@
  target_link_libraries( akonadi-kde ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${AKONADI_COMMON_LIBRARIES} )
  set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )

diff --git a/kde4-kdepimlibs-nntp.patch b/kde4-kdepimlibs-nntp.patch
index aa83e883628fdb92098c55f8202546832d388b07..a076170577491133e335fd54f57e2d201b2e2718 100644 (file)
--- a/kde4-kdepimlibs-nntp.patch
+++ b/kde4-kdepimlibs-nntp.patch
@@ -1,11 +1,28 @@
---- kdepimlibs-4.3.4/kioslave/nntp/nntp.cpp.org        2009-06-23 13:14:08.000000000 +0200
-+++ kdepimlibs-4.3.4/kioslave/nntp/nntp.cpp    2009-12-11 23:42:10.259557697 +0100
-@@ -517,7 +517,7 @@
+--- kdepimlibs/kioslave/nntp/nntp.cpp  2009/12/14 22:08:32     1062489
++++ kdepimlibs/kioslave/nntp/nntp.cpp  2009/12/14 22:17:59     1062490
+@@ -517,6 +517,11 @@
    if (firstSerNum == 0)
      return true;
    first = qMax( first, firstSerNum );
--  if ( max > 0 && lastSerNum - first > max )
-+  if ( max > 0 && max <= lastSerNum && lastSerNum - first > max )
++  if ( lastSerNum < first ) { // No need to fetch anything
++    // note: this also ensure that "lastSerNum - first" is not negative
++    // in the next test (in "unsigned long" computation this leads to an overflow
++    return true;
++  }
+   if ( max > 0 && lastSerNum - first > max )
      first = lastSerNum - max + 1;
  
-   DBG << "Starting from serial number: " << first << " of " << firstSerNum << " - " << lastSerNum;
+--- kdepimlibs/kioslave/nntp/nntp.cpp  2009/12/14 22:17:59     1062490
++++ kdepimlibs/kioslave/nntp/nntp.cpp  2009/12/14 22:18:02     1062491
+@@ -628,8 +628,10 @@
+     return true; // no articles selected
+   if ( res == 500 )
+     notSupported = true; // unknwon command
+-  if ( res != 224 )
++  if ( res != 224 ) {
++    unexpected_response( res, "XOVER" );
+     return false;
++  }
+ 
+   long msgSize;
+   QString name;

diff --git a/kde4-kdepimlibs.spec b/kde4-kdepimlibs.spec
index 4b222155506f0b189d69bcc5ed8125e24168dd2e..1abee6be4530d9d640fbfd1fbce1b84593faab7f 100644 (file)
--- a/kde4-kdepimlibs.spec
+++ b/kde4-kdepimlibs.spec
@@ -10,7 +10,7 @@ Summary:      Personal Information Management (PIM) libraries for KDE
 Summary(pl.UTF-8):     Biblioteki zarządzania informacjami osobistymi (PIM) dla KDE
 Name:          kde4-kdepimlibs
 Version:       4.3.4
-Release:       2
+Release:       3
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2