From d4cc58dc0f1bd96f15a7248b51cb7c4cfb04f7c5 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 8 Jul 2013 12:29:42 +0100
Subject: [PATCH] Upstream patch from bug #693921 to avoid zfapi crash (bug
 #969785).

Resolves: rhbz#969785
---
 ghostscript-zfapi-crash.patch | 12 ++++++++++++
 ghostscript.spec              |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 ghostscript-zfapi-crash.patch

diff --git a/ghostscript-zfapi-crash.patch b/ghostscript-zfapi-crash.patch
new file mode 100644
index 0000000..b40287c
--- /dev/null
+++ b/ghostscript-zfapi-crash.patch
@@ -0,0 +1,12 @@
+diff -up ghostscript-9.07/psi/zfapi.c.zfapi-crash ghostscript-9.07/psi/zfapi.c
+--- ghostscript-9.07/psi/zfapi.c.zfapi-crash	2013-07-08 12:27:53.136718093 +0100
++++ ghostscript-9.07/psi/zfapi.c	2013-07-08 12:28:17.241826842 +0100
+@@ -2141,6 +2141,8 @@ FAPI_char(i_ctx_t *i_ctx_p, bool bBuildG
+         /* initialise the FAPI font, this includes language specific stuff */
+         I->ff = ps_ff_stub;
+ 
++        I->client_ctx_p = i_ctx_p;
++
+         if (bBuildGlyph && !bCID) {
+             if (r_type(op) != t_name) {
+                 name_enter_string(imemory, ".notdef", op);
diff --git a/ghostscript.spec b/ghostscript.spec
index 86622e5..431bcfb 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -30,6 +30,7 @@ Patch11: ghostscript-pdfwrite-segfault.patch
 Patch12: ghostscript-strange-fonts.patch
 Patch13: ghostscript-wrf-snprintf.patch
 Patch14: ghostscript-cups-colord.patch
+Patch15: ghostscript-zfapi-crash.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 Requires: poppler-data
@@ -154,6 +155,9 @@ rm -rf expat freetype icclib jasper jpeg lcms2 libpng openjpeg zlib cups/libs
 # Use correct colord device ID in gstoraster.
 %patch14 -p1 -b .cups-colord
 
+# Upstream patch from bug #693921 to avoid zfapi crash (bug #969785).
+%patch15 -p1 -b .zfapi-crash
+
 # Remove pdfopt man pages which were mistakenly left in (bug #963882).
 rm man/{de/,}pdfopt.1
 
@@ -353,6 +357,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Jul  8 2013 Tim Waugh <twaugh@redhat.com> 9.07-9
+- Upstream patch from bug #693921 to avoid zfapi crash (bug #969785).
+
 * Mon Jul  1 2013 Tim Waugh <twaugh@redhat.com> 9.07-8
 - Use correct colord device ID in gstoraster.