From 7c54930007ccee69c0261ebf57ad8e4e8114bb69 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 28 Sep 2021 10:40:21 +0300 Subject: [PATCH] [tracker-miners] Update to 3.2.0. Contributes to JB#55703 --- rpm/0001-Tracker-config-overrides.patch | 4 +- rpm/0002-Fix-systemd-unit-files.patch | 4 +- ...extract-failing-when-seccomp-loading.patch | 8 ++-- ...e-to-the-basic-set-of-file-info-on-a.patch | 14 +++---- ...ruption-caused-by-the-miner-being-re.patch | 4 +- ...-Bus-activation-only-through-systemd.patch | 4 +- ...stModified-also-on-content-specific.patch} | 24 ++++++------ ...ame-on-content-specific-graphs-too-w.patch | 38 ------------------- rpm/tracker-miners.spec | 5 +-- upstream | 2 +- 10 files changed, 33 insertions(+), 74 deletions(-) rename rpm/{0008-Update-nfo-fileLastModified-also-on-content-specific.patch => 0007-Update-nfo-fileLastModified-also-on-content-specific.patch} (65%) delete mode 100644 rpm/0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch diff --git a/rpm/0001-Tracker-config-overrides.patch b/rpm/0001-Tracker-config-overrides.patch index 3fdc7de..7f610d2 100644 --- a/rpm/0001-Tracker-config-overrides.patch +++ b/rpm/0001-Tracker-config-overrides.patch @@ -1,7 +1,7 @@ -From bd8b2262d9e96042f928d1950cf0717928b64107 Mon Sep 17 00:00:00 2001 +From aae99517e9159f9eb7980fb1e7e53606c8b8a04f Mon Sep 17 00:00:00 2001 From: Islam Amer Date: Wed, 12 Nov 2014 18:10:53 +0200 -Subject: [PATCH 1/8] Tracker config overrides +Subject: [PATCH 1/7] Tracker config overrides [schema] change default miner initial sleep to 30 seconds to not hammer the system during bootup Set the default delay for GraphUpdated to 350 instead of upstream default of 1000. Helps fixing JB#11570 diff --git a/rpm/0002-Fix-systemd-unit-files.patch b/rpm/0002-Fix-systemd-unit-files.patch index 49f07b9..9e47e35 100644 --- a/rpm/0002-Fix-systemd-unit-files.patch +++ b/rpm/0002-Fix-systemd-unit-files.patch @@ -1,7 +1,7 @@ -From a2194287ff7be2711f8129d5874edc1afd9404a4 Mon Sep 17 00:00:00 2001 +From 2032310bf3bcfe3eb2822dab1a1a22b8fc234add Mon Sep 17 00:00:00 2001 From: Matti Kosola Date: Tue, 14 Aug 2018 09:35:50 -0400 -Subject: [PATCH 2/8] Fix systemd unit files +Subject: [PATCH 2/7] Fix systemd unit files Signed-off-by: Matti Kosola --- diff --git a/rpm/0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch b/rpm/0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch index 5b83b86..a2240c5 100644 --- a/rpm/0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch +++ b/rpm/0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch @@ -1,7 +1,7 @@ -From a27e73331e42e7e5cb100422aaf04c43f5471ed2 Mon Sep 17 00:00:00 2001 +From 67ce4e797a59d6c6ac5577e150aba80b4d2928d4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 28 Aug 2020 00:04:51 +0200 -Subject: [PATCH 3/8] Prevent tracker-extract failing when seccomp loading +Subject: [PATCH 3/7] Prevent tracker-extract failing when seccomp loading fails on older kernels. JB#50862 --- @@ -9,10 +9,10 @@ Subject: [PATCH 3/8] Prevent tracker-extract failing when seccomp loading 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c -index f8be94924..2fc65df2f 100644 +index 7d88395da..47b555d65 100644 --- a/src/libtracker-miners-common/tracker-seccomp.c +++ b/src/libtracker-miners-common/tracker-seccomp.c -@@ -267,11 +267,16 @@ tracker_seccomp_init (void) +@@ -270,11 +270,16 @@ tracker_seccomp_init (void) #endif g_debug ("Loading seccomp rules."); diff --git a/rpm/0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch b/rpm/0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch index 0db8e11..fa42119 100644 --- a/rpm/0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch +++ b/rpm/0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch @@ -1,7 +1,7 @@ -From f28e21e5e27304c75ce0d464b31de632cc139e3a Mon Sep 17 00:00:00 2001 +From a2f3a944b9986d4a92f1333049027e7eb99d15dc Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Wed, 19 May 2021 13:26:07 +0300 -Subject: [PATCH 4/8] Add also fileSize to the basic set of file info on all +Subject: [PATCH 4/7] Add also fileSize to the basic set of file info on all the graph No need to depend on FileSystem graph to have the sizes. @@ -12,13 +12,13 @@ Related: https://gitlab.gnome.org/GNOME/tracker/-/issues/221 1 file changed, 3 insertions(+) diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c -index 098b105dc..fb7b3152f 100644 +index edb43c9d8..35ac13381 100644 --- a/src/miners/fs/tracker-miner-files.c +++ b/src/miners/fs/tracker-miner-files.c -@@ -2162,6 +2162,9 @@ miner_files_process_file (TrackerMinerFS *fs, - time_str = g_date_time_format_iso8601 (modified); - tracker_resource_set_string (graph_file, "nfo:fileLastModified", time_str); - g_free (time_str); +@@ -2179,6 +2179,9 @@ miner_files_process_file (TrackerMinerFS *fs, + g_file_info_get_display_name (file_info)); + + tracker_resource_set_datetime (graph_file, "nfo:fileLastModified", modified); + + tracker_resource_set_int64 (graph_file, "nfo:fileSize", + g_file_info_get_size (file_info)); diff --git a/rpm/0005-Fix-database-corruption-caused-by-the-miner-being-re.patch b/rpm/0005-Fix-database-corruption-caused-by-the-miner-being-re.patch index afb6d06..ceedc3c 100644 --- a/rpm/0005-Fix-database-corruption-caused-by-the-miner-being-re.patch +++ b/rpm/0005-Fix-database-corruption-caused-by-the-miner-being-re.patch @@ -1,7 +1,7 @@ -From 2d180086e2859b9a282e1c9338fa73424a498107 Mon Sep 17 00:00:00 2001 +From 8b4374744c566561c0fa4dd45139b79df0667c37 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Wed, 7 Jul 2021 13:05:57 +0300 -Subject: [PATCH 5/8] Fix database corruption caused by the miner being +Subject: [PATCH 5/7] Fix database corruption caused by the miner being restarted during setup. Install the signal handlers before starting database setup so if the diff --git a/rpm/0006-Allow-D-Bus-activation-only-through-systemd.patch b/rpm/0006-Allow-D-Bus-activation-only-through-systemd.patch index eaccc20..0c36175 100644 --- a/rpm/0006-Allow-D-Bus-activation-only-through-systemd.patch +++ b/rpm/0006-Allow-D-Bus-activation-only-through-systemd.patch @@ -1,7 +1,7 @@ -From d92cd99e6558e867bcb914cdb1559aaf67f9fd34 Mon Sep 17 00:00:00 2001 +From f629b2ef69bf24932bc85cc8314208983a652525 Mon Sep 17 00:00:00 2001 From: Simo Piiroinen Date: Thu, 12 Aug 2021 08:26:21 +0300 -Subject: [PATCH 6/8] Allow D-Bus activation only through systemd +Subject: [PATCH 6/7] Allow D-Bus activation only through systemd Starting D-Bus services should happen only via systemd. Using a dummy Exec line in D-Bus configuration ensures that systemd can't be bypassed. diff --git a/rpm/0008-Update-nfo-fileLastModified-also-on-content-specific.patch b/rpm/0007-Update-nfo-fileLastModified-also-on-content-specific.patch similarity index 65% rename from rpm/0008-Update-nfo-fileLastModified-also-on-content-specific.patch rename to rpm/0007-Update-nfo-fileLastModified-also-on-content-specific.patch index ab799af..9b17b9f 100644 --- a/rpm/0008-Update-nfo-fileLastModified-also-on-content-specific.patch +++ b/rpm/0007-Update-nfo-fileLastModified-also-on-content-specific.patch @@ -1,7 +1,7 @@ -From 3ca4979071a832aabddfb99b7f3933d6993f35c3 Mon Sep 17 00:00:00 2001 +From 739d32a1cbbe9b243841a3ba8902517fd11ce02d Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 21 Sep 2021 19:38:08 +0300 -Subject: [PATCH 8/8] Update nfo:fileLastModified also on content specific +Subject: [PATCH 7/7] Update nfo:fileLastModified also on content specific graphs Executing 'touch' on a file was updating only tracker:FileSystem. @@ -10,22 +10,21 @@ Executing 'touch' on a file was updating only tracker:FileSystem. 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c -index d1c1dc841..d886650e6 100644 +index 35ac13381..8d68b2dc7 100644 --- a/src/miners/fs/tracker-miner-files.c +++ b/src/miners/fs/tracker-miner-files.c -@@ -2190,9 +2190,10 @@ miner_files_process_file_attributes (TrackerMinerFS *fs, +@@ -2207,8 +2207,9 @@ miner_files_process_file_attributes (TrackerMinerFS *fs, GFileInfo *info, TrackerSparqlBuffer *buffer) { - TrackerResource *resource; + TrackerResource *resource, *graph_file; - time_t time_; - gchar *uri, *time_str; + gchar *uri; + const gchar *mime_type, *graph; GDateTime *modified; - - uri = g_file_get_uri (file); -@@ -2210,9 +2211,18 @@ miner_files_process_file_attributes (TrackerMinerFS *fs, + #ifdef GIO_SUPPORTS_CREATION_TIME + GDateTime *accessed, *created; +@@ -2233,8 +2234,17 @@ miner_files_process_file_attributes (TrackerMinerFS *fs, if (!modified) modified = g_date_time_new_from_unix_utc (0); @@ -33,17 +32,16 @@ index d1c1dc841..d886650e6 100644 + graph = tracker_extract_module_manager_get_graph (mime_type); + /* Update nfo:fileLastModified */ - time_str = g_date_time_format_iso8601 (modified); - tracker_resource_set_string (resource, "nfo:fileLastModified", time_str); + tracker_resource_set_datetime (resource, "nfo:fileLastModified", modified); + if (graph) { + graph_file = tracker_resource_new (uri); -+ tracker_resource_set_string (graph_file, "nfo:fileLastModified", time_str); ++ tracker_resource_set_datetime (graph_file, "nfo:fileLastModified", modified); + tracker_sparql_buffer_push (buffer, file, graph, graph_file); + g_clear_object (&graph_file); + } g_date_time_unref (modified); - g_free (time_str); + #ifdef GIO_SUPPORTS_CREATION_TIME -- 2.31.1 diff --git a/rpm/0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch b/rpm/0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch deleted file mode 100644 index fa4b7f1..0000000 --- a/rpm/0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5765e58d901e6ac9e9b68f47390ef70e16f7dccc Mon Sep 17 00:00:00 2001 -From: Pekka Vuorela -Date: Tue, 21 Sep 2021 18:26:24 +0300 -Subject: [PATCH 7/8] Update nfo:fileName on content specific graphs too when - moved - -Moved files were updating nfo:fileName only in tracker:FileSystem. - -Fixes: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/194 ---- - src/miners/fs/tracker-miner-files.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c -index fb7b3152f..d1c1dc841 100644 ---- a/src/miners/fs/tracker-miner-files.c -+++ b/src/miners/fs/tracker-miner-files.c -@@ -2423,14 +2423,16 @@ miner_files_move_file (TrackerMinerFS *fs, - "} INSERT {" - " GRAPH ?g {" - " <%s> a nfo:FileDataObject ; " -+ " nfo:fileName \"%s\" ; " - " ?p ?o " - " }" - "} WHERE {" - " GRAPH ?g {" - " <%s> ?p ?o " - " }" -+ " FILTER (?p != nfo:fileName) . " - "}", -- source_uri, uri, source_uri); -+ source_uri, uri, display_name, source_uri); - g_free (container_clause); - - if (recursive) { --- -2.31.1 - diff --git a/rpm/tracker-miners.spec b/rpm/tracker-miners.spec index 9eb2387..2196316 100644 --- a/rpm/tracker-miners.spec +++ b/rpm/tracker-miners.spec @@ -1,6 +1,6 @@ Name: tracker-miners Summary: Tracker miners and metadata extractors -Version: 3.1.2 +Version: 3.2.0 Release: 1 License: LGPLv2+ and GPLv2+ URL: https://wiki.gnome.org/Projects/Tracker @@ -13,8 +13,7 @@ Patch3: 0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch Patch4: 0004-Add-also-fileSize-to-the-basic-set-of-file-info-on-a.patch Patch5: 0005-Fix-database-corruption-caused-by-the-miner-being-re.patch Patch6: 0006-Allow-D-Bus-activation-only-through-systemd.patch -Patch7: 0007-Update-nfo-fileName-on-content-specific-graphs-too-w.patch -Patch8: 0008-Update-nfo-fileLastModified-also-on-content-specific.patch +Patch7: 0007-Update-nfo-fileLastModified-also-on-content-specific.patch BuildRequires: meson >= 0.50 BuildRequires: gettext diff --git a/upstream b/upstream index 61ad8d4..87b7f73 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 61ad8d4348b56d105648c9b162097385afc868cd +Subproject commit 87b7f73bad1f8cb8860c9e8ffcfabd4d0e64a269