[SCM] akonadi-search packaging branch, master, updated. debian/16.04.3-1-31-gea413d9

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 21 17:19:39 UTC 2016


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

The following commit has been merged in the master branch:
commit 3363324cb7efb71072041310cd5f96bd9e581701
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Oct 13 21:07:40 2016 +0200

    Refresh patches
---
 debian/patches/fix_for_xapian_1.4.patch | 38 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 39 deletions(-)

diff --git a/debian/patches/fix_for_xapian_1.4.patch b/debian/patches/fix_for_xapian_1.4.patch
deleted file mode 100644
index eadeac6..0000000
--- a/debian/patches/fix_for_xapian_1.4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 2b38769..f4ef402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_failing_tests
-fix_for_xapian_1.4.patch

-- 
akonadi-search packaging



More information about the pkg-kde-commits mailing list