From b8df143e156dad4e7df149c8f408b56bd758dc9d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 22 Jun 2007 00:54:23 +0000 Subject: old --- media-libs/gd/files/digest-gd-2.0.32 | 3 -- media-libs/gd/files/digest-gd-2.0.33 | 3 -- media-libs/gd/files/gd-2.0.33-iconv.patch | 12 ------ .../gd/files/gd-2.0.33-overflow-checks.patch | 49 ---------------------- media-libs/gd/gd-2.0.32.ebuild | 37 ---------------- media-libs/gd/gd-2.0.33.ebuild | 48 --------------------- 6 files changed, 152 deletions(-) delete mode 100644 media-libs/gd/files/digest-gd-2.0.32 delete mode 100644 media-libs/gd/files/digest-gd-2.0.33 delete mode 100644 media-libs/gd/files/gd-2.0.33-iconv.patch delete mode 100644 media-libs/gd/files/gd-2.0.33-overflow-checks.patch delete mode 100644 media-libs/gd/gd-2.0.32.ebuild delete mode 100644 media-libs/gd/gd-2.0.33.ebuild (limited to 'media-libs/gd') diff --git a/media-libs/gd/files/digest-gd-2.0.32 b/media-libs/gd/files/digest-gd-2.0.32 deleted file mode 100644 index 5181873f91db..000000000000 --- a/media-libs/gd/files/digest-gd-2.0.32 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f7978941e578de778a3f4da759db7b29 gd-2.0.32.tar.gz 587498 -RMD160 a4991be23de05ab9037ddd114c921d1d4000e467 gd-2.0.32.tar.gz 587498 -SHA256 36d615c7ba1ab2e4c4b7431e87570ea4e1c7c9fe11180c4c67cec53bba4f609e gd-2.0.32.tar.gz 587498 diff --git a/media-libs/gd/files/digest-gd-2.0.33 b/media-libs/gd/files/digest-gd-2.0.33 deleted file mode 100644 index e16d48ca2999..000000000000 --- a/media-libs/gd/files/digest-gd-2.0.33 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 be0a6d326cd8567e736fbc75df0a5c45 gd-2.0.33.tar.gz 587617 -RMD160 6c573638387bb36044f3d4d480b10229445b9a6b gd-2.0.33.tar.gz 587617 -SHA256 2ba10c830e24781ec2e0594c6e49353e512e8bda782bc9a1851e70a5e8ced93e gd-2.0.33.tar.gz 587617 diff --git a/media-libs/gd/files/gd-2.0.33-iconv.patch b/media-libs/gd/files/gd-2.0.33-iconv.patch deleted file mode 100644 index bd29c29b481b..000000000000 --- a/media-libs/gd/files/gd-2.0.33-iconv.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gd-2.0.33/Makefile.am -=================================================================== ---- gd-2.0.33.orig/Makefile.am -+++ gd-2.0.33/Makefile.am -@@ -20,6 +20,7 @@ lib_LTLIBRARIES = libgd.la - libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h - - libgd_la_LDFLAGS = -version-info 2:0:0 -+libgd_la_LIBADD = $(LTLIBICONV) - - LDADD = ./libgd.la - diff --git a/media-libs/gd/files/gd-2.0.33-overflow-checks.patch b/media-libs/gd/files/gd-2.0.33-overflow-checks.patch deleted file mode 100644 index 6a028a13093d..000000000000 --- a/media-libs/gd/files/gd-2.0.33-overflow-checks.patch +++ /dev/null @@ -1,49 +0,0 @@ -add some sanity checks to prevent integer overflows when -allocating memory for big images - -http://bugs.gentoo.org/112937 - ---- gd/gd.c -+++ gd/gd.c -@@ -74,6 +74,10 @@ BGD_DECLARE(gdImagePtr) gdImageCreate (i - im = (gdImage *) gdMalloc (sizeof (gdImage)); - memset (im, 0, sizeof (gdImage)); - /* Row-major ever since gd 1.3 */ -+ if (overflow2(sizeof (unsigned char *), sy)) { -+ gdFree(im); -+ return NULL; -+ } - im->pixels = (unsigned char **) gdMalloc (sizeof (unsigned char *) * sy); - im->polyInts = 0; - im->polyAllocated = 0; -@@ -114,6 +118,10 @@ BGD_DECLARE(gdImagePtr) gdImageCreateTru - gdImagePtr im; - im = (gdImage *) gdMalloc (sizeof (gdImage)); - memset (im, 0, sizeof (gdImage)); -+ if (overflow2(sizeof (int *), sy)) { -+ gdFree(im); -+ return NULL; -+ } - im->tpixels = (int **) gdMalloc (sizeof (int *) * sy); - im->polyInts = 0; - im->polyAllocated = 0; -@@ -2462,6 +2470,8 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro - } - bytes = (w * h / 8) + 1; - im = gdImageCreate (w, h); -+ if (!im) -+ return 0; - gdImageColorAllocate (im, 255, 255, 255); - gdImageColorAllocate (im, 0, 0, 0); - x = 0; ---- gd/gd_gd.c -+++ gd/gd_gd.c -@@ -149,6 +149,8 @@ _gdCreateFromFile (gdIOCtx * in, int *sx - { - im = gdImageCreate (*sx, *sy); - } -+ if (!im) -+ goto fail1; - if (!_gdGetColors (in, im, gd2xFlag)) - { - goto fail2; diff --git a/media-libs/gd/gd-2.0.32.ebuild b/media-libs/gd/gd-2.0.32.ebuild deleted file mode 100644 index fc33b1081d75..000000000000 --- a/media-libs/gd/gd-2.0.32.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.32.ebuild,v 1.9 2007/02/15 21:37:58 grobian Exp $ - -inherit eutils - -DESCRIPTION="A graphics library for fast image creation" -HOMEPAGE="http://www.boutell.com/gd/" -SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz" - -LICENSE="|| ( as-is BSD )" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="fontconfig jpeg png truetype xpm" - -DEPEND="fontconfig? ( media-libs/fontconfig ) - jpeg? ( >=media-libs/jpeg-6b ) - png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib ) - truetype? ( >=media-libs/freetype-2.1.5 ) - xpm? ( || ( ( x11-libs/libXpm x11-libs/libXt ) virtual/x11 ) )" - -src_compile() { - econf \ - $(use_with fontconfig) \ - $(use_with png) \ - $(use_with truetype freetype) \ - $(use_with jpeg) \ - $(use_with xpm) \ - || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc INSTALL README* - dohtml -r ./ -} diff --git a/media-libs/gd/gd-2.0.33.ebuild b/media-libs/gd/gd-2.0.33.ebuild deleted file mode 100644 index eb1bbbba83b3..000000000000 --- a/media-libs/gd/gd-2.0.33.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.33.ebuild,v 1.14 2007/02/15 21:37:58 grobian Exp $ - -inherit eutils libtool autotools - -DESCRIPTION="A graphics library for fast image creation" -HOMEPAGE="http://www.boutell.com/gd/" -SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz" - -LICENSE="|| ( as-is BSD )" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="fontconfig jpeg png truetype xpm" - -DEPEND="fontconfig? ( media-libs/fontconfig ) - jpeg? ( >=media-libs/jpeg-6b ) - png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib ) - truetype? ( >=media-libs/freetype-2.1.5 ) - xpm? ( || ( ( x11-libs/libXpm x11-libs/libXt ) virtual/x11 ) )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-overflow-checks.patch - epatch "${FILESDIR}/${P}-iconv.patch" - - eautomake - - elibtoolize #117078 -} - -src_compile() { - econf \ - $(use_with fontconfig) \ - $(use_with png) \ - $(use_with truetype freetype) \ - $(use_with jpeg) \ - $(use_with xpm) \ - || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc INSTALL README* - dohtml -r ./ -} -- cgit v1.2.3-65-gdbad