[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-1-8-g1ea4e6a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=443657f

The following commit has been merged in the master branch:
commit 443657f59d0894766b1e7bdee20ba2e07e94118e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Sep 18 17:11:08 2014 +0200

    Import upstream fixes
---
 debian/changelog                                   |  7 +++++++
 debian/patches/series                              |  3 +++
 ...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 ++++++++++++++++++++
 5 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 423803d..3114357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ akonadi (1.13.0-2) UNRELEASED; urgency=medium
   * Bump the priority of all the binaries, except akonadi-dbg, to optional
     (as other packages depend on them).
 
+  [ Maximiliano Curia ]
+  * New upstream patch: upstream-fix_typo_in_if_condition
+  * New upstream patch: upstream-
+    fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
+  * New upstream patch: upstream-
+    do_not_crash_when_setmntent_returns_NULL
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Sep 2014 14:39:41 +0200
 
 akonadi (1.13.0-1) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..4d90184 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+upstream-fix_typo_in_if_condition
+upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
+upstream-do_not_crash_when_setmntent_returns_NULL
diff --git a/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL b/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL
new file mode 100644
index 0000000..f66b429
--- /dev/null
+++ b/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..e17f9a0
--- /dev/null
+++ b/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000..2373ccb
--- /dev/null
+++ b/debian/patches/upstream-fix_typo_in_if_condition
@@ -0,0 +1,22 @@
+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" );
+   }
+ 

-- 
Akonadi packaging