[ghostscript: 4/4] Merge branch 'f14'
Tim Waugh
twaugh at fedoraproject.org
Thu Oct 14 16:48:46 UTC 2010
commit 218fb198bb31363108d86a6245b291b5dd41b146
Merge: d315dcd 0c64c5e
Author: Tim Waugh <twaugh at redhat.com>
Date: Thu Oct 14 17:48:00 2010 +0100
Merge branch 'f14'
ghostscript-gdevcups-debug-uninit.patch | 17 +++++++++++++++++
ghostscript.spec | 10 +++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --cc ghostscript-gdevcups-debug-uninit.patch
index 0000000,02a6403..967050b
mode 000000,100644..100644
--- a/ghostscript-gdevcups-debug-uninit.patch
+++ b/ghostscript-gdevcups-debug-uninit.patch
@@@ -1,0 -1,15 +1,17 @@@
-diff -up ghostscript-8.71/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-8.71/cups/gdevcups.c
---- ghostscript-8.71/cups/gdevcups.c.gdevcups-debug-uninit 2010-10-14 15:08:41.243869988 +0100
-+++ ghostscript-8.71/cups/gdevcups.c 2010-10-14 15:09:45.151869961 +0100
-@@ -3299,8 +3299,9 @@ cups_put_params(gx_device *pdev, /*
- dprintf1("DEBUG2: ppd = %p\n", cupsPPD);
- dprintf2("DEBUG2: PageSize = [ %.3f %.3f ]\n",
- pdev->MediaSize[0], pdev->MediaSize[1]);
-- dprintf4("DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n",
-- margins[0], margins[1], margins[2], margins[3]);
++diff -up ghostscript-9.00/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.00/cups/gdevcups.c
++--- ghostscript-9.00/cups/gdevcups.c.gdevcups-debug-uninit 2010-08-12 19:10:47.000000000 +0100
+++++ ghostscript-9.00/cups/gdevcups.c 2010-10-14 17:39:39.834994296 +0100
++@@ -807,9 +807,10 @@ cups_get_matrix(gx_device *pdev, /* I -
++ dprintf4("DEBUG2: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
++ cups->header.PageSize[0], cups->header.PageSize[1],
++ cups->header.HWResolution[0], cups->header.HWResolution[1]);
++- dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
++- pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
++- pdev->HWMargins[3]);
+ + if (size_set)
-+ dprintf4("DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n",
-+ margins[0], margins[1], margins[2], margins[3]);
- dprintf2("DEBUG2: HWResolution = [ %.3f %.3f ]\n",
- pdev->HWResolution[0], pdev->HWResolution[1]);
- dprintf2("DEBUG2: width = %d, height = %d\n",
+++ dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+++ pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
+++ pdev->HWMargins[3]);
++ dprintf6("DEBUG2: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
++ pmat->xx, pmat->xy, pmat->yx, pmat->yy, pmat->tx, pmat->ty);
++ #endif /* DEBUG */
diff --cc ghostscript.spec
index 7974be1,1c9a2f3..c3a9a02
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
Name: ghostscript
Version: %{gs_ver}
- Release: 4%{?dist}
-Release: 19%{?dist}
++Release: 5%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@@@ -23,11 -24,27 +23,12 @@@ Patch5: ghostscript-runlibfileifexists.
Patch6: ghostscript-system-jasper.patch
Patch7: ghostscript-pksmraw.patch
Patch8: ghostscript-jbig2dec-nullderef.patch
-Patch9: ghostscript-iname-segfault.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
-Patch16: ghostscript-cups-realloc-color-depth.patch
-Patch17: ghostscript-tif-fail-close.patch
-Patch18: ghostscript-tiff-default-strip-size.patch
-Patch19: ghostscript-tiff-fixes.patch
-Patch20: ghostscript-CVE-2010-1628.patch
Patch21: ghostscript-jbig2-image-refcount.patch
-Patch22: ghostscript-SEARCH_HERE_FIRST.patch
-Patch23: ghostscript--P-.patch
-Patch24: ghostscript-epstopdf-failure.patch
-Patch25: ghostscript-bbox-close.patch
-Patch26: ghostscript-gdevcups-ripcache.patch
Patch27: ghostscript-Fontmap.local.patch
-Patch28: ghostscript-gdevcups-debug-uninit.patch
-Patch29: ghostscript-gdevcups-segfaults.patch
+Patch28: ghostscript-iccprofiles-initdir.patch
++Patch29: ghostscript-gdevcups-debug-uninit.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz
@@@ -138,9 -206,12 +139,12 @@@ rm -rf libpng zlib jpeg jaspe
# package manifest.
%patch27 -p1
-# gdevcups: don't use uninitialized variables in debugging output.
-%patch28 -p1 -b .gdevcups-debug-uninit
+# Don't assume %rom% device is available for initial ICC profile dir.
+%patch28 -p1 -b .iccprofiles-initdir
-# Apply some fixes from upstream to avoid gdevcups segfaults (bug #639593).
-%patch29 -p1 -b .gdevcups-segfaults
++# gdevcups: don't use uninitialized variables in debugging output.
++%patch29 -p1 -b .gdevcups-debug-uninit
+
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@@ -323,10 -393,16 +327,14 @@@ rm -rf $RPM_BUILD_ROO
%{_libdir}/libgs.so
%changelog
-* Thu Oct 14 2010 Tim Waugh <twaugh at redhat.com> 8.71-19
-- Apply some fixes from upstream to avoid gdevcups
- segfaults (bug #639593).
++* Thu Oct 14 2010 Tim Waugh <twaugh at redhat.com> 9.00-5
+ - gdevcups: don't use uninitialized variables in debugging output
+ (Ghostscript bug #691683).
+
-* Fri Oct 1 2010 Tim Waugh <twaugh at redhat.com> 8.71-18
+* Fri Oct 1 2010 Tim Waugh <twaugh at redhat.com> 9.00-4
- Reverted incorrect change introduced to fix bug #635786.
-* Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> 8.71-17
+* Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> 9.00-3
- Don't use carriage return in ps2epsi output (bug #635786).
- Include more documentation (bug #634354).
More information about the scm-commits
mailing list