[SCM] Akonadi packaging branch, kubuntu_unstable, updated. debian/1.13.0-2-7-g3a99c8b

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=3a99c8b

The following commit has been merged in the kubuntu_unstable branch:
commit 3a99c8b44efc33fde199b21e40054e5eca8016aa
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 12 06:41:05 2015 +0200

    rip out legacy patches
---
 debian/patches/series                              |  4 ---
 ...stream-do_not_crash_when_setmntent_returns_NULL | 24 -----------------
 ...m-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN | 19 --------------
 debian/patches/upstream-fix_typo_in_if_condition   | 22 ----------------
 .../upstream_dont_call_insert_from_Q_ASSERT        | 30 ----------------------
 5 files changed, 99 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ff22ffc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-upstream-fix_typo_in_if_condition
-upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
-upstream-do_not_crash_when_setmntent_returns_NULL
-upstream_dont_call_insert_from_Q_ASSERT
diff --git a/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL b/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL
deleted file mode 100644
index f66b429..0000000
--- a/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL
+++ /dev/null
@@ -1,24 +0,0 @@
-commit ca59eb345cfef368242929ea33beca4bff837e9d
-Author: Dan Vrátil <dvratil at redhat.com>
-Date:   Thu Sep 18 16:54:26 2014 +0200
-
-    Don't crash when setmntent returns NULL
-    
-    setmntent can fail when there's no /etc/mtab file for instance and
-    passing NULL pointer to getmntent crashes, so we need to return when
-    this happens.
-
-diff --git a/server/src/utils.cpp b/server/src/utils.cpp
-index b04a812..b51c330 100644
---- a/server/src/utils.cpp
-+++ b/server/src/utils.cpp
-@@ -179,6 +179,9 @@ QString Utils::getDirectoryFileSystem(const QString &directory)
-     QString bestMatchFS;
- 
-     FILE *mtab = setmntent("/etc/mtab", "r");
-+    if (!mtab) {
-+        return QString();
-+    }
-     while (mntent *mnt = getmntent(mtab)) {
-         if (qstrcmp(mnt->mnt_type, MNTTYPE_IGNORE) == 0) {
-             continue;
diff --git a/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN b/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
deleted file mode 100644
index e17f9a0..0000000
--- a/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 01c86229f9e26d9e036f6f2ab405659ed836b5c0
-Author: Dan Vrátil <dvratil at redhat.com>
-Date:   Mon Sep 8 15:36:18 2014 +0200
-
-    Fix buffer overflow in AKTEST_FAKESERVER_MAIN()
-
-diff --git a/shared/aktest.h b/shared/aktest.h
-index b1b9caa..3026304 100644
---- a/shared/aktest.h
-+++ b/shared/aktest.h
-@@ -57,7 +57,7 @@ int main(int argc, char **argv) \
-       } \
-   } \
-   TestObject tc; \
--  char **fakeArgv = (char **) malloc(options.count()); \
-+  char **fakeArgv = (char **) malloc(options.count() * sizeof(char**)); \
-   for (int i = 0; i < options.count(); ++i) { \
-       fakeArgv[i] = options[i]; \
-   } \
diff --git a/debian/patches/upstream-fix_typo_in_if_condition b/debian/patches/upstream-fix_typo_in_if_condition
deleted file mode 100644
index 2373ccb..0000000
--- a/debian/patches/upstream-fix_typo_in_if_condition
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e52f9be20e566e507e77421f1243f51aa2fe8e55
-Author: Dan Vrátil <dvratil at redhat.com>
-Date:   Mon Aug 25 14:35:14 2014 +0200
-
-    Fix typo in if condition
-    
-    BUG: 338483
-    FIXED-IN: 1.13.1
-
-diff --git a/server/src/handler/akappend.cpp b/server/src/handler/akappend.cpp
-index 43f03ba..ad3682f 100644
---- a/server/src/handler/akappend.cpp
-+++ b/server/src/handler/akappend.cpp
-@@ -380,7 +380,7 @@ bool AkAppend::parseStream()
-   if ( itemFlags.incremental ) {
-     throw HandlerException( "Incremental flags changes are not allowed in AK-APPEND" );
-   }
--  if ( itemTagsRID.incremental || itemTagsRID.incremental ) {
-+  if ( itemTagsRID.incremental || itemTagsGID.incremental ) {
-     throw HandlerException( "Incremental tags changes are not allowed in AK-APPEND" );
-   }
- 
diff --git a/debian/patches/upstream_dont_call_insert_from_Q_ASSERT b/debian/patches/upstream_dont_call_insert_from_Q_ASSERT
deleted file mode 100644
index 80ebae9..0000000
--- a/debian/patches/upstream_dont_call_insert_from_Q_ASSERT
+++ /dev/null
@@ -1,30 +0,0 @@
-commit c516ec5c28d603aea0df6165f66a3a5d0a0191c4
-Author: Dan Vrátil <dvratil at redhat.com>
-Date:   Fri Sep 19 10:50:23 2014 +0200
-
-    Don't call insert() from Q_ASSERT - breaks unit-tests in Release mode
-
-diff --git a/server/tests/unittest/collectionreferencetest.cpp b/server/tests/unittest/collectionreferencetest.cpp
-index 1700c75..1b10c55 100644
---- a/server/tests/unittest/collectionreferencetest.cpp
-+++ b/server/tests/unittest/collectionreferencetest.cpp
-@@ -45,7 +45,8 @@ public:
-         Resource res;
-         res.setId(1);
-         res.setName(QLatin1String(name));
--        Q_ASSERT(res.insert());
-+        const bool success = res.insert();
-+        Q_ASSERT(success);
-         mResource = res;
-         return res;
-     }
-@@ -57,7 +58,8 @@ public:
-         col.setName(QLatin1String(name));
-         col.setRemoteId(QLatin1String(name));
-         col.setResource(mResource);
--        Q_ASSERT(col.insert());
-+        const bool success = col.insert();
-+        Q_ASSERT(success);
-         return col;
-     }
- 

-- 
Akonadi packaging