[tracker/f16] Apply patch to fix crash in indexing pdf (Fix by Marek Kašík; Bug #751922)
Deji Akingunola
deji at fedoraproject.org
Wed Dec 14 06:19:25 UTC 2011
commit c9c6fca972d05e3bdff6ce1458f8e03e15750757
Author: Deji Akingunola <dakingun at gmail.com>
Date: Wed Dec 14 01:19:22 2011 -0500
Apply patch to fix crash in indexing pdf (Fix by Marek Kašík; Bug #751922)
tracker-extract-pdf-crash-fix.patch | 11 +++++++++++
tracker-fixdso.patch | 6 +++---
tracker.spec | 9 +++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/tracker-extract-pdf-crash-fix.patch b/tracker-extract-pdf-crash-fix.patch
new file mode 100644
index 0000000..17f327b
--- /dev/null
+++ b/tracker-extract-pdf-crash-fix.patch
@@ -0,0 +1,11 @@
+--- src/tracker-extract/tracker-extract-pdf.c 2011-11-25 09:50:33.000000000 -0500
++++ src/tracker-extract/tracker-extract-pdf.c.new 2011-12-13 22:56:51.251158179 -0500
+@@ -338,7 +338,7 @@
+ len = 0;
+ } else {
+ contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+- if (contents == NULL) {
++ if (contents == NULL || contents == MAP_FAILED) {
+ g_warning ("Could not mmap pdf file '%s': %s\n",
+ filename,
+ g_strerror (errno));
diff --git a/tracker-fixdso.patch b/tracker-fixdso.patch
index 18aa6d5..f6114d5 100644
--- a/tracker-fixdso.patch
+++ b/tracker-fixdso.patch
@@ -1,6 +1,6 @@
---- tracker-0.12.7/tests/libtracker-common/Makefile.in.orig 2011-10-31 18:49:24.625342415 +0000
-+++ tracker-0.12.7/tests/libtracker-common/Makefile.in 2011-10-31 18:50:09.725340614 +0000
-@@ -248,7 +248,7 @@
+--- src/libtracker-common/Makefile.in 2011-11-25 10:46:08.000000000 -0500
++++ src/libtracker-common/Makefile.in.new 2011-12-13 23:49:30.957656410 -0500
+@@ -263,7 +263,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
diff --git a/tracker.spec b/tracker.spec
index 575bb83..0da5743 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -1,12 +1,13 @@
Summary: Desktop-neutral search tool and indexer
Name: tracker
Version: 0.12.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://projects.gnome.org/tracker/
Source0: http://download.gnome.org/sources/tracker/0.12/%{name}-%{version}.tar.xz
Patch0: tracker-fixdso.patch
+Patch1: tracker-extract-pdf-crash-fix.patch
BuildRequires: poppler-glib-devel evolution-devel libxml2-devel libgsf-devel
BuildRequires: libuuid-devel dbus-glib-devel
@@ -89,7 +90,8 @@ This package contains the documentation for tracker
%prep
%setup -q
-%patch0 -p1 -b .fixdso
+%patch0 -p0 -b .fixdso
+%patch1 -p0
%global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
@@ -208,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/gtk-doc/html/ontology/
%changelog
+* Tue Dec 13 2011 Deji Akingunola <dakingun at gmail.com> - 0.12.8-2
+- Apply patch to fix crash in indexing pdf (Fix by Marek Kašík; Bug #751922)
+
* Mon Dec 05 2011 Deji Akingunola <dakingun at gmail.com> - 0.12.8-1
- Update to 0.12.8
- http://download.gnome.org/sources/tracker/0.12/tracker-0.12.8.news
More information about the scm-commits
mailing list