Import of pkgsrc-2015Q3

print/ghostscript-gpl/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/09/23 08:25:09 he Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/

print/ghostscript-gpl/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/03/11 20:58:26 spz Exp $
+$NetBSD: distinfo,v 1.12 2015/09/23 08:25:09 he Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@@ -11,11 +11,13 @@ SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531
 SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
 SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
 SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
-SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
+SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
 SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
 SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
 SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
 SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
+SHA1 (patch-base_gsmalloc.c) = 891bdcef49e0f2c435744eaf7bbcd31f5dbcbaba
+SHA1 (patch-base_memento.c) = d30cfb9285a0268e743c90cdf831674eaa24789b
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737

print/ghostscript-gpl/patches/patch-ai

@@ -1,12 +1,26 @@
-$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2015/08/12 22:20:00 wiz Exp $
 
+chunk 1:
+fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes
+overlap.
+
+chunk 2:
 replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen
 per PR pkg/40664
 
---- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100
+--- base/mkromfs.c.orig	2012-08-08 08:01:36.000000000 +0000
 +++ base/mkromfs.c
-@@ -1033,7 +1033,7 @@
+@@ -1836,7 +1836,7 @@ ws(const byte *str, int len)
+     if (len >= LINE_SIZE)
+         exit(1);
+ 
+-    memcpy(linebuf, str, len);
++    memmove(linebuf, str, len);
+     flush_line_buf(len);
+ }
+ 
+@@ -2178,7 +2178,7 @@ main(int argc, char *argv[])
  #endif
      fprintf(out,"\n#include \"stdint_.h\"\n");
      fprintf(out,"\n#include \"time_.h\"\n\n");

print/ghostscript-gpl/patches/patch-base_gsmalloc.c

@@ -0,0 +1,18 @@
+$NetBSD: patch-base_gsmalloc.c,v 1.1 2015/09/23 08:25:09 he Exp $
+
+In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the
+variable holding the actual number of bytes we allocate.
+
+Fixes CVE-2015-3228.
+
+--- base/gsmalloc.c.orig	2012-08-08 08:01:36.000000000 +0000
++++ base/gsmalloc.c
+@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u
+     } else {
+         uint added = size + sizeof(gs_malloc_block_t);
+ 
+-        if (mmem->limit - added < mmem->used)
++        if (added <= size || mmem->limit - added < mmem->used)
+             set_msg("exceeded limit");
+         else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0)
+             set_msg("failed");

print/ghostscript-gpl/patches/patch-base_memento.c

@@ -0,0 +1,18 @@
+$NetBSD: patch-base_memento.c,v 1.1 2015/08/11 18:16:50 wiz Exp $
+
+Rely on header to get memset prototype.
+
+--- base/memento.c.orig	2012-08-08 08:01:36.000000000 +0000
++++ base/memento.c
+@@ -40,11 +40,7 @@
+ #ifdef MEMENTO_GS_HACKS
+ /* For GS we include malloc_.h. Anyone else would just include memento.h */
+ #include "malloc_.h"
+-#ifdef __MACH__
+ #include <string.h>
+-#else
+-void *memset(void *,int,size_t);
+-#endif
+ int atexit(void (*)(void));
+ #else
+ #include "memento.h"