diff --git a/tracker-1.12.0.tar.xz b/tracker-1.12.0.tar.xz deleted file mode 100644 index 202deee..0000000 --- a/tracker-1.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83193dd8c05e3e8b05fa8f1cfb80964fa78f7aeb86f3302fa4be6ec7e6ff596f -size 5061964 diff --git a/tracker-1.12.1.tar.xz b/tracker-1.12.1.tar.xz new file mode 100644 index 0000000..29878e6 --- /dev/null +++ b/tracker-1.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b912cb06944abc676b4644219db777896455fb33aa5589f0b46e417bc9b82a4b +size 5051304 diff --git a/tracker-extras.changes b/tracker-extras.changes index 60741fb..2a82c91 100644 --- a/tracker-extras.changes +++ b/tracker-extras.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Jun 28 20:27:38 UTC 2017 - zaitor@opensuse.org + +- Update to version 1.12.1: + + libtracker-sparql: + - Add osinfo to the default namespace. + - Protect sqlite3_bind* with interface lock. + + tracker-extract: Whitelist openat(), with caveats. + + Updated translations. +- Drop upstream fixed patches: + + tracker-libtracker-sparql-add-osinfo-ontology.patch. + + tracker-libtracker-common-whitelist-openat.patch. + + tracker-libtracker-data-protect-sqlite3_bind.patch. + +------------------------------------------------------------------- +Sun Jun 25 19:41:08 UTC 2017 - zaitor@opensuse.org + +- Add tracker-libtracker-data-protect-sqlite3_bind.patch: + libtracker-data: Protect sqlite3_bind*() with interface lock. + There may be multiple cursors/db_statements from the same db + interface being accessed from multiple threads. This must be + under the TrackerDBInterface lock in order to prevent threading + issues (rh#1404285). + ------------------------------------------------------------------- Tue May 23 15:13:21 UTC 2017 - zaitor@opensuse.org diff --git a/tracker-extras.spec b/tracker-extras.spec index 22eeedb..ce3c4fa 100644 --- a/tracker-extras.spec +++ b/tracker-extras.spec @@ -41,7 +41,7 @@ # Do not edit this auto generated file! Edit tracker.spec. Name: tracker-extras %define _name tracker -Version: 1.12.0 +Version: 1.12.1 Release: 0 %define TrackerAPI 1.0 %define RPMTrackerAPI 1_0 @@ -54,10 +54,6 @@ Source0: http://download.gnome.org/sources/tracker/1.12/%{_name}-%{versio Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch -# PATCH-FIX-UPSTREAM tracker-libtracker-sparql-add-osinfo-ontology.patch bgo#780968 zaitor@opensuse.org -- libtracker-sparql: Add osinfo ontology to the default TrackerNamespace -Patch1: tracker-libtracker-sparql-add-osinfo-ontology.patch -# PATCH-FIX-UPSTREAM tracker-libtracker-common-whitelist-openat.patch bgo#782514 zaitor@opensuse.org -- libtracker-common: Whitelist openat() -Patch2: tracker-libtracker-common-whitelist-openat.patch BuildRequires: enca-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -429,8 +425,6 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif diff --git a/tracker-libtracker-common-whitelist-openat.patch b/tracker-libtracker-common-whitelist-openat.patch deleted file mode 100644 index e3b65e9..0000000 --- a/tracker-libtracker-common-whitelist-openat.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 620a1be1636b53a39a5b740abd695b4e85e9ba3a Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Tue, 9 May 2017 14:55:26 +0200 -Subject: libtracker-common: Whitelist openat() - -With the same caveats than open(). - -https://bugzilla.gnome.org/show_bug.cgi?id=782514 ---- - src/libtracker-common/tracker-seccomp.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/src/libtracker-common/tracker-seccomp.c b/src/libtracker-common/tracker-seccomp.c -index 1af380c..ec873f5 100644 ---- a/src/libtracker-common/tracker-seccomp.c -+++ b/src/libtracker-common/tracker-seccomp.c -@@ -182,8 +182,8 @@ tracker_seccomp_init (void) - SCMP_CMP(0, SCMP_CMP_EQ, 2)) < 0) - goto out; - -- /* Special requirements for open, allow O_RDONLY calls, but fail -- * if write permissions are requested. -+ /* Special requirements for open/openat, allow O_RDONLY calls, -+ * but fail if write permissions are requested. - */ - if (seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 1, - SCMP_CMP(1, SCMP_CMP_MASKED_EQ, O_WRONLY | O_RDWR, 0)) < 0) -@@ -195,6 +195,16 @@ tracker_seccomp_init (void) - SCMP_CMP(1, SCMP_CMP_MASKED_EQ, O_RDWR, O_RDWR)) < 0) - goto out; - -+ if (seccomp_rule_add (ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 1, -+ SCMP_CMP(2, SCMP_CMP_MASKED_EQ, O_WRONLY | O_RDWR, 0)) < 0) -+ goto out; -+ if (seccomp_rule_add (ctx, SCMP_ACT_ERRNO (EACCES), SCMP_SYS(openat), 1, -+ SCMP_CMP(2, SCMP_CMP_MASKED_EQ, O_WRONLY, O_WRONLY)) < 0) -+ goto out; -+ if (seccomp_rule_add (ctx, SCMP_ACT_ERRNO (EACCES), SCMP_SYS(openat), 1, -+ SCMP_CMP(2, SCMP_CMP_MASKED_EQ, O_RDWR, O_RDWR)) < 0) -+ goto out; -+ - g_debug ("Loading seccomp rules."); - - if (seccomp_load (ctx) >= 0) --- -cgit v0.12 - diff --git a/tracker-libtracker-sparql-add-osinfo-ontology.patch b/tracker-libtracker-sparql-add-osinfo-ontology.patch deleted file mode 100644 index 1d52db1..0000000 --- a/tracker-libtracker-sparql-add-osinfo-ontology.patch +++ /dev/null @@ -1,42 +0,0 @@ -From be575015414983ca5046319c500b35d6c668fbf5 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Mon, 3 Apr 2017 15:15:41 +0200 -Subject: libtracker-sparql: Add osinfo ontology to the default - TrackerNamespace - -Otherwise namespace lookups will come out NULL. - -https://bugzilla.gnome.org/show_bug.cgi?id=780968 ---- - src/libtracker-sparql/tracker-namespace-manager.c | 1 + - src/libtracker-sparql/tracker-ontologies.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/libtracker-sparql/tracker-namespace-manager.c b/src/libtracker-sparql/tracker-namespace-manager.c -index 21a5a48..d287c39 100644 ---- a/src/libtracker-sparql/tracker-namespace-manager.c -+++ b/src/libtracker-sparql/tracker-namespace-manager.c -@@ -152,6 +152,7 @@ tracker_namespace_manager_get_default () - tracker_namespace_manager_add_prefix (manager, "nmm", TRACKER_PREFIX_NMM); - tracker_namespace_manager_add_prefix (manager, "mlo", TRACKER_PREFIX_MLO); - tracker_namespace_manager_add_prefix (manager, "mfo", TRACKER_PREFIX_MFO); -+ tracker_namespace_manager_add_prefix (manager, "osinfo", TRACKER_PREFIX_OSINFO); - - g_once_init_leave (&default_namespace_manager__volatile, manager); - } -diff --git a/src/libtracker-sparql/tracker-ontologies.h b/src/libtracker-sparql/tracker-ontologies.h -index 124ffd8..24e1efe 100644 ---- a/src/libtracker-sparql/tracker-ontologies.h -+++ b/src/libtracker-sparql/tracker-ontologies.h -@@ -42,6 +42,7 @@ G_BEGIN_DECLS - #define TRACKER_PREFIX_NAO "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#" - #define TRACKER_PREFIX_NID3 "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#" - #define TRACKER_PREFIX_NFO "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#" -+#define TRACKER_PREFIX_OSINFO "http://www.tracker-project.org/ontologies/osinfo#" - - /* Temporary */ - #define TRACKER_PREFIX_SLO "http://www.tracker-project.org/temp/slo#" --- -cgit v0.12 - - diff --git a/tracker.changes b/tracker.changes index 60741fb..2a82c91 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Jun 28 20:27:38 UTC 2017 - zaitor@opensuse.org + +- Update to version 1.12.1: + + libtracker-sparql: + - Add osinfo to the default namespace. + - Protect sqlite3_bind* with interface lock. + + tracker-extract: Whitelist openat(), with caveats. + + Updated translations. +- Drop upstream fixed patches: + + tracker-libtracker-sparql-add-osinfo-ontology.patch. + + tracker-libtracker-common-whitelist-openat.patch. + + tracker-libtracker-data-protect-sqlite3_bind.patch. + +------------------------------------------------------------------- +Sun Jun 25 19:41:08 UTC 2017 - zaitor@opensuse.org + +- Add tracker-libtracker-data-protect-sqlite3_bind.patch: + libtracker-data: Protect sqlite3_bind*() with interface lock. + There may be multiple cursors/db_statements from the same db + interface being accessed from multiple threads. This must be + under the TrackerDBInterface lock in order to prevent threading + issues (rh#1404285). + ------------------------------------------------------------------- Tue May 23 15:13:21 UTC 2017 - zaitor@opensuse.org diff --git a/tracker.spec b/tracker.spec index bbb2d6a..13d1371 100644 --- a/tracker.spec +++ b/tracker.spec @@ -40,7 +40,7 @@ Name: tracker %define _name tracker -Version: 1.12.0 +Version: 1.12.1 Release: 0 %define TrackerAPI 1.0 %define RPMTrackerAPI 1_0 @@ -53,10 +53,6 @@ Source0: http://download.gnome.org/sources/tracker/1.12/%{_name}-%{versio Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch -# PATCH-FIX-UPSTREAM tracker-libtracker-sparql-add-osinfo-ontology.patch bgo#780968 zaitor@opensuse.org -- libtracker-sparql: Add osinfo ontology to the default TrackerNamespace -Patch1: tracker-libtracker-sparql-add-osinfo-ontology.patch -# PATCH-FIX-UPSTREAM tracker-libtracker-common-whitelist-openat.patch bgo#782514 zaitor@opensuse.org -- libtracker-common: Whitelist openat() -Patch2: tracker-libtracker-common-whitelist-openat.patch BuildRequires: enca-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -428,8 +424,6 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif