Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx/graphicsmagick
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/graphicsmagick')
-rw-r--r--media-gfx/graphicsmagick/ChangeLog8
-rw-r--r--media-gfx/graphicsmagick/Manifest13
-rw-r--r--media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6-r11
-rw-r--r--media-gfx/graphicsmagick/files/xwd-dos.patch32
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild98
5 files changed, 141 insertions, 11 deletions
diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 25f9ff3c6703..f81969df0576 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/graphicsmagick
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.18 2005/05/03 22:44:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.19 2005/05/20 19:41:53 kloeri Exp $
+
+*graphicsmagick-1.1.6-r1 (20 May 2005)
+
+ 20 May 2005; Bryan Østergaard <kloeri@gentoo.org> +files/xwd-dos.patch,
+ +graphicsmagick-1.1.6-r1.ebuild:
+ Security fix, bug 90595.
*graphicsmagick-1.1.6 (03 May 2005)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index f5f2713c5914..0897598bd074 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7ac93fad68506031a6606464bf33181a graphicsmagick-1.1.6-r1.ebuild 2509
MD5 e55a4a0c731ea407ee01adc403bc8ba2 ChangeLog 2755
MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
MD5 f28ab825c8f582c4ffa270c04678251f graphicsmagick-1.1.5.ebuild 2365
MD5 1896b5c7abc42fb5933ba787f535d40e graphicsmagick-1.1.6.ebuild 2435
MD5 ded8cc3796c1c2d79702b832850518dc graphicsmagick-1.1.5-r1.ebuild 2437
+MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6-r1 74
MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5 74
MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5-r1 74
MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCd/6/Kf2g/qXtneoRAvxXAJ453ln8NPdAte+JMBT1XkjrJLwMOQCfQErV
-jmUFCK2c12i9VYwTPiMQxis=
-=Pdac
------END PGP SIGNATURE-----
+MD5 0d86c7176f6338aed5b5f86af8f76d63 files/xwd-dos.patch 1103
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6-r1 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6-r1
new file mode 100644
index 000000000000..40f2fb17c113
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.6-r1
@@ -0,0 +1 @@
+MD5 ee85aef3cde13432a3f2e5604b758f9c GraphicsMagick-1.1.6.tar.bz2 4959704
diff --git a/media-gfx/graphicsmagick/files/xwd-dos.patch b/media-gfx/graphicsmagick/files/xwd-dos.patch
new file mode 100644
index 000000000000..4fc1fd2bfa9f
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/xwd-dos.patch
@@ -0,0 +1,32 @@
+===================================================================
+RCS file: /GraphicsMagick/GraphicsMagick/coders/xwd.c,v
+retrieving revision 1.88
+retrieving revision 1.88.2.1
+diff -u -p -r1.88 -r1.88.2.1
+--- GraphicsMagick/coders/xwd.c 2004/02/17 03:41:53 1.88
++++ GraphicsMagick/coders/xwd.c 2005/05/16 18:51:04 1.88.2.1
+@@ -325,21 +325,21 @@ static Image *ReadXWDImage(const ImageIn
+ */
+ red_mask=ximage->red_mask;
+ red_shift=0;
+- while ((red_mask & 0x01) == 0)
++ while ((red_mask != 0) && ((red_mask & 0x01) == 0))
+ {
+ red_mask>>=1;
+ red_shift++;
+ }
+ green_mask=ximage->green_mask;
+ green_shift=0;
+- while ((green_mask & 0x01) == 0)
++ while ((green_mask != 0) && ((green_mask & 0x01) == 0))
+ {
+ green_mask>>=1;
+ green_shift++;
+ }
+ blue_mask=ximage->blue_mask;
+ blue_shift=0;
+- while ((blue_mask & 0x01) == 0)
++ while ((blue_mask != 0) && ((blue_mask & 0x01) == 0))
+ {
+ blue_mask>>=1;
+ blue_shift++;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..e38ed2cfaea9
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.6-r1.ebuild,v 1.1 2005/05/20 19:41:53 kloeri Exp $
+
+inherit libtool flag-o-matic perl-module
+replace-flags k6-3 i586
+replace-flags k6-2 i586
+replace-flags k6 i586
+
+IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2"
+
+MY_PN=GraphicsMagick
+MY_P=${MY_PN}-${PV}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A collection of tools and libraries for many image formats"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.graphicsmagick.org/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~ppc x86"
+
+DEPEND=">=sys-apps/sed-4
+ >=app-arch/bzip2-1
+ sys-libs/zlib
+ X? ( virtual/x11 )
+ gs? ( virtual/ghostscript )
+ jbig? ( media-libs/jbigkit )
+ jp2? ( media-libs/jasper )
+ jpeg? ( >=media-libs/jpeg-6b )
+ lcms? ( >=media-libs/lcms-1.06 )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng )
+ tiff? ( >=media-libs/tiff-3.5.5 )
+ xml2? ( >=dev-libs/libxml2-2.4.10 )
+ truetype? ( =media-libs/freetype-2* )
+ wmf? ( >=media-libs/libwmf-0.2.5 )"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/xwd-dos.patch
+}
+
+src_compile() {
+ local myconf=""
+ myconf="${myconf} $(use_with X x)"
+ myconf="${myconf} $(use_with jbig)"
+ myconf="${myconf} $(use_with jp2)"
+ myconf="${myconf} $(use_with jpeg)"
+ myconf="${myconf} $(use_with lcms)"
+ myconf="${myconf} $(use_enable lzw)"
+ myconf="${myconf} $(use_with png)"
+ myconf="${myconf} $(use_with tiff)"
+ myconf="${myconf} $(use_with truetype ttf)"
+ myconf="${myconf} $(use_with wmf)"
+ myconf="${myconf} $(use_with xml2 xml)"
+
+ # Netscape is still used ? More people should have Mozilla
+ sed -i 's:netscape:mozilla:g' configure
+
+ econf \
+ --with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+ --enable-shared \
+ --with-quantum-depth=16 \
+ --with-threads \
+ --with-bzlib \
+ --without-perl \
+ ${myconf} || die
+
+ # make PerlMagick using portage tools instead of Makefile to avoid sandbox issues
+ if use perl ; then
+ cd PerlMagick
+ perl-module_src_prep
+ perl-module_src_compile
+ cd ..
+ fi
+
+ emake || die "compile problem"
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+
+ if use perl ; then
+ cd PerlMagick
+ perl-module_src_install
+ cd ..
+ fi
+
+ dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick
+
+ rm -f ${D}/usr/share/GraphicsMagick/*.txt
+
+ dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config
+ dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config
+}