old

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

8 files changed, 15 insertions, 217 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/Manifest b/media-gfx/gif2png/Manifest
index 9de45be8df17..ef7e6952e9c6 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gif2png-2.5.1-overflow.patch 1247 RMD160 6a31529218a34d5d6cfc64fbae6076226acaf79e SHA1 821730cb89b72cb3df3829b6baa35bfe72b538a0 SHA256 3a0a7f10152489fd4875332459bb9a226dbb3eff166043e8481fb402b46a1c24
-AUX gif2png-2.5.4-libpng15.patch 1390 RMD160 47e9c7b674565fe13ee0d30ebc7d781623622b47 SHA1 30e5b0da688d216f869bf914f069286674f5eaa0 SHA256 5f5be172c09184e6e2d779401f9234184b9a4abf87ecacedec231c4cd6ee4009
-AUX gif2png-2.5.5-libpng15.patch 1260 RMD160 70fa9b42b8c8c9cf3fc69cef2da0c91aca7250bd SHA1 656d98fb8aa7824cf7826f2668bb4981613761cd SHA256 ced3a31bb91c4b0ec99dd8c5cbd02c7d48b748702657df124dbdb2f5ecfd0427
-DIST gif2png-2.5.4.tar.gz 125731 RMD160 372a56e260957a7f8895322904f3691df7e56d7e SHA1 40a33457e5d2beb0f001c14fabf0e92533c38450 SHA256 0d78eb568198b568f7c1f535b9ec74fc6546864de11f57924c8e8db510423fef
-DIST gif2png-2.5.5.tar.gz 126884 RMD160 1c1e68553d508bd34a37e0dafc061e39efc42228 SHA1 df38c056ab8441fff3735316fb0fc2c3953f6c93 SHA256 ebaa853fd585b80fd77cccb069e3734acabab668a33aad86cb107b1eac414904
-DIST gif2png-2.5.6.tar.gz 127073 RMD160 7494c392ff275e3466af58e079ccb6bdc36df14a SHA1 1aaa35ebe419e1a10a5acb23cceeba0c44b773e7 SHA256 9e3be951e1dcf9b75647c00bc527a25d65418e38f1b5f2022414160dafd868c4
 DIST gif2png-2.5.8.tar.gz 128373 RMD160 51f974d157c06da514a9abd5e2c9e25ecdbe66bb SHA1 69fabf807490ee3f91abed68dcb49a7355c83b3b SHA256 f962c6d1a76d6ec376cd380112235901dc0c130cc134db5e65a3408b4904ff18
-EBUILD gif2png-2.5.4.ebuild 720 RMD160 4de310c027e82d1b9617c442bfbc43edcb26fdd2 SHA1 133a5caa811042cf5884cf7afe830dfa8fc6014a SHA256 40d62f6cc6127d74261f2883c846c13d200d0d523e65a093624e2435be78176a
-EBUILD gif2png-2.5.5.ebuild 727 RMD160 e1bbbc7f30d7c77485a9496180175bc08d501b14 SHA1 d990c314b427b480d36792943594b9c15ef7b7f1 SHA256 491e88bdfd2a819a1fb2f31641af2df7f7d8fd67d9f602796cc866f0a61af7cb
-EBUILD gif2png-2.5.6.ebuild 675 RMD160 31421fcd649c22bf269d3024a5ab0527afd5f32e SHA1 27cd70d5260012106f4575c4be9c2766b1bd78cb SHA256 d705bfe17864223405e5a2b18ba46e87c848a63373d8d9d4943ca7461818f3b1
 EBUILD gif2png-2.5.8.ebuild 588 RMD160 da3cf867a2a81c5ea5488015c5dbca49ff2ac9af SHA1 b8837e4a2c8b3d8279ce18121c429c9a57ea2a15 SHA256 752f873f1cc62b1fd7160bac36acf928afbaa4c65496c46ecab576c7de73e951
-MISC ChangeLog 4325 RMD160 46b3931ba1485dce06c5ea2cece215fb73e5ad5e SHA1 5c6afcee990f8f739a81b7b7eb3696e9384b45bc SHA256 9e63721ce7243bcf1f6d379dc33bcaab46c58ce1cd156368fe129b415771bdd1
+MISC ChangeLog 4572 RMD160 e00be3ab4409e8660d410c2fbe6daa66fa260b07 SHA1 3aada57732dd8280e773c2204b2d515d0f610465 SHA256 6e31febf2d03749deac26580f537b0e7be67ea862b412052bb20e3f7e74cb26a
 MISC metadata.xml 223 RMD160 06142079e0afba051758f76a7ef850183217e8a4 SHA1 2dd01d07170c2cf8b971ff1c98060ed021f11abb SHA256 ecc20432f840921089d1c6864654a3261d6adde50362eee5fc4208b18042c576
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPWnulAAoJEEdUh39IaPFNjMIH/R0tdkcJqjvz87fLjwKhQof/
-xYN6EDvTO6xan2g37kDbhBYEvSvxj9wyfxNkZAJLffWA/MdMASYRdw3qR9EgHVzc
-nXZpWHrK1UGKAeYnZ3Z2GPNo/cZRPy5mMY4GTJSrnhHUaVd39OCFp4d32rRswwYc
-Z9vvHIyuafLs2V7DB9Y0MJo0U6VPQspd4nINO0Rn9Pv17itQsDd6qUUbCrJUqqIn
-Pi6yF5SLiJBak2h67r5GkRMu+xAvbKaF/uLIJC1oLiI16Oi9D772c0cirWOknEOS
-ED49PxnNtydP7jin1v+jhorNvcxoRyLC0iD1uDW4XWf9/2XZSovnDxW6KAb3uQE=
-=2QxQ
+iQEcBAEBAgAGBQJPWnvbAAoJEEdUh39IaPFN6AgH/2H5WSTSTU/TPWCvDkbcRlYE
+81wVQcKLwQ99f28b+pvydZg5Q+1LIxqG8WGnBpj3JTFoSLmERU442amAi4SZ9iWK
++nLPMWgF6tUPRlb9E/0il6jUQpgAv87b6bf6nypdnVgHSipaKCZbR2YTjVuXNJlT
+WfGaaQ7wz5pck5Mb5d31hh4lKBbWypCi1iGmYwJrCwgbqlS5mUoauny3TxZUOPdS
+iHpsmBEjTcA05zMVCkQVd1i+DmWk1oRLuGJEX6rZjjx/1NSLgMlKxJIIrvXzqQio
+Q62kejc6LaREkFJZsHQtJwU8oKkF5ia+5aHTOIV7yCoNfdNfEkyKONPOE8vAXnw=
+=ERUD
 -----END PGP SIGNATURE-----
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
-}