old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

7 files changed, 7 insertions, 200 deletions

diff --git a/media-gfx/gif2png/ChangeLog b/media-gfx/gif2png/ChangeLog
index f8f26db96045..b460e2dedc6a 100644
--- a/media-gfx/gif2png/ChangeLog
+++ b/media-gfx/gif2png/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gif2png
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.33 2012/03/09 21:52:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/ChangeLog,v 1.34 2012/03/09 21:53:26 ssuominen Exp $
+
+  09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/gif2png-2.5.1-overflow.patch, -gif2png-2.5.4.ebuild,
+  -files/gif2png-2.5.4-libpng15.patch, -gif2png-2.5.5.ebuild,
+  -files/gif2png-2.5.5-libpng15.patch, -gif2png-2.5.6.ebuild:
+  old
 
   09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> gif2png-2.5.8.ebuild:
   amd64/ppc/ppc64/x86 stable wrt #351698
diff --git a/media-gfx/gif2png/files/gif2png-2.5.1-overflow.patch b/media-gfx/gif2png/files/gif2png-2.5.1-overflow.patch
deleted file mode 100644
index aff1e588e208..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.1-overflow.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fixes cmdline buffer overflow described in
-
-http://lists.grok.org.uk/pipermail/full-disclosure/2009-December/072002.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550978
-
-Index: gif2png-2.5.3/gif2png.c
-===================================================================
---- gif2png-2.5.3.orig/gif2png.c
-+++ gif2png-2.5.3/gif2png.c
-@@ -675,7 +675,10 @@ int processfile(char *fname, FILE *fp)
- 
-     strcpy(outname, fname);
- 
--    file_ext = outname+strlen(outname)-4;
-+    file_ext = outname+strlen(outname);
-+    if (file_ext >= outname + 4)
-+	file_ext -= 4;
-+
-     if (strcmp(file_ext, ".gif") != 0 && strcmp(file_ext, ".GIF") != 0 &&
- 	strcmp(file_ext, "_gif") != 0 && strcmp(file_ext, "_GIF") != 0) {
- 	/* try to derive basename */
-@@ -863,6 +866,14 @@ int main(int argc, char *argv[])
- 	}
-     } else {
- 	for (i = ac;i<argc; i++) {
-+	    /* make sure that there is enough space for a '.p<NUM>' suffix;
-+	       this check catches also the '.gif' case below. */
-+	    if (strlen(argv[i]) >= sizeof name - sizeof ".p" - 3 * sizeof(int)) {
-+		fprintf(stderr, "%s: name too long\n", argv[i]);
-+		errors = 1;
-+		continue;
-+	    }
-+
- 	    strcpy(name, argv[i]);
- 	    if ((fp = fopen(name, "rb")) == NULL) {
- 		/* retry with .gif appended */
diff --git a/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch b/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch
deleted file mode 100644
index 9e5c333bba43..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.4-libpng15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
-
---- gif2png.c
-+++ gif2png.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>	/* for isatty() */
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
-     int colors_used = 0;
-     byte remap[MAXCMSIZE];
-     int low_prec;
--    png_struct *png_ptr = xalloc(sizeof (png_struct));
--    png_info *info_ptr = xalloc(sizeof (png_info));
-+    png_struct *png_ptr;
-+    png_info *info_ptr;
-     int p;
-     int gray_bitdepth;
-     png_color pal_rgb[MAXCMSIZE], *pltep;
-@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
-     png_text software;
-     png_text comment;
- 
-+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (png_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (info_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-     volatile int gray = TRUE;
diff --git a/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch b/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch
deleted file mode 100644
index ded68538ac4c..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.5-libpng15.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- gif2png-2.5.5/gif2png.c.orig
-+++ gif2png-2.5.5/gif2png.c
-@@ -12,6 +12,7 @@
- #include <unistd.h>	/* for isatty() */
- #include <sys/stat.h>
- #include <utime.h>
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -122,8 +123,8 @@
-     int colors_used = 0;
-     byte remap[MAXCMSIZE];
-     int low_prec;
--    png_struct *png_ptr = xalloc(sizeof (png_struct));
--    png_info *info_ptr = xalloc(sizeof (png_info));
-+    png_struct *png_ptr;
-+    png_info *info_ptr;
-     int p;
-     int gray_bitdepth;
-     png_color pal_rgb[MAXCMSIZE], *pltep;
-@@ -138,6 +139,19 @@
-     png_text software;
-     png_text comment;
- 
-+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (png_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (info_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-     volatile int gray = TRUE;
diff --git a/media-gfx/gif2png/gif2png-2.5.4.ebuild b/media-gfx/gif2png/gif2png-2.5.4.ebuild
deleted file mode 100644
index 5ac470b61d28..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.4.ebuild,v 1.5 2011/10/23 16:15:03 armin76 Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.4
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.5.1-overflow.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.5.ebuild b/media-gfx/gif2png/gif2png-2.5.5.ebuild
deleted file mode 100644
index 070cc8bf9ce9..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.5.ebuild,v 1.1 2012/02/03 07:32:21 radhermit Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.4
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.5.1-overflow.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.6.ebuild b/media-gfx/gif2png/gif2png-2.5.6.ebuild
deleted file mode 100644
index 0a5fccab6fd6..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.6.ebuild,v 1.1 2012/03/08 12:36:02 ssuominen Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.1-overflow.patch
-}