cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to GraphicsMagick 1.3.17.

Browse Source 
ok sthen@
This commit is contained in:
brad 2012-12-22 19:37:35 +00:00
parent 1e651a86da
commit 889952e07c
5 changed files with 13 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/GraphicsMagick/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2012/08/28 15:18:25 jasper Exp $
# $OpenBSD: Makefile,v 1.27 2012/12/22 19:37:35 brad Exp $
SHARED_ONLY= Yes
COMMENT= image processing tools with stable ABI
DISTNAME= GraphicsMagick-1.3.15
REVISION= 0
DISTNAME= GraphicsMagick-1.3.17
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
EXTRACT_SUFX= .tar.xz
@ -58,7 +57,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--without-trio \
--disable-ltdl-install
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_LIBS="-pthread" \
ac_cv_path_LaunchDelegate=no

7
graphics/GraphicsMagick/distinfo
View File

@ -1,5 +1,2 @@
MD5 (GraphicsMagick-1.3.15.tar.xz) = zJzINNln6aBvJ7XdJyULMQ==
RMD160 (GraphicsMagick-1.3.15.tar.xz) = ONgmFqz/rkdJ7nATd/qIJDi3Ubs=
SHA1 (GraphicsMagick-1.3.15.tar.xz) = 1d9AANVTH60+3p4Aj5yNwtCF1UY=
SHA256 (GraphicsMagick-1.3.15.tar.xz) = R/xQjllvP/NfDpT3hE9SwZEkRG5WJuUIEGT4HMOXFeg=
SIZE (GraphicsMagick-1.3.15.tar.xz) = 4921024
SHA256 (GraphicsMagick-1.3.17.tar.xz) = JagMuG/5uj0RlyEgvj9scMbBIWjS75XG8wiZ2z10zDY=
SIZE (GraphicsMagick-1.3.17.tar.xz) = 5403300

63
graphics/GraphicsMagick/patches/patch-coders_png_c
View File

@ -1,63 +0,0 @@
$OpenBSD: patch-coders_png_c,v 1.8 2012/08/28 15:18:25 jasper Exp $
Security fix for CVE-2012-3438,
GraphicsMagick: png_IM_malloc() size argument
Patch from upstream hg:
http://graphicsmagick.hg.sourceforge.net/hgweb/graphicsmagick/graphicsmagick/rev/d6e469d02cd2
--- coders/png.c.orig Sat Apr 28 21:45:16 2012
+++ coders/png.c Fri Aug 24 21:35:57 2012
@@ -1360,7 +1360,11 @@ static void PNGWarningHandler(png_struct *ping,png_con
}
#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);
@@ -6153,12 +6157,22 @@ png_write_raw_profile(const ImageInfo *image_info,png_
(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);
@@ -7597,7 +7611,12 @@ static MagickPassFail WriteOnePNGImage(MngInfo *mng_in
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);

10
graphics/GraphicsMagick/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2012/07/03 13:36:28 okan Exp $
--- configure.orig Sat Feb 25 15:51:04 2012
+++ configure Sun Jun 17 14:58:07 2012
@@ -27899,7 +27899,7 @@ fi
$OpenBSD: patch-configure,v 1.6 2012/12/22 19:37:35 brad Exp $
--- configure.orig Sat Oct 13 17:32:07 2012
+++ configure Tue Nov 6 11:50:11 2012
@@ -27950,7 +27950,7 @@ fi
#
# Subdirectory under lib to place GraphicsMagick lib files
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2012/07/03 13:36:28 okan Exp $
cat >>confdefs.h <<_ACEOF
#define MagickLibSubdir "$MagickLibSubdir"
@@ -28003,7 +28003,7 @@ _ACEOF
@@ -28054,7 +28054,7 @@ _ACEOF
#
# Path to GraphicsMagick share files

6
graphics/GraphicsMagick/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2012/07/03 13:36:28 okan Exp $
@comment $OpenBSD: PLIST,v 1.10 2012/12/22 19:37:35 brad Exp $
@pkgpath graphics/GraphicsMagick,no_x11
bin/GraphicsMagick++-config
bin/GraphicsMagick-config
@ -150,6 +150,8 @@ lib/GraphicsMagick/modules-Q16/coders/info.la
lib/GraphicsMagick/modules-Q16/coders/info.so
lib/GraphicsMagick/modules-Q16/coders/jbig.la
lib/GraphicsMagick/modules-Q16/coders/jbig.so
lib/GraphicsMagick/modules-Q16/coders/jnx.la
lib/GraphicsMagick/modules-Q16/coders/jnx.so
lib/GraphicsMagick/modules-Q16/coders/jp2.la
lib/GraphicsMagick/modules-Q16/coders/jp2.so
lib/GraphicsMagick/modules-Q16/coders/jpeg.la
@ -372,12 +374,10 @@ share/doc/GraphicsMagick/www/Magick++/Drawable_example_1.png
share/doc/GraphicsMagick/www/Magick++/Enumerations.html
share/doc/GraphicsMagick/www/Magick++/Exception.html
share/doc/GraphicsMagick/www/Magick++/FormatCharacters.html
share/doc/GraphicsMagick/www/Magick++/Future.html
share/doc/GraphicsMagick/www/Magick++/Geometry.html
share/doc/GraphicsMagick/www/Magick++/Image.html
share/doc/GraphicsMagick/www/Magick++/Image.png
share/doc/GraphicsMagick/www/Magick++/ImageDesign.html
share/doc/GraphicsMagick/www/Magick++/Install.html
share/doc/GraphicsMagick/www/Magick++/Montage.html
share/doc/GraphicsMagick/www/Magick++/PixelPacket.html
share/doc/GraphicsMagick/www/Magick++/Pixels.html