[ghostscript/f13/master: 5/5] Merge branch 'f12' into f13

[Tim Waugh]

commit bc34ffaf5b77677f387a9cd35f8e37bfc2b6c222
Merge: 3f91350 14bd3eb
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Sep 3 12:36:59 2010 +0100

    Merge branch 'f12' into f13

 ghostscript-Fontmap.local.patch     |    9 ++++
 ghostscript-bbox-close.patch        |   12 +++++
 ghostscript-gdevcups-ripcache.patch |   31 ++++++++++++
 ghostscript-iname-segfault.patch    |   90 +++++++++++++++++++++++++++++++++++
 ghostscript.spec                    |   28 ++++++++++-
 5 files changed, 169 insertions(+), 1 deletions(-)
---
diff --cc ghostscript.spec
index 720a75f,951687f..0392cd3
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -24,9 -24,10 +24,10 @@@ Patch5: ghostscript-runlibfileifexists.
  Patch6: ghostscript-system-jasper.patch
  Patch7: ghostscript-pksmraw.patch
  Patch8: ghostscript-jbig2dec-nullderef.patch
+ Patch9: ghostscript-iname-segfault.patch
 -Patch10: ghostscript-CVE-2009-4270.patch
 -Patch11: ghostscript-vsnprintf.patch
 -Patch12: ghostscript-cups-filters.patch
 +Patch10: ghostscript-cups-filters.patch
 +Patch11: ghostscript-CVE-2009-4270.patch
 +Patch12: ghostscript-vsnprintf.patch
  Patch13: ghostscript-pdftoraster-exit.patch
  Patch14: ghostscript-ldflags.patch
  Patch15: ghostscript-pdf2dsc.patch
@@@ -137,14 -139,17 +141,17 @@@ rm -rf libpng zlib jpeg jaspe
  # Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
  %patch8 -p1 -b .jbig2dec-nullderef
  
+ # Applied upstream patch to fix iname.c segfault (bug #465311).
+ %patch9 -p1 -b .iname-segfault
+ 
 +# Install CUPS filter convs files in the correct place.
 +%patch10 -p1 -b .cups-filters
 +
  # Fix debugging output from gdevcups (bug #540760).
 -%patch10 -p1 -b .CVE-2009-4270
 +%patch11 -p1 -b .CVE-2009-4270
  
  # Harden ghostscript's debugging output functions (bug #540760).
 -%patch11 -p1 -b .vsnprintf
 -
 -# Install CUPS filter convs files in the correct place.
 -%patch12 -p1 -b .cups-filters
 +%patch12 -p1 -b .vsnprintf
  
  # Fixed pdftoraster so that it waits for its sub-process to exit.
  %patch13 -p1 -b .pdftoraster-exit
@@@ -184,10 -189,21 +191,21 @@@
  # Avoid epstopdf failure using upstream patch (bug #627390).
  %patch24 -p1 -b .epstopdf-failure
  
+ # Applied patch to fix NULL dereference in bbox driver (bug #591624).
+ %patch25 -p1 -b .bbox-close
+ 
+ # Applied patch to let gdevcups use automatic memory allocation.  Use
+ # RIPCache=auto in /etc/cups/cupsd.conf to enable.
+ %patch26 -p1 -b .gdevcups-ripcache
+ 
+ # Restored Fontmap.local patch, incorrectly dropped after
+ # ghostscript-8.15.4-3 (bug #610301).
+ %patch27 -p1 -b .Fontmap.local
+ 
  # Convert manual pages to UTF-8
  from8859_1() {
 -	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
 -	mv "${1}_" "$1"
 +        iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
 +        mv "${1}_" "$1"
  }
  for i in man/de/*.1; do from8859_1 "$i"; done
  
@@@ -363,7 -387,16 +381,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
+ * Fri Sep  3 2010 Tim Waugh <twaugh at redhat.com> 8.71-15
+ - Restored Fontmap.local patch, incorrectly dropped after
+   ghostscript-8.15.4-3 (bug #610301).
+ - Applied patch to let gdevcups use automatic memory allocation.  Use
+   RIPCache=auto in /etc/cups/cupsd.conf to enable.
+ - Applied patch to fix NULL dereference in bbox driver (bug #591624).
+ - Applied upstream patch to fix iname.c segfault (bug #465311).
+ 
 -* Thu Aug 26 2010 Tim Waugh <twaugh at redhat.com> 8.71-11
 +* Thu Aug 26 2010 Tim Waugh <twaugh at redhat.com> 8.71-14
  - Avoid epstopdf failure using upstream patch (bug #627390).
  - More upstream fixes for bug #599564.