From 5ed894fcc85d9c9cfec005cf3fb8076d05bb93c0 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Fri, 29 Jun 2007 19:24:45 +0000
Subject: avoid segfaults on 64-bit systems for some inputs files and pdf
 output

---
 print/ghostscript/Makefile         |  4 ++--
 print/ghostscript/distinfo         |  3 ++-
 print/ghostscript/patches/patch-ac | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 print/ghostscript/patches/patch-ac

(limited to 'print')

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index ce5cab2d92f..7ebf9c7bdab 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2007/01/17 23:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/06/29 19:24:45 dmcmahill Exp $
 
 DISTNAME=	ghostscript-8.54-gpl
 PKGNAME=	ghostscript-8.54
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 103a2fc49d4..e4d1633f249 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/12/27 18:18:22 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/06/29 19:24:45 dmcmahill Exp $
 
 SHA1 (ghostscript-8.54-gpl.tar.bz2) = 5da69b04ddc8a4660a2c40b0e561a358c737c310
 RMD160 (ghostscript-8.54-gpl.tar.bz2) = f61f6da568ffe440a466cd0d7b5871a3d87d1116
 Size (ghostscript-8.54-gpl.tar.bz2) = 12365361 bytes
 SHA1 (patch-aa) = 9ac0ae294042e69c41fc8579e71971ad57656a8b
 SHA1 (patch-ab) = 2477242c4c5f6b6feaaa217deb1aa37485f2fac5
+SHA1 (patch-ac) = 64f3f4eb10aa5711122332a4e9c4292a8a3dd265
 SHA1 (patch-ad) = ed75f35c19ae2b19bc8902522b5d4828dfa278fe
diff --git a/print/ghostscript/patches/patch-ac b/print/ghostscript/patches/patch-ac
new file mode 100644
index 00000000000..68a8122a638
--- /dev/null
+++ b/print/ghostscript/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.3 2007/06/29 19:24:46 dmcmahill Exp $
+
+Don't segfault on 64-bit systems.
+
+Patch found in Debian bug 390875 and tested on netbsd-2/alpha.
+
+--- src/gxfcopy.c.orig	2006-03-23 12:39:23.000000000 +0000
++++ src/gxfcopy.c
+@@ -2391,7 +2391,7 @@ order_font_data(gs_copied_font_data_t *c
+ 	    a[j++] = &cfdata->names[i];
+ 	}
+     }
+-    qsort(a, cfdata->num_glyphs, sizeof(int), compare_glyph_names);
++    qsort(a, cfdata->num_glyphs, sizeof(gs_copied_glyph_name_t *), compare_glyph_names);
+     for (; j >= 0; j--)
+ 	cfdata->glyphs[j].order_index = a[j] - cfdata->names;    
+     gs_free_object(memory, a, "order_font_data");
-- 
cgit v1.2.3