Merge branch 'f19'

ghostscript-gs_sprintf.patch

@@ -28429,3 +28429,19 @@ diff -up ghostscript-9.07/trio/triostr.h.gs_sprintf ghostscript-9.07/trio/triost
 +#endif
 +
 +#endif /* TRIO_TRIOSTR_H */
+--- ghostscript-9.07/base/stdio_.h.gs_sprintf	2013-07-17 15:09:26.756919462 +0100
++++ ghostscript-9.07/base/stdio_.h	2013-07-17 15:10:10.428097610 +0100
+@@ -77,4 +77,13 @@ int unlink(const char *);
+ int snprintf(char *buffer, size_t count, const char *format , ...);
+ #endif
+ 
++/* for our non-localizing (v)s(n)printf() functions */
++/* only *really* required for floating point conversions */
++#include "gssprintf.h"
++
++#ifndef sprintf
++#define sprintf DO_NOT_USE_SPRINTF
++#endif
++
++
+ #endif /* stdio__INCLUDED */

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);

ghostscript.spec

@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 8.1%{?dist}
+Release: 10%{?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,9 +357,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
-* Tue Jul  9 2013 Tim Waugh <twaugh@redhat.com> 9.07-8.1
-- Test build for debugging bug #979681.  WRF_wfloat() now aborts if
-  the buffer would have been truncated.
+* Wed Jul 17 2013 Tim Waugh <twaugh@redhat.com> 9.07-10
+- Added in missing part of gs_sprintf backport: add in the header to
+  stdio_.h. Without this there are problems with va_args on some
+  platforms (bug #979681).
+
+* 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.