[SCM] akonadi-search packaging branch, master, updated. debian/16.04.2-2-13-gda7ee74

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit da7ee74d1db1a967bafd09b2a8b2cf5579741a99
Author: Sandro Knauß <hefee at debian.org>
Date:   Mon Oct 10 11:32:58 2016 +0200

    Added patch for Xapian 1.4
    
    Got from upstream
    
    Closes: #839990
---
 debian/changelog                        |  5 +++++
 debian/patches/fix_for_xapian_1.4.patch | 38 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8678335..02f55e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 akonadi-search (16.04.2-3~) UNRELEASED; urgency=medium
 
 
+  [ Sandro Knauß ]
+  * Added fix for Xapian 1.4 (Closes: #839990)
+    fix_for_xapian_1.4.patch
+    (got from upstream)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 10 Oct 2016 11:18:35 +0200
 
 akonadi-search (16.04.2-2) unstable; urgency=medium
diff --git a/debian/patches/fix_for_xapian_1.4.patch b/debian/patches/fix_for_xapian_1.4.patch
new file mode 100644
index 0000000..eadeac6
--- /dev/null
+++ b/debian/patches/fix_for_xapian_1.4.patch
@@ -0,0 +1,38 @@
+From 1e70d63a9439f48b5f1a70accac531a10f4e4239 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil at kde.org>
+Date: Mon, 10 Oct 2016 00:44:58 +0200
+Subject: [PATCH] Create AgePostingSource on heap
+
+There was an undocumented behaviour change in Xapian 1.4 where
+Xapian::Query() no longer internally creates a clone of the
+PostingResource that we pass to it and instead takes a (shared)
+ownership of the pointer that is then re-used later while
+the actual query is being executed, which means that the
+PostingResource must live at least until the query execution
+is finished.
+
+We were creating the AgePostingSource on stack, which lead to
+use-after-free in Xapian 1.4.
+
+BUG: 363741
+FIXED-IN: 5.3.2
+---
+ search/email/emailsearchstore.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/search/email/emailsearchstore.cpp b/search/email/emailsearchstore.cpp
+index f108778..49be40a 100644
+--- a/search/email/emailsearchstore.cpp
++++ b/search/email/emailsearchstore.cpp
+@@ -117,7 +117,6 @@ QString EmailSearchStore::text(int queryId)
+ 
+ Xapian::Query EmailSearchStore::finalizeQuery(const Xapian::Query &query)
+ {
+-    AgePostingSource ps(0);
+-    return Xapian::Query(Xapian::Query::OP_AND_MAYBE, query, Xapian::Query(&ps));
++    return Xapian::Query(Xapian::Query::OP_AND_MAYBE, query, Xapian::Query(new AgePostingSource(0)));
+ }
+ 
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index f4ef402..2b38769 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_failing_tests
+fix_for_xapian_1.4.patch

-- 
akonadi-search packaging