Module Name:	pkgsrc
Committed By:	seb
Date:		Sat Jan 28 23:39:05 UTC 2006

Modified Files:
	pkgsrc/graphics/ImageMagick [pkgsrc-2005Q4]: Makefile Makefile.common
	    PLIST buildlink3.mk distinfo options.mk
	pkgsrc/graphics/ImageMagick/patches [pkgsrc-2005Q4]: patch-aa
Added Files:
	pkgsrc/graphics/ImageMagick/patches [pkgsrc-2005Q4]: patch-ab patch-ac
	    patch-ad patch-ae patch-af patch-ag patch-ah

Log Message:
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


To generate a diff of this commit:
cvs rdiff -r1.133 -r1.133.2.1 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -r1.45 -r1.45.2.1 pkgsrc/graphics/ImageMagick/Makefile.common
cvs rdiff -r1.43 -r1.43.2.1 pkgsrc/graphics/ImageMagick/PLIST
cvs rdiff -r1.9 -r1.9.6.1 pkgsrc/graphics/ImageMagick/buildlink3.mk
cvs rdiff -r1.56 -r1.56.2.1 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -r1.3 -r1.3.6.1 pkgsrc/graphics/ImageMagick/options.mk
cvs rdiff -r1.32 -r1.32.2.1 pkgsrc/graphics/ImageMagick/patches/patch-aa
cvs rdiff -r0 -r1.15.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ab
cvs rdiff -r0 -r1.11.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ac
cvs rdiff -r0 -r1.8.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ad
cvs rdiff -r0 -r1.5.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ae \
    pkgsrc/graphics/ImageMagick/patches/patch-af
cvs rdiff -r0 -r1.3.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ag
cvs rdiff -r0 -r1.2.18.1 pkgsrc/graphics/ImageMagick/patches/patch-ah

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.