Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12554
Modified Files:
imagemagick.info imagemagick-nox.info
Log Message:
New upstream; requested by Max Horn. This version fixes CVE-2009-3736; reported
by Peter O'Gorman. Thanks.
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- imagemagick.info 21 Nov 2009 20:57:55 -0000 1.31
+++ imagemagick.info 22 Nov 2009 17:31:19 -0000 1.32
@@ -1,14 +1,14 @@
Info2: <<
Package: imagemagick%type_pkg[-nox]
Type: -nox .
-Version: 6.4.1
-Revision: 1015
+Version: 6.5.7
+Revision: 1
GCC: 4.0
-Source: mirror:sourceforge:imagemagick/ImageMagick-%v-1.tar.gz
-Source-MD5: 51c42ae5c2cad8d669e24eecaca91840
-SourceDirectory: ImageMagick-%v
+Source: mirror:sourceforge:imagemagick/ImageMagick-%v-9.tar.gz
+Source-MD5: 74a735033f975b1986ab01ce6d4ce364
+SourceDirectory: ImageMagick-%v-9
Depends: <<
- (%type_raw[-nox] = .) %N1-shlibs (= %v-%r),
+ (%type_raw[-nox] = .) %N2-shlibs (= %v-%r),
lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>=
1.900.1-1), libpng3-shlibs (>= 1:1.2.27-1), libdjvulibre15-shlibs (>=
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.4.1-1),
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>=
2.6.30-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.3.5-1),
ghostscript | ghostscript%type_pkg[-nox],
(%type_raw[-nox] = .) openexr,
@@ -59,7 +59,7 @@
export PATH=%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%type_raw[-nox]" == "." ]; then
- c="--with-x --with-rsvg --disable-static"
+ c="--with-x --with-rsvg --disable-static
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
else
c="--without-x --without-rsvg --without-wmf --disable-shared"
fi
@@ -121,29 +121,29 @@
as a matter of footprint to use xorg's fontconfig and freetype.
<<
SplitOff: <<
- Package: %N1-shlibs
+ Package: %N2-shlibs
Depends: <<
lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>=
6b-5), fontconfig2-shlibs (>= 2.4.1-1), expat1-shlibs (>= 2.0.0-1),
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.3.5-1), x11-shlibs
<<
Files: lib/lib*.*.dylib
Shlibs: <<
- %p/lib/libMagick++.1.dylib 2.0.0 %n (>= 6.3.8-1002)
- %p/lib/libMagickWand.1.dylib 2.0.0 %n (>= 6.3.8-1002)
- %p/lib/libMagickCore.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+ %p/lib/libMagick++.2.dylib 3.0.0 %n (>= 6.5.7-1)
+ %p/lib/libMagickWand.2.dylib 3.0.0 %n (>= 6.5.7-1)
+ %p/lib/libMagickCore.2.dylib 3.0.0 %n (>= 6.5.7-1)
<<
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
<<
SplitOff2: <<
- Package: %N1-dev
- Depends: (%type_raw[-nox] = .) %N1-shlibs (= %v-%r)
- Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
- Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
+ Package: %N2-dev
+ Depends: (%type_raw[-nox] = .) %N2-shlibs (= %v-%r)
+ Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
<<
SplitOff3: <<
- Package: %N1-svg
+ Package: %N2-svg
Depends: <<
(%type_raw[-nox] = .) cairo-shlibs (>= 1.6-1),
(%type_raw[-nox] = .) gconf2-shlibs (>= 2.20.1-1),
Index: imagemagick-nox.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick-nox.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imagemagick-nox.info 21 Nov 2009 20:57:55 -0000 1.11
+++ imagemagick-nox.info 22 Nov 2009 17:31:19 -0000 1.12
@@ -1,14 +1,14 @@
Info2: <<
Package: imagemagick%type_pkg[-nox]
Type: -nox -nox
-Version: 6.4.1
-Revision: 1015
+Version: 6.5.7
+Revision: 1
GCC: 4.0
-Source: mirror:sourceforge:imagemagick/ImageMagick-%v-1.tar.gz
-Source-MD5: 51c42ae5c2cad8d669e24eecaca91840
-SourceDirectory: ImageMagick-%v
+Source: mirror:sourceforge:imagemagick/ImageMagick-%v-9.tar.gz
+Source-MD5: 74a735033f975b1986ab01ce6d4ce364
+SourceDirectory: ImageMagick-%v-9
Depends: <<
- (%type_raw[-nox] = .) %N1-shlibs (= %v-%r),
+ (%type_raw[-nox] = .) %N2-shlibs (= %v-%r),
lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjasper.1-shlibs (>=
1.900.1-1), libpng3-shlibs (>= 1:1.2.27-1), libdjvulibre15-shlibs (>=
3.5.18-1), libjpeg-shlibs (>= 6b-5), fontconfig2-shlibs (>= 2.4.1-1),
expat1-shlibs (>= 2.0.0-1), bzip2-shlibs (>= 1.0.2-2), libxml2-shlibs (>=
2.6.30-1), libiconv (>= 1.11-1), freetype219-shlibs (>= 2.3.5-1),
ghostscript | ghostscript%type_pkg[-nox],
(%type_raw[-nox] = .) openexr,
@@ -59,7 +59,7 @@
export PATH=%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%type_raw[-nox]" == "." ]; then
- c="--with-x --with-rsvg --disable-static"
+ c="--with-x --with-rsvg --disable-static
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
else
c="--without-x --without-rsvg --without-wmf --disable-shared"
fi
@@ -121,29 +121,29 @@
as a matter of footprint to use xorg's fontconfig and freetype.
<<
#SplitOff: <<
-# Package: %N1-shlibs
+# Package: %N2-shlibs
# Depends: <<
# lcms-shlibs (>= 1.11-1), libtiff-shlibs (>= 3.6.1-3), libjpeg-shlibs (>=
6b-5), fontconfig2-shlibs (>= 2.4.1-1), expat1-shlibs (>= 2.0.0-1),
bzip2-shlibs (>= 1.0.2-2), freetype219-shlibs (>= 2.3.5-1), x11-shlibs
# <<
# Files: lib/lib*.*.dylib
# Shlibs: <<
-# %p/lib/libMagick++.1.dylib 2.0.0 %n (>= 6.3.8-1002)
-# %p/lib/libMagickWand.1.dylib 2.0.0 %n (>= 6.3.8-1002)
-# %p/lib/libMagickCore.1.dylib 2.0.0 %n (>= 6.3.8-1002)
+# %p/lib/libMagick++.2.dylib 3.0.0 %n (>= 6.5.7-1)
+# %p/lib/libMagickWand.2.dylib 3.0.0 %n (>= 6.5.7-1)
+# %p/lib/libMagickCore.2.dylib 3.0.0 %n (>= 6.5.7-1)
# <<
# DocFiles: LICENSE README.txt ChangeLog NEWS.txt
#<<
SplitOff2: <<
- Package: %N1-dev
- Depends: (%type_raw[-nox] = .) %N1-shlibs (= %v-%r)
- Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
- Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev
+ Package: %N2-dev
+ Depends: (%type_raw[-nox] = .) %N2-shlibs (= %v-%r)
+ Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
+ Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev, imagemagick1-dev, imagemagick-nox1-dev,
imagemagick2-dev, imagemagick-nox2-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS.txt
<<
#SplitOff3: <<
-# Package: %N1-svg
+# Package: %N2-svg
# Depends: <<
# (%type_raw[-nox] = .) cairo-shlibs (>= 1.6-1),
# (%type_raw[-nox] = .) gconf2-shlibs (>= 2.20.1-1),
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
