[ghostscript] Updated to 9.00.
Tim Waugh
twaugh at fedoraproject.org
Fri Sep 24 15:33:50 UTC 2010
commit 9930de3ed87907d82128d475a52cf58b3bbffe95
Author: Tim Waugh <twaugh at redhat.com>
Date: Thu Sep 23 11:57:49 2010 +0100
Updated to 9.00.
.gitignore | 1 +
ghostscript--P-.patch | 1414 ----------------------------
ghostscript-CVE-2009-4270.patch | 17 -
ghostscript-CVE-2010-1628.patch | 124 ---
ghostscript-SEARCH_HERE_FIRST.patch | 704 --------------
ghostscript-bbox-close.patch | 12 -
ghostscript-cups-realloc-color-depth.patch | 78 --
ghostscript-epstopdf-failure.patch | 50 -
ghostscript-fPIC.patch | 33 -
ghostscript-gdevcups-ripcache.patch | 31 -
ghostscript-iccprofiles-initdir.patch | 37 +
ghostscript-iname-segfault.patch | 90 --
ghostscript-ldflags.patch | 24 -
ghostscript-pdf2dsc.patch | 12 -
ghostscript-pdftoraster-exit.patch | 39 -
ghostscript-scripts.patch | 18 +-
ghostscript-system-jasper.patch | 12 +-
ghostscript-tif-fail-close.patch | 13 -
ghostscript-tiff-default-strip-size.patch | 12 -
ghostscript-tiff-fixes.patch | 59 --
ghostscript-vsnprintf.patch | 22 +-
ghostscript.spec | 85 +--
sources | 2 +-
23 files changed, 80 insertions(+), 2809 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7eb946d..dac1581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ ghostscript-8.63.tar.bz2
ghostscript-8.64.tar.bz2
ghostscript-8.70.tar.xz
ghostscript-8.71.tar.xz
+/ghostscript-9.00.tar.xz
diff --git a/ghostscript-iccprofiles-initdir.patch b/ghostscript-iccprofiles-initdir.patch
new file mode 100644
index 0000000..c77f5fe
--- /dev/null
+++ b/ghostscript-iccprofiles-initdir.patch
@@ -0,0 +1,37 @@
+diff -up ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir ghostscript-9.00/psi/zusparam.c
+--- ghostscript-9.00/psi/zusparam.c.iccprofiles-initdir 2010-09-23 14:15:24.628921593 +0100
++++ ghostscript-9.00/psi/zusparam.c 2010-09-23 14:29:21.189796748 +0100
+@@ -593,14 +593,31 @@ set_default_gray_icc(i_ctx_t *i_ctx_p, g
+ return(code);
+ }
+
++extern_gx_io_device_table();
++
+ static void
+ current_icc_directory(i_ctx_t *i_ctx_p, gs_param_string * pval)
+ {
+ static const char *const rfs = "%rom%iccprofiles/"; /* as good as any other */
+ const gs_imager_state * pis = (gs_imager_state *) igs;
++ int have_rom_device = 0;
++
++ if (pis->icc_manager->profiledir != NULL)
++ pval->data = (const byte *) pis->icc_manager->profiledir;
++ else {
++ int i;
++ for (i = 0; i < gx_io_device_table_count; i++) {
++ const gx_io_device *iodev = gx_io_device_table[i];
++ const char *dname = iodev->dname;
++
++ if (dname && strlen(dname) == 5 && !memcmp("%rom%", dname, 5)) {
++ have_rom_device = 1;
++ break;
++ }
++ }
+
+- pval->data = (const byte *)( (pis->icc_manager->profiledir == NULL) ?
+- rfs : pis->icc_manager->profiledir);
++ pval->data = (const byte *) (have_rom_device ? rfs : "");
++ }
+ pval->size = strlen((const char *)pval->data);
+ pval->persistent = true;
+ }
diff --git a/ghostscript-scripts.patch b/ghostscript-scripts.patch
index f2617f8..8b34d0e 100644
--- a/ghostscript-scripts.patch
+++ b/ghostscript-scripts.patch
@@ -1,15 +1,15 @@
-diff -up ghostscript-8.64/lib/dvipdf.scripts ghostscript-8.64/lib/dvipdf
---- ghostscript-8.64/lib/dvipdf.scripts 2009-01-10 22:11:18.000000000 +0000
-+++ ghostscript-8.64/lib/dvipdf 2009-02-04 11:32:31.000000000 +0000
+diff -up ghostscript-9.00/lib/dvipdf.scripts ghostscript-9.00/lib/dvipdf
+--- ghostscript-9.00/lib/dvipdf.scripts 2010-06-03 01:32:07.000000000 +0100
++++ ghostscript-9.00/lib/dvipdf 2010-09-23 09:56:35.592796899 +0100
@@ -44,4 +44,4 @@ fi
# We have to include the options twice because -I only takes effect if it
# appears before other options.
--exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-+exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-diff -up ghostscript-8.64/lib/pv.sh.scripts ghostscript-8.64/lib/pv.sh
---- ghostscript-8.64/lib/pv.sh.scripts 2007-07-05 11:41:52.000000000 +0100
-+++ ghostscript-8.64/lib/pv.sh 2009-02-04 11:31:32.000000000 +0000
+-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
++exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
+diff -up ghostscript-9.00/lib/pv.sh.scripts ghostscript-9.00/lib/pv.sh
+--- ghostscript-9.00/lib/pv.sh.scripts 2010-06-03 01:32:07.000000000 +0100
++++ ghostscript-9.00/lib/pv.sh 2010-09-23 09:56:59.512796516 +0100
@@ -31,7 +31,7 @@ fi
GS_EXECUTABLE=gs
@@ -27,5 +27,5 @@ diff -up ghostscript-8.64/lib/pv.sh.scripts ghostscript-8.64/lib/pv.sh
-dvips -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
+#dvips -R -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
+dvips -R -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
- $GS_EXECUTABLE $tmpfile
+ $GS_EXECUTABLE -P- -dSAFER $tmpfile
exit 0
diff --git a/ghostscript-system-jasper.patch b/ghostscript-system-jasper.patch
index 444b760..dc70446 100644
--- a/ghostscript-system-jasper.patch
+++ b/ghostscript-system-jasper.patch
@@ -1,9 +1,9 @@
-diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100
-+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000
-@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
+diff -up ghostscript-9.00/base/sjpx.c.system-jasper ghostscript-9.00/base/sjpx.c
+--- ghostscript-9.00/base/sjpx.c.system-jasper 2010-08-17 15:31:58.000000000 +0100
++++ ghostscript-9.00/base/sjpx.c 2010-09-23 09:59:46.747467642 +0100
+@@ -33,14 +33,6 @@ static void s_jpxd_set_defaults(stream_s
private_st_jpxd_state(); /* creates a gc object for our state,
- defined in sjpx.h */
+ defined in sjpx.h */
-/* error reporting callback for the jpx library */
-static void
@@ -16,7 +16,7 @@ diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
/* initialize the steam.
this involves allocating the stream and image structures, and
initializing the decoder.
-@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss)
+@@ -56,7 +48,6 @@ s_jpxd_init(stream_state * ss)
}
status = jas_init();
diff --git a/ghostscript-vsnprintf.patch b/ghostscript-vsnprintf.patch
index 6effbc1..179287d 100644
--- a/ghostscript-vsnprintf.patch
+++ b/ghostscript-vsnprintf.patch
@@ -1,7 +1,7 @@
-diff -up ghostscript-8.71/base/gsmisc.c.vsnprintf ghostscript-8.71/base/gsmisc.c
---- ghostscript-8.71/base/gsmisc.c.vsnprintf 2010-01-05 00:52:07.000000000 +0000
-+++ ghostscript-8.71/base/gsmisc.c 2010-02-17 11:30:13.777615156 +0000
-@@ -235,7 +235,7 @@ int gs_throw_imp(const char *func, const
+diff -up ghostscript-9.00/base/gsmisc.c.vsnprintf ghostscript-9.00/base/gsmisc.c
+--- ghostscript-9.00/base/gsmisc.c.vsnprintf 2010-05-06 17:04:27.000000000 +0100
++++ ghostscript-9.00/base/gsmisc.c 2010-09-23 10:01:48.152921502 +0100
+@@ -260,7 +260,7 @@ int gs_throw_imp(const char *func, const
va_list ap;
va_start(ap, fmt);
@@ -10,9 +10,9 @@ diff -up ghostscript-8.71/base/gsmisc.c.vsnprintf ghostscript-8.71/base/gsmisc.c
msg[sizeof(msg) - 1] = 0;
va_end(ap);
-diff -up ghostscript-8.71/base/gxttfb.c.vsnprintf ghostscript-8.71/base/gxttfb.c
---- ghostscript-8.71/base/gxttfb.c.vsnprintf 2009-12-06 19:12:08.000000000 +0000
-+++ ghostscript-8.71/base/gxttfb.c 2010-02-17 11:30:13.778616076 +0000
+diff -up ghostscript-9.00/base/gxttfb.c.vsnprintf ghostscript-9.00/base/gxttfb.c
+--- ghostscript-9.00/base/gxttfb.c.vsnprintf 2010-05-05 19:14:21.000000000 +0100
++++ ghostscript-9.00/base/gxttfb.c 2010-09-23 10:51:31.575797285 +0100
@@ -246,7 +246,7 @@ static int DebugPrint(ttfFont *ttf, cons
if (gs_debug_c('Y')) {
@@ -21,10 +21,10 @@ diff -up ghostscript-8.71/base/gxttfb.c.vsnprintf ghostscript-8.71/base/gxttfb.c
+ count = vsnprintf(buf, sizeof (buf), fmt, args);
/* NB: moved debug output from stdout to stderr
*/
- errwrite(buf, count);
-diff -up ghostscript-8.71/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-8.71/base/rinkj/rinkj-byte-stream.c
---- ghostscript-8.71/base/rinkj/rinkj-byte-stream.c.vsnprintf 2008-04-04 02:02:16.000000000 +0100
-+++ ghostscript-8.71/base/rinkj/rinkj-byte-stream.c 2010-02-17 11:30:13.791615392 +0000
+ errwrite(ttf->DebugMem, buf, count);
+diff -up ghostscript-9.00/base/rinkj/rinkj-byte-stream.c.vsnprintf ghostscript-9.00/base/rinkj/rinkj-byte-stream.c
+--- ghostscript-9.00/base/rinkj/rinkj-byte-stream.c.vsnprintf 2008-04-04 02:02:16.000000000 +0100
++++ ghostscript-9.00/base/rinkj/rinkj-byte-stream.c 2010-09-23 10:01:48.154921184 +0100
@@ -43,7 +43,7 @@ rinkj_byte_stream_printf (RinkjByteStrea
va_list ap;
diff --git a/ghostscript.spec b/ghostscript.spec
index 9a30953..2e49938 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,11 +1,11 @@
-%define gs_ver 8.71
-%define gs_dot_ver 8.71
+%define gs_ver 9.00
+%define gs_dot_ver 9.00
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
-Release: 16%{?dist}
+Release: 1%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@@ -19,30 +19,15 @@ Source4: cidfmap
Patch1: ghostscript-multilib.patch
Patch2: ghostscript-scripts.patch
Patch3: ghostscript-noopt.patch
-Patch4: ghostscript-fPIC.patch
Patch5: ghostscript-runlibfileifexists.patch
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-iccprofiles-initdir.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz
@@ -126,9 +111,6 @@ rm -rf libpng zlib jpeg jasper
# Build igcref.c with -O0 to work around bug #150771.
%patch3 -p1 -b .noopt
-# Fix shared library build.
-%patch4 -p1 -b .fPIC
-
# Define .runlibfileifexists.
%patch5 -p1
@@ -141,69 +123,24 @@ rm -rf libpng zlib jpeg jasper
# 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).
-%patch11 -p1 -b .CVE-2009-4270
-
# Harden ghostscript's debugging output functions (bug #540760).
%patch12 -p1 -b .vsnprintf
-# Fixed pdftoraster so that it waits for its sub-process to exit.
-%patch13 -p1 -b .pdftoraster-exit
-
-# Fixed LDFLAGS when building dynamically linked executables (bug #565935).
-%patch14 -p1 -b .ldflags
-
-# Fixed pdf2dsc.ps (bug #565935).
-%patch15 -p1 -b .pdf2dsc
-
-# Reallocate memory in gdevcups when color depth changes (bug #563313).
-%patch16 -p1 -b .cups-realloc-color-depth
-
-# Don't segfault closing tiffg3 device if opening failed (bug #571520).
-%patch17 -p1 -b .tif-fail-close
-
-# Restore the TIFF default strip size of 0 (bug #571520).
-%patch18 -p1 -b .tiff-default-strip-size
-
-# Backported some more TIFF fixes (bug #573970).
-%patch19 -p1 -b .tiff-fixes
-
-# Applied patch to fix CVE-2010-1628 (memory corruption at PS stack
-# 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
-# Change SEARCH_HERE_FIRST default to make -P- default instead of -P
-# (bug #599564).
-%patch22 -p1 -b .SEARCH_HERE_FIRST
-
-# Use -P- and -dSAFER in scripts (bug #599564).
-%patch23 -p1 -b .-P-
-
-# 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).
# Note: don't use -b here to avoid the backup file ending up in the
# package manifest.
%patch27 -p1
+# Don't assume %rom% device is available for initial ICC profile dir.
+%patch28 -p1 -b .iccprofiles-initdir
+
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -347,6 +284,7 @@ rm -rf $RPM_BUILD_ROOT
%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps
%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap*
%{_datadir}/ghostscript/%{gs_dot_ver}/lib
+%{_datadir}/ghostscript/%{gs_dot_ver}/iccprofiles
%{_mandir}/man*/*
%lang(de) %{_mandir}/de/man*/*
%{_libdir}/libgs.so.*
@@ -383,6 +321,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
+* Thu Sep 23 2010 Tim Waugh <twaugh at redhat.com> 9.00-1
+- Updated to 9.00. No longer need -P-, CVE-2009-4270, CVE-2010-1628,
+ SEARCH_HERE_FIRST, bbox-close, cups-realloc-color-depth,
+ epstopdf-failure, fPIC, gdevcups-ripcache, iname-segfault, ldfalgs,
+ pdf2dsc, pdftoraster-exit, tif-fail-close, tiff-default-strip-size,
+ or tiff-fixes patches.
+
* Mon Sep 13 2010 Tim Waugh <twaugh at redhat.com> 8.71-16
- Pulled in gs_fonts.ps modification for .runlibfileifexists from
OpenSUSE package (bug #610301).
diff --git a/sources b/sources
index 1ddb496..27c9926 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
-5005d68f7395c2bfc4b05c1a60d9b6ba ghostscript-8.71.tar.xz
+1ca5f245677f78f573e6490bdb40702f ghostscript-9.00.tar.xz
More information about the scm-commits
mailing list