head 1.17; access; symbols pkgsrc-2013Q2:1.17.0.30 pkgsrc-2013Q2-base:1.17 pkgsrc-2012Q4:1.17.0.28 pkgsrc-2012Q4-base:1.17 pkgsrc-2011Q4:1.17.0.26 pkgsrc-2011Q4-base:1.17 pkgsrc-2011Q2:1.17.0.24 pkgsrc-2011Q2-base:1.17 pkgsrc-2009Q4:1.17.0.22 pkgsrc-2009Q4-base:1.17 pkgsrc-2008Q4:1.17.0.20 pkgsrc-2008Q4-base:1.17 pkgsrc-2008Q3:1.17.0.18 pkgsrc-2008Q3-base:1.17 cube-native-xorg:1.17.0.16 cube-native-xorg-base:1.17 pkgsrc-2008Q2:1.17.0.14 pkgsrc-2008Q2-base:1.17 pkgsrc-2008Q1:1.17.0.12 pkgsrc-2008Q1-base:1.17 pkgsrc-2007Q4:1.17.0.10 pkgsrc-2007Q4-base:1.17 pkgsrc-2007Q3:1.17.0.8 pkgsrc-2007Q3-base:1.17 pkgsrc-2007Q2:1.17.0.6 pkgsrc-2007Q2-base:1.17 pkgsrc-2007Q1:1.17.0.4 pkgsrc-2007Q1-base:1.17 pkgsrc-2006Q4:1.17.0.2 pkgsrc-2006Q4-base:1.17 pkgsrc-2006Q3:1.15.0.4 pkgsrc-2006Q3-base:1.15 pkgsrc-2006Q2:1.15.0.2 pkgsrc-2006Q2-base:1.15 pkgsrc-2006Q1:1.13.0.2 pkgsrc-2006Q1-base:1.13 pkgsrc-2005Q4:1.11.0.18 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.16 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.14 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.11.0.12 pkgsrc-2005Q1-base:1.11 pkgsrc-2004Q4:1.11.0.10 pkgsrc-2004Q4-base:1.11 pkgsrc-2004Q3:1.11.0.8 pkgsrc-2004Q3-base:1.11 pkgsrc-2004Q2:1.11.0.6 pkgsrc-2004Q2-base:1.11 pkgsrc-2004Q1:1.11.0.4 pkgsrc-2004Q1-base:1.11 pkgsrc-2003Q4:1.11.0.2 pkgsrc-2003Q4-base:1.11 netbsd-1-6:1.8.0.8 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.4 pkgviews-base:1.8 buildlink2:1.8.0.2 buildlink2-base:1.9 netbsd-1-5-PATCH003:1.8 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.3; locks; strict; comment @# @; 1.17 date 2006.12.09.10.57.50; author adam; state dead; branches; next 1.16; 1.16 date 2006.11.30.22.55.31; author joerg; state Exp; branches; next 1.15; 1.15 date 2006.05.08.11.39.07; author adam; state dead; branches; next 1.14; 1.14 date 2006.05.03.22.57.22; author wiz; state Exp; branches; next 1.13; 1.13 date 2006.03.05.21.25.49; author adam; state dead; branches; next 1.12; 1.12 date 2006.01.28.02.36.55; author salo; state Exp; branches; next 1.11; 1.11 date 2003.01.03.23.04.37; author wiz; state dead; branches 1.11.18.1; next 1.10; 1.10 date 2002.11.13.13.44.43; author wiz; state Exp; branches; next 1.9; 1.9 date 2002.08.22.08.06.13; author tron; state dead; branches; next 1.8; 1.8 date 2002.02.10.12.51.00; author abs; state Exp; branches 1.8.2.1; next 1.7; 1.7 date 2001.09.17.15.17.32; author tron; state Exp; branches; next 1.6; 1.6 date 2000.08.10.08.59.04; author tron; state Exp; branches; next 1.5; 1.5 date 99.04.25.18.46.30; author tv; state dead; branches; next 1.4; 1.4 date 98.08.07.10.40.46; author agc; state Exp; branches; next 1.3; 1.3 date 98.02.25.17.34.50; author tron; state Exp; branches; next 1.2; 1.2 date 98.02.05.01.34.43; author tron; state Exp; branches; next 1.1; 1.1 date 98.01.27.13.51.17; author agc; state Exp; branches; next ; 1.11.18.1 date 2006.01.28.23.39.05; author seb; state Exp; branches; next ; 1.8.2.1 date 2002.08.22.11.11.18; author jlam; state dead; branches; next ; desc @@ 1.17 log @Changes 6.3.1.0: * Bug fixes @ text @$NetBSD: patch-ac,v 1.16 2006/11/30 22:55:31 joerg Exp $ --- magick/option.h.orig 2006-11-30 22:13:12.000000000 +0000 +++ magick/option.h @@@@ -78,7 +78,7 @@@@ typedef enum MagickModuleOptions, /* MagickResourceOptions, -- duplicate Function context dependant */ MagickThresholdOptions, - MagickTypeOptions, + MagickTypeOptions } MagickOption; typedef struct _OptionInfo @ 1.16 log @Remove comma at end of enum in magick/options.h, making it parseable by C++ compilers. Bump revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Changes 6.2.7.3: * Add -adaptive-sharpen to the convert and mogrify programs. Changes 6.2.7.2: * Generate proper image filenames when filename has more than one embedded period (e.g. image.gif.eps becomes image.gif-0.eps, image.gif-1.eps, etc.). * CompositeImage() is now thread-safe. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.14 2006/05/03 22:57:22 wiz Exp $ d3 9 a11 21 --- coders/png.c.orig 2006-04-07 02:33:15.000000000 +0000 +++ coders/png.c @@@@ -1755,7 +1755,7 @@@@ static Image *ReadOnePNGImage(MngInfo *m #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \ && (PNG_LIBPNG_VER >= 10200) /* Disable thread-unsafe features of pnggccrd */ - if (png_access_version() >= 10200) + if (png_access_version_number() >= 10200) { png_uint_32 mmx_disable_mask=0; png_uint_32 asm_flags; @@@@ -1764,8 +1764,8 @@@@ static Image *ReadOnePNGImage(MngInfo *m | PNG_ASM_FLAG_MMX_READ_FILTER_SUB \ | PNG_ASM_FLAG_MMX_READ_FILTER_AVG \ | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ); - asm_flags=png_get_asm_flags(png_ptr); - png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask); + asm_flags=png_get_asm_flags(ping); + png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask); } #endif d13 1 @ 1.14 log @Fix some ifdef'd png code, using patch provided by Mathieu in PR 33325. Build fix for some cases. @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @Changes 6.2.6.3: * The command line utilities properly returns a non-zero status when an exception is thrown. Changes 6.2.6.2 * Fix a memory leak in each of CompositeImageCommand() and CompositeImage() * Add new options -layers compare-any, -layers compare-clear, -layers compare-overlay, and -layers optimize. * Draw last dash in a dashed polyline. * Add %D to -format to return the image disposal method. * ncorrect handling of file:// URIs causes data loss (patch from Daniel Kobras). * Set default BMP resolution units to PixelsPerCentimeter (problem report from digipete@@shaw...). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.12 2006/01/28 02:36:55 salo Exp $ d3 22 a24 32 Security fix for CVE-2006-0082, from Debian. --- magick/blob.c.orig 2006-01-19 00:30:32.000000000 +0100 +++ magick/blob.c 2006-01-28 02:29:06.000000000 +0100 @@@@ -1913,25 +1913,8 @@@@ /* Form filename for multi-part images. */ - (void) CopyMagickString(filename,image->filename,MaxTextExtent); - for (p=strchr(filename,'%'); p != (char *) NULL; p=strchr(p+1,'%')) - { - char - *q; - - q=p+1; - if (*q == '0') - (void) strtol(q,&q,10); - if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x')) - { - char - format[MaxTextExtent]; - - (void) CopyMagickString(format,p,MaxTextExtent); - (void) FormatMagickString(p,MaxTextExtent,format,image->scene); - break; - } - } + (void) FormatMagickStringNumeric(filename,MaxTextExtent,image->filename, + image->scene); if (image_info->adjoin == MagickFalse) if ((image->previous != (Image *) NULL) || (GetNextImageInList(image) != (Image *) NULL)) @ 1.12 log @Security fixes for CVE-2006-0082 and Debian bug #345595: "Format string vulnerabilities in ImageMagick allow user-complicit attackers to cause a denial of service (crash) and possibly execute arbitrary code via a numeric format string specifier such as %d in the file name, a variant of CVE-2005-0397, and as demonstrated using the convert program." Patches from Debian. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0082 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345876 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345595 @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update to 5.5.3.2. Changes include lots of bugfixes and some enhancements, in particular JNG support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2002/11/13 13:44:43 wiz Exp $ d3 32 a34 15 --- coders/fits.c.orig Sat Oct 12 18:41:32 2002 +++ coders/fits.c @@@@ -185,9 +185,11 @@@@ static Image *ReadFITSImage(const ImageI k, l, packet_size, - quantum, scene, y; + + int32_t + quantum; register IndexPacket *indexes; @ 1.11.18.1 log @Pullup ticket 1070 - requested by Lubomir Sedlacik sync graphics/ImageMagick with HEAD including security fixes Revisions pulled up: - pkgsrc/graphics/ImageMagick/Makefile 1.137 - pkgsrc/graphics/ImageMagick/Makefile.common 1.46 - pkgsrc/graphics/ImageMagick/PLIST 1.44 - pkgsrc/graphics/ImageMagick/buildlink3.mk 1.11 - pkgsrc/graphics/ImageMagick/distinfo 1.57, 1.58 - pkgsrc/graphics/ImageMagick/options.mk 1.4 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.33 - pkgsrc/graphics/ImageMagick/patches/patch-ab 1.16 - pkgsrc/graphics/ImageMagick/patches/patch-ac 1.12 - pkgsrc/graphics/ImageMagick/patches/patch-ad 1.9 - pkgsrc/graphics/ImageMagick/patches/patch-ae 1.6 - pkgsrc/graphics/ImageMagick/patches/patch-af 1.6 - pkgsrc/graphics/ImageMagick/patches/patch-ag 1.4 - pkgsrc/graphics/ImageMagick/patches/patch-ah 1.3 Module Name: pkgsrc Committed By: adam Date: Thu Jan 26 20:38:19 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST buildlink3.mk distinfo options.mk pkgsrc/graphics/ImageMagick/patches: patch-aa Log Message: Changes 6.2.6.0: * Bug fixes --- Module Name: pkgsrc Committed By: salo Date: Sat Jan 28 02:36:55 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile distinfo Added Files: pkgsrc/graphics/ImageMagick/patches: patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah Log Message: Security fixes for CVE-2006-0082 and Debian bug #345595: "Format string vulnerabilities in ImageMagick allow user-complicit attackers to cause a denial of service (crash) and possibly execute arbitrary code via a numeric format string specifier such as %d in the file name, a variant of CVE-2005-0397, and as demonstrated using the convert program." Patches from Debian. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0082 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345876 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345595 @ text @d1 1 a1 1 $NetBSD$ d3 15 a17 32 Security fix for CVE-2006-0082, from Debian. --- magick/blob.c.orig 2006-01-19 00:30:32.000000000 +0100 +++ magick/blob.c 2006-01-28 02:29:06.000000000 +0100 @@@@ -1913,25 +1913,8 @@@@ /* Form filename for multi-part images. */ - (void) CopyMagickString(filename,image->filename,MaxTextExtent); - for (p=strchr(filename,'%'); p != (char *) NULL; p=strchr(p+1,'%')) - { - char - *q; - - q=p+1; - if (*q == '0') - (void) strtol(q,&q,10); - if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x')) - { - char - format[MaxTextExtent]; - - (void) CopyMagickString(format,p,MaxTextExtent); - (void) FormatMagickString(p,MaxTextExtent,format,image->scene); - break; - } - } + (void) FormatMagickStringNumeric(filename,MaxTextExtent,image->filename, + image->scene); if (image_info->adjoin == MagickFalse) if ((image->previous != (Image *) NULL) || (GetNextImageInList(image) != (Image *) NULL)) @ 1.10 log @Update to 5.5.1-6. Changes: * Verify sanity of sysconf(_SC_PAGE_SIZE) and sysconf(_SC_PHYS_PAGES) before using their values. * Corrected bug in image geometry height calculation. * PingBlob() improperly set the length memory of BlobInfo to zero. * Fixed Ping() memory leak in PerlMagick. * Fixed -map problem in convert/mogrify utilities. * -border with a single value now produces correct results (e.g. -border 10). * Set locale type LC_NUMERIC to "C". * Bug fix for PS2 encoder. * Added PS-Adobe preamble to PS3 encoder. * Use ImageMagick release number to allow multiple ImageMagick releases to co-exist without interference on the same machine. * Decided that DrawGet functions should return by value. * Added detailed logging to BMP, PNG, and JPEG codecs, including JPEG quality estimate. * Added draw.h "DrawGet" equivalents to most of the "DrawSet" functions. * Added an array size argument to DrawSetDashPattern and got rid of the zero-termination garbage. o Remove 'Set' from the names of draw.h functions which update the current affine transformation array (e.g. DrawSetRotate becomes DrawRotate). * Under Windows, a DllMain function which automatically initializes ImageMagick (when ImageMagick is built using DLLs) may be added by defining ProvideDllMain in magick_config.h * Added resource consumption methods, see magick/resource.c. * Replaced underscores in commandline options with hyphens. For backward compatibility, underscores will continue to be recognized. * Added -blue-primary, -green-primary, -red-primary, -white-point options. * Added BMP2 and BMP3 output formats. * Changed chromaticity primary.z from 1.0 to 1.0-(primary.x+primary.y) in the PNG and PCD codecs. * Added 'exception' parameter to the ImageMagick progress monitor API. * Added enumerated types for the dispose member of the Image structure. * Added -version option to commandline utilities. * The xcf decoder would sometimes create artifacts when reading RLE-encoded grayscale images, due to the green and blue samples not being defined. * Added logging capabilities to the CORE API. This facility is useful for debugging. Added "events" parameter to the -debug commandline option. * AcquireImagePixels() did not always return the same pixel values for virtual pixels when the cache was stored on disk (very rare). * new -virtual-pixel command line option. * new PerlMagick virtual-pixel image attribute. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update "ImageMagick" and "p5-PerlMagick" packages to version 5.4.8.2. Many bugs were fixed since the release of version 5.3.9 and lots of new features like 32-Bit QuantumDepth support added. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2002/02/10 12:51:00 abs Exp $ d3 12 a14 11 --- configure.orig Wed Sep 12 17:39:17 2001 +++ configure @@@@ -4128,9 +4128,6 @@@@ eval "eval INFO_DIR=$infodir" eval "eval MAN_DIR=$mandir" -LDFLAGS="$LDFLAGS -L$LIB_DIR" -CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR" - # Extend includedir to include magick subdirectory offset includedir="$includedir/magick" d16 2 @ 1.8 log @Switch a 'long' to int32_t to work correctly on BE-LP64 platforms. Mark NOT_FOR_PLATFORM = NetBSD-*-sparc64 as c++ still broken @ text @d1 1 a1 1 $NetBSD$ @ 1.8.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2002/02/10 12:51:00 abs Exp $ @ 1.7 log @Update "ImageMagick" and "p5-PerlMagick" packages to version 5.3.9. A complete list of changes is not available unfortunately. Recent changes are: - Text drawing now handles UTF8-encoding. - Off-by-one GetImagePixels() fix in draw.c - PingImage() now reports attributes for all images an image sequence. - magick/image.h: Rename QuantumLeap define to QuantumDepth. QuantumDepth is set to the values 8 or 16, depend configuration option. - Updated PerlMagick signatures to signature algorithm. - ImageMagick defaults to 16-bit quantum. Set QuantumMagick for 8-bit. - Changed image->blob from BlobInfo to BlobInfo- so the Image structure size is not dependent on the large-file defines. - Added -background to convert prog - DispatchImage() now properly handles grayscale images. @ text @d3 12 a14 10 --- magick/xwindow.c.orig Sun Sep 9 04:04:32 2001 +++ magick/xwindow.c Mon Sep 17 16:40:54 2001 @@@@ -2424,6 +2424,7 @@@@ annotate_info->previous=(XAnnotateInfo *) NULL; annotate_info->next=(XAnnotateInfo *) NULL; (void) setlocale(LC_ALL,""); + (void) setlocale(LC_CTYPE,"C"); (void) setlocale(LC_NUMERIC,"C"); XSupportsLocale(); XSetLocaleModifiers(""); @ 1.6 log @Update "ImageMagick" package to version 5.2.2. Changes in version 5.2.2: - Support added for the Word Perfect Graphics (WPG) file format (contributed by Jaroslav Fojtik). - The pixel 'matte' field is changed to indicate the degree of pixel transparency rather than the degree of opacity. This makes the pixels compatable with most popular video cards, and many in-memory image formats. When the pixel quantum size is eight bits, the colormap is restricted to 256 colors, but supports up to 65535 colors when the quantum size is sixteen bits (when QuantumLeap is defined at compilation time). - ImageMagick is more memory efficient (by 18%) when the quantum size is eight bits, and the image is colormapped. - ImageMagick is (finally) believed to be thread safe under Windows, since it uses the Windows synchronization APIs to lock shared data. - Under Unix and Windows, dynamically-loaded format coder modules are supported. There are currently 72 loadable modules. Support for loadable modules allows the user to add or remove formats from ImageMagick by simply adding or removing a file. New modules are automatically detected so users may add their own modules. This support is proven to work for Sun Solaris, Linux, and SGI IRIX. Please let us know about other operating systems they work on. Building a modular ImageMagick is enabled by specifing the configure options --enable-shared --with-modules. - ImageMagick now has a set of modules for streaming. Here pixels are passed to the application as they are available and deleted after use ensuring a small memory footprint. This is useful for multi-media applications such as MPEG. - Image format identification (based on the file header) is now configured via an external text file. This allows the user to add automatic file identification for new formats added via a coder module, or via a delegate (external program). - XML files conforming to the W3C SVG DTD are now rendered directly by ImageMagick. The support is incomplete but still useful. - The Pilot Image Format (PDB) is now supported. - The drawing primitives have been extended to support drawing bezier curves, rounded rectangles, and arcs. There is now support for drawing compound objects (a sequence of objects) using drawing paths. The concept of a drawing pen has been split into stroke (for the outline) and fill (for the objects internal color). If fill is not defined, then only the object outline is drawn. This substantial change results in the existing drawing commands for filled objects (fillEllipse, fillRectangle, fillCircle, and fillPolygon) being deprecated. - A cache file format is now supported which is a snapshot of an image's pixel cache as it appears on disk. Images stored in this format (large) may be loaded instantly by ImageMagick since decoding is not required. In order to write this format , the argument -cache 0 must be supplied (e.g. convert -cache 0 file.jpg file.cache). - The build environment for Windows NT is entirely re-done. There is now a configure program which generates a set of Visual C++ project files which satisfy a set of reqirements (e.g. DLL, multi-thread, X11). These project files are then used to build ImageMagick. - The C API is significantly modified in order to provide thread-safe operation via function re-entrancy. ImageMagick is believed to be thread-safe when used with POSIX threads. It is not yet completely thread safe under Windows or the Mac. Errors (of type ExceptionInfo) are now reported by a function argument, or via a member of the current image. - The GaussianBlurImage() function (contributed by runger@@cs.mcgill.ca) supports Gaussian bluring an image. - Functions (OpenCacheView(), CloseCacheView(), GetCacheView(), SetCacheView(), and SyncCacheView()) are provided in order to support manipulating multiple pixel views. @ text @d3 3 a5 3 --- magick/xwindows.c.orig Wed Aug 2 00:09:23 2000 +++ magick/xwindows.c Thu Aug 10 10:19:48 2000 @@@@ -2460,6 +2460,7 @@@@ @ 1.5 log @Do the following to make this ELF and 1.3 friendly: - use the autoconf configure script to configure and build (we were already running configure but using Imake to build!?) - make use of pkglibtool (package already has full libtool support) (Note that now that we use Autoconf, this installs in ${LOCALBASE} without the need for a tool such as xpkgwedge. The configure script automatically detects all the stuff for which we had used patches in the Imakefiles.) Also use --without-... to disable optional components for which we have no explicit dependencies, which can be reenabled by the user in pkgsrc, so that the built binaries do not have "hidden" dependencies. Closes PR pkg/7463. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 1998/08/07 10:40:46 agc Exp $ d3 10 a12 9 --- xtp/Imakefile.orig Fri Jan 30 21:06:09 1998 +++ xtp/Imakefile Thu Feb 5 02:01:50 1998 @@@@ -45,5 +45,5 @@@@ NormalProgramTarget(xtp,$(XTPObjects),NullParameter,NullParameter,NullParameter) InstallProgram(xtp,$(LOCALDIR)) -InstallMultipleMan(xtp.1,$(LOCALMAN)) +InstallMultipleManSuffix(xtp,$(LOCALMAN1),1) DependTarget() @ 1.4 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Manual page creation only picked the correct filenames with my outdated "NetBSD.cf". It now works fine with the one from NetBSD's X11 sources. @ text @d1 2 @ 1.2 log @Fix broken "Imakefile" patches which caused "eqn" to process the the binaries files. @ text @d8 1 a8 1 +InstallMultipleMan(xtp.1,$(LOCALMAN1)) @ 1.1 log @Upgrade to version 4.0 of ImageMagick (from Hitoshi Osada osada@@meme.hokudai.ac.jp, thatrack@@da2.so-net.or.jp). Fixes PR pkg/4890. @ text @d1 3 a3 3 --- ./xtp/Imakefile~ Sun Jan 4 05:01:33 1998 +++ ./xtp/Imakefile Sat Jan 24 19:20:19 1998 @@@@ -41,5 +41,5 @@@@ d8 1 a8 1 +InstallMultipleMan(xtp,$(LOCALMAN1)) @