svn commit: r304863 - in head/graphics/GraphicsMagick13: . files

[Greg Larkin]

Author: glarkin
Date: Tue Sep 25 21:57:13 2012
New Revision: 304863
URL: http://svn.freebsd.org/changeset/ports/304863

Log:
  - Added vendor patch to fix most recent vulnerability
  - Bumped PORTREVISION
  
  Security:	98690c45-0361-11e2-a391-000c29033c32

Added:
  head/graphics/GraphicsMagick13/files/patch-coders__png.c   (contents, props changed)
Modified:
  head/graphics/GraphicsMagick13/Makefile

Modified: head/graphics/GraphicsMagick13/Makefile
==============================================================================
--- head/graphics/GraphicsMagick13/Makefile	Tue Sep 25 21:41:50 2012	(r304862)
+++ head/graphics/GraphicsMagick13/Makefile	Tue Sep 25 21:57:13 2012	(r304863)
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.16
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/

Added: head/graphics/GraphicsMagick13/files/patch-coders__png.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/GraphicsMagick13/files/patch-coders__png.c	Tue Sep 25 21:57:13 2012	(r304863)
@@ -0,0 +1,55 @@
+--- ./coders/png.c.orig	2012-06-23 16:10:10.000000000 -0400
++++ ./coders/png.c	2012-09-25 17:43:57.000000000 -0400
+@@ -1360,7 +1360,11 @@
+ }
+ 
+ #ifdef PNG_USER_MEM_SUPPORTED
+-static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
++#if PNG_LIBPNG_VER >= 14000
++static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
++#else
++static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
++#endif
+ {
+   (void) png_ptr;
+   return MagickAllocateMemory(png_voidp,(size_t) size);
+@@ -6169,12 +6173,22 @@
+       (void) printf("writing raw profile: type=%.1024s, length=%lu\n",
+                     profile_type, (unsigned long)length);
+     }
+-  text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
++#if PNG_LIBPNG_VER >= 14000
++  text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
++#else
++  text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
++#endif
+   description_length=strlen((const char *) profile_description);
+   allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
+                                   + description_length);
+-  text[0].text=(png_charp) png_malloc(ping,allocated_length);
+-  text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
++#if PNG_LIBPNG_VER >= 14000
++   text[0].text=(png_charp) png_malloc(ping,
++      (png_alloc_size_t) allocated_length);
++   text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
++#else
++   text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
++   text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
++#endif
+   text[0].key[0]='\0';
+   (void) strcat(text[0].key, "Raw profile type ");
+   (void) strncat(text[0].key, (const char *) profile_type, 61);
+@@ -7620,7 +7634,12 @@
+ 
+       if (*attribute->key == '[')
+         continue;
+-      text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
++#if PNG_LIBPNG_VER >= 14000
++            text=(png_textp) png_malloc(ping,
++                 (png_alloc_size_t) sizeof(png_text));
++#else
++            text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
++#endif
+       text[0].key=attribute->key;
+       text[0].text=attribute->value;
+       text[0].text_length=strlen(attribute->value);