rpms
/
ghostscript
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f12' into f13

This commit is contained in:
Tim Waugh 2010-09-03 12:36:59 +01:00
parent 3f91350de4 14bd3ebe38
commit bc34ffaf5b
5 changed files with 169 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghostscript-Fontmap.local.patch Normal file
View File

@ -0,0 +1,9 @@
diff -up ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local ghostscript-8.71/Resource/Init/Fontmap
--- ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local 2008-08-08 05:22:38.000000000 +0100
+++ ghostscript-8.71/Resource/Init/Fontmap 2010-09-03 11:53:47.273865979 +0100
@@ -2,3 +2,5 @@
% See Fontmap.GS for the syntax of real Fontmap files.
%% Replace 1 (Fontmap.GS)
(Fontmap.GS) .runlibfile
+% must be at the bottom of line to allow people overriding everything.
+(Fontmap.local) .runlibfileifexists

12
ghostscript-bbox-close.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up ghostscript-8.71/base/gdevbbox.c.bbox-close ghostscript-8.71/base/gdevbbox.c
--- ghostscript-8.71/base/gdevbbox.c.bbox-close 2010-01-19 15:48:57.000000000 +0000
+++ ghostscript-8.71/base/gdevbbox.c 2010-09-02 13:03:37.742943978 +0100
@@ -249,7 +249,7 @@ bbox_close_device(gx_device * dev)
* This device was created as a wrapper for a compositor.
* Just free the devices.
*/
- int code = (bdev->forward_open_close ? gs_closedevice(tdev) : 0);
+ int code = (tdev && bdev->forward_open_close ? gs_closedevice(tdev) : 0);
gs_free_object(dev->memory, dev, "bbox_close_device(composite)");
return code;

31
ghostscript-gdevcups-ripcache.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up ghostscript-8.71/cups/gdevcups.c.gdevcups-ripcache ghostscript-8.71/cups/gdevcups.c
--- ghostscript-8.71/cups/gdevcups.c.gdevcups-ripcache 2010-09-02 14:38:53.886818591 +0100
+++ ghostscript-8.71/cups/gdevcups.c 2010-09-02 14:40:49.925943426 +0100
@@ -915,8 +915,7 @@ cups_get_space_params(const gx_device_pr
switch (sscanf(cache_env, "%f%254s", &cache_size, cache_units))
{
case 0 :
- cache_size = 8 * 1024 * 1024;
- break;
+ return;
case 1 :
cache_size *= 4 * CUPS_TILE_SIZE * CUPS_TILE_SIZE;
break;
@@ -933,12 +932,15 @@ cups_get_space_params(const gx_device_pr
}
}
else
- cache_size = 8 * 1024 * 1024;
+ return;
+
+ if (cache_size == 0)
+ return;
dprintf1("DEBUG2: cache_size = %.0f\n", cache_size);
space_params->MaxBitmap = (int)cache_size;
- space_params->BufferSpace = (int)cache_size / 10;
+ space_params->BufferSpace = (int)cache_size;
}

90
ghostscript-iname-segfault.patch Normal file
View File

@ -0,0 +1,90 @@
diff -up ghostscript-8.71/psi/iname.c.iname-segfault ghostscript-8.71/psi/iname.c
--- ghostscript-8.71/psi/iname.c.iname-segfault 2008-10-21 17:26:09.000000000 +0100
+++ ghostscript-8.71/psi/iname.c 2010-09-02 12:13:02.833819490 +0100
@@ -47,8 +47,8 @@ gs_private_st_composite(st_name_table, n
/* Forward references */
static int name_alloc_sub(name_table *);
-static void name_free_sub(name_table *, uint);
-static void name_scan_sub(name_table *, uint, bool);
+static void name_free_sub(name_table *, uint, bool);
+static void name_scan_sub(name_table *, uint, bool, bool);
/* Debugging printout */
#ifdef DEBUG
@@ -99,7 +99,7 @@ names_init(ulong count, gs_ref_memory_t
if (code < 0) {
while (nt->sub_next > 0)
- name_free_sub(nt, --(nt->sub_next));
+ name_free_sub(nt, --(nt->sub_next), false);
gs_free_object(mem, nt, "name_init(nt)");
return 0;
}
@@ -413,16 +413,7 @@ names_trace_finish(name_table * nt, gc_s
if (sub != 0) {
int save_count = nt->sub_count;
- name_scan_sub(nt, i, true);
- if (save_count != nt->sub_count) {
- /* name_scan_sub has released the i-th entry. */
- continue;
- }
- if (nt->sub[i].names == 0 && gcst != 0) {
- /* Mark the just-freed sub-table as unmarked. */
- o_set_unmarked((obj_header_t *)sub - 1);
- o_set_unmarked((obj_header_t *)ssub - 1);
- }
+ name_scan_sub(nt, i, true, true && (gcst != 0));
}
}
nt->sub_next = 0;
@@ -506,7 +497,7 @@ name_alloc_sub(name_table * nt)
/* Add the newly allocated entries to the free list. */
/* Note that the free list will only be properly sorted if */
/* it was empty initially. */
- name_scan_sub(nt, sub_index, false);
+ name_scan_sub(nt, sub_index, false, false);
#ifdef DEBUG
if (gs_debug_c('n')) { /* Print the lengths of the hash chains. */
int i0;
@@ -535,8 +526,20 @@ name_alloc_sub(name_table * nt)
/* Free a sub-table. */
static void
-name_free_sub(name_table * nt, uint sub_index)
+name_free_sub(name_table * nt, uint sub_index, bool unmark)
{
+ /* If the subtable is in a previous save level, gs_free_object()
+ * may not actually free the memory, in case that happens, we need
+ * to explicitly remove the gc mark.
+ */
+ if (unmark) {
+ name_sub_table *sub = nt->sub[sub_index].names;
+ name_string_sub_table_t *ssub = nt->sub[sub_index].strings;
+
+ o_set_unmarked((obj_header_t *)sub - 1);
+ o_set_unmarked((obj_header_t *)ssub - 1);
+ }
+
gs_free_object(nt->memory, nt->sub[sub_index].strings,
"name_free_sub(string sub-table)");
gs_free_object(nt->memory, nt->sub[sub_index].names,
@@ -550,7 +553,7 @@ name_free_sub(name_table * nt, uint sub_
/* will stay sorted. If all entries are unmarked and free_empty is true, */
/* free the sub-table. */
static void
-name_scan_sub(name_table * nt, uint sub_index, bool free_empty)
+name_scan_sub(name_table * nt, uint sub_index, bool free_empty, bool unmark)
{
name_string_sub_table_t *ssub = nt->sub[sub_index].strings;
uint free = nt->free;
@@ -579,7 +582,7 @@ name_scan_sub(name_table * nt, uint sub_
nt->free = free;
else {
/* No marked entries, free the sub-table. */
- name_free_sub(nt, sub_index);
+ name_free_sub(nt, sub_index, unmark);
if (sub_index == nt->sub_count - 1) {
/* Back up over a final run of deleted sub-tables. */
do {

28
ghostscript.spec
View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
Release: 14%{?dist}
Release: 15%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@ -24,6 +24,7 @@ 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
@ -39,6 +40,9 @@ 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
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz
@ -137,6 +141,9 @@ 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
@ -184,6 +191,17 @@ rm -rf libpng zlib jpeg jasper
# 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}_"
@ -363,6 +381,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Fri Sep 3 2010 Tim Waugh <twaugh@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@redhat.com> 8.71-14
- Avoid epstopdf failure using upstream patch (bug #627390).
- More upstream fixes for bug #599564.