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

[Tim Waugh]

commit 56ff80c357a49ba2ddc5456cf17aaf2839608983
Merge: 92a0736 2e84257
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 5 16:51:33 2010 +0100

    Merge branch 'f12' into f13

 ghostscript-jbig2-image-refcount.patch |   25 +++++++++++++++++++++++++
 ghostscript.spec                       |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --cc ghostscript.spec
index 0012279,996ca3a..86fab74
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 10%{?dist}
 -Release: 8%{?dist}
++Release: 11%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -171,10 -170,13 +172,13 @@@ rm -rf libpng zlib jpeg jaspe
  # overflow, bug #592492).
  %patch20 -p1 -b .CVE-2010-1628
  
+ # Avoid another NULL pointer dereference in jbig2 code (bug #621569).
+ %patch21 -p1 -b .jbig2-image-refcount
+ 
  # 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
  
@@@ -350,7 -360,11 +354,10 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
 -* Thu Aug  5 2010 Tim Waugh <twaugh at redhat.com> 8.71-8
++* Thu Aug  5 2010 Tim Waugh <twaugh at redhat.com> 8.71-11
+ - Avoid another NULL pointer dereference in jbig2 code (bug #621569).
+ 
 -* Fri Jul 16 2010 Tim Waugh <twaugh at redhat.com> 8.71-7
 +* Fri Jul 16 2010 Tim Waugh <twaugh at redhat.com> 8.71-10
  - Applied patch to fix CVE-2010-1628 (memory corruption at PS stack
    overflow, bug #592492).