Bug#926948: unblock: tracker/2.1.8-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package tracker
This fixes crash bug #926946 that I filed, although we don't have an
existing report of it / steps to reproduce, so you might not consider
this really RC. Up to you.
unblock tracker/2.1.8-2
Cheers,
--
Iain Lane [ iain@orangesquash.org.uk ]
Debian Developer [ laney@debian.org ]
Ubuntu Developer [ laney@ubuntu.com ]
diff -Nru tracker-2.1.8/debian/changelog tracker-2.1.8/debian/changelog
--- tracker-2.1.8/debian/changelog 2019-02-21 01:26:33.000000000 +0000
+++ tracker-2.1.8/debian/changelog 2019-04-12 16:20:46.000000000 +0100
@@ -1,3 +1,10 @@
+tracker (2.1.8-2) unstable; urgency=medium
+
+ * gbp.conf: Update debian-branch for buster
+ * Cherry-pick upstream patch to fix crash (Closes: #926946)
+
+ -- Iain Lane <laney@debian.org> Fri, 12 Apr 2019 16:20:46 +0100
+
tracker (2.1.8-1) unstable; urgency=medium
* New upstream release
diff -Nru tracker-2.1.8/debian/control tracker-2.1.8/debian/control
--- tracker-2.1.8/debian/control 2019-02-21 01:26:33.000000000 +0000
+++ tracker-2.1.8/debian/control 2019-04-12 16:20:46.000000000 +0100
@@ -6,7 +6,7 @@
Section: utils
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Tim Lunn <tim@feathertop.org>
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>, Tim Lunn <tim@feathertop.org>
Build-Depends: debhelper (>= 11),
gnome-common,
pkg-config,
diff -Nru tracker-2.1.8/debian/gbp.conf tracker-2.1.8/debian/gbp.conf
--- tracker-2.1.8/debian/gbp.conf 2019-02-21 01:26:33.000000000 +0000
+++ tracker-2.1.8/debian/gbp.conf 2019-04-12 16:20:46.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/buster
upstream-branch = upstream/latest
upstream-vcs-tag = %(version)s
diff -Nru tracker-2.1.8/debian/patches/series tracker-2.1.8/debian/patches/series
--- tracker-2.1.8/debian/patches/series 2019-02-21 01:26:33.000000000 +0000
+++ tracker-2.1.8/debian/patches/series 2019-04-12 16:20:46.000000000 +0100
@@ -5,3 +5,4 @@
libtracker-miners-common-Make-g_error-a-soft-error.patch
build-Restore-right-soversion-to-libraries.patch
functional-tests-Require-Bash-for-test-runner.patch
+tracker-miner-Fix-cancellation-of-g_file_enumerator_next_.patch
diff -Nru tracker-2.1.8/debian/patches/tracker-miner-Fix-cancellation-of-g_file_enumerator_next_.patch tracker-2.1.8/debian/patches/tracker-miner-Fix-cancellation-of-g_file_enumerator_next_.patch
--- tracker-2.1.8/debian/patches/tracker-miner-Fix-cancellation-of-g_file_enumerator_next_.patch 1970-01-01 01:00:00.000000000 +0100
+++ tracker-2.1.8/debian/patches/tracker-miner-Fix-cancellation-of-g_file_enumerator_next_.patch 2019-04-12 16:20:46.000000000 +0100
@@ -0,0 +1,43 @@
+From: Andrea Azzarone <andrea.azzarone@canonical.com>
+Date: Mon, 1 Apr 2019 16:52:15 +0100
+Subject: tracker-miner: Fix cancellation of
+ g_file_enumerator_next_files_async
+
+The async op is not owner of the user data, so it may be actually gone in the
+GAsyncReadyCallback. Ensure we only use it on success or on other errors than
+cancelled.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926946
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tracker-miners/+bug/1822629
+Bug-Upstream: https://gitlab.gnome.org/GNOME/tracker/issues/86
+Origin: upstream, commit:465b8031d0a73ac775952c07d0374206746a8a46
+Applied-Upstream: 2.2.2
+---
+ src/libtracker-miner/tracker-crawler.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
+index 93b1ab1..4031d86 100644
+--- a/src/libtracker-miner/tracker-crawler.c
++++ b/src/libtracker-miner/tracker-crawler.c
+@@ -899,7 +899,7 @@ enumerate_next_cb (GObject *object,
+ {
+ DataProviderData *dpd;
+ GList *info;
+- GError *error = NULL;
++ g_autoptr(GError) error = NULL;
+
+ info = g_file_enumerator_next_files_finish (G_FILE_ENUMERATOR (object), result, &error);
+ dpd = user_data;
+@@ -918,9 +918,9 @@ enumerate_next_cb (GObject *object,
+ g_warning ("Could not enumerate next item in container / directory '%s', %s",
+ uri, error ? error->message : "no error given");
+ g_free (uri);
++ } else {
++ return;
+ }
+-
+- g_clear_error (&error);
+ } else {
+ /* Done enumerating, start processing what we got ... */
+ data_provider_data_add (dpd);
Reply to: