Update to 2.0.2

This commit is contained in:
Kalev Lember 2017-10-06 23:06:28 +02:00
parent 475c7c87bb
commit 8c8a4fe134
4 changed files with 7 additions and 39 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/tracker-miners-2.0.0.tar.xz
/tracker-miners-2.0.2.tar.xz

View File

@ -1,33 +0,0 @@
From a0da953c8637bef4ddb963e0d459dfa37b5a643a Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 12 Sep 2017 15:13:46 +0200
Subject: [PATCH] tracker-extract: Skip over virtual elements
It is possible to fool tracker-extract into processing virtual elements
that aren't backed up by files. Those can be safely ignored instead.
https://bugzilla.gnome.org/show_bug.cgi?id=785853
---
src/tracker-extract/tracker-extract-decorator.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c
index cfb51d797..6e251f436 100644
--- a/src/tracker-extract/tracker-extract-decorator.c
+++ b/src/tracker-extract/tracker-extract-decorator.c
@@ -264,6 +264,12 @@ decorator_next_item_cb (TrackerDecorator *decorator,
g_clear_error (&error);
return;
+ } else if (!tracker_decorator_info_get_url (info)) {
+ /* Skip virtual elements with no real file representation */
+ priv->n_extracting_files--;
+ tracker_decorator_info_unref (info);
+ decorator_get_next_file (decorator);
+ return;
}
data = g_new0 (ExtractData, 1);
--
2.14.1

View File

@ -1 +1 @@
SHA512 (tracker-miners-2.0.0.tar.xz) = de702229a2398dca4b862407a6b0631c76fce129f45731be741c0e0110670e2f1e7450ebe23683094269e051766a92060768fafebf32df6d846d765dd0d2cc68
SHA512 (tracker-miners-2.0.2.tar.xz) = 7bf6bdf539392ec1e55f79bbbbabf898ffce7f5cca05b2ea2c2bf3d053214be6166bad28fbfac72120576febfd448a77e5f0cde2f1272755b1fb617210b51919

View File

@ -13,13 +13,10 @@
%global systemd_units tracker-extract.service tracker-miner-apps.service tracker-miner-fs.service tracker-miner-rss.service tracker-writeback.service
Name: tracker-miners
Version: 2.0.0
Release: 3%{?dist}
Version: 2.0.2
Release: 1%{?dist}
Summary: Tracker miners and metadata extractors
# Backported from upstream
Patch0: 0001-tracker-extract-Skip-over-virtual-elements.patch
# libtracker-extract is LGPLv2+; the miners are a mix of GPLv2+ and LGPLv2+ code
License: GPLv2+ and LGPLv2+
URL: https://wiki.gnome.org/Projects/Tracker
@ -129,6 +126,9 @@ rm -f %{buildroot}%{_libdir}/tracker-miners-2.0/*.so
%changelog
* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 2.0.2-1
- Update to 2.0.2
* Tue Sep 19 2017 Kalev Lember <klember@redhat.com> - 2.0.0-3
- Backport a fix for a crash when processing virtual elements (#1488707)