Adding zgv 5.9, bug #134839

Package-Manager: portage-2.1_rc3-r1

5 files changed, 167 insertions, 6 deletions

diff --git a/media-gfx/zgv/ChangeLog b/media-gfx/zgv/ChangeLog
index 0eb67608d48c..a4b5ebb37513 100644
--- a/media-gfx/zgv/ChangeLog
+++ b/media-gfx/zgv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/zgv
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.11 2004/12/15 14:59:04 lanius Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.12 2006/05/30 12:48:18 dercorny Exp $
+
+*zgv-5.9 (30 May 2006)
+
+  30 May 2006; Stefan Cornelius <corny@gentoo.org>
+  +files/zgv-5.9-cmyk-yccl-fix.diff, +zgv-5.9.ebuild:
+  Adding zgv 5.9, security bug #134839
 
 *zgv-5.8 (06 Nov 2004)
 
diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index f02d7b1b3205..9635b8ff867b 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,8 +1,44 @@
-MD5 3ed7ebf62221997d28c3cb9940235bb1 zgv-5.8.ebuild 1221
+AUX zgv-5.7-gcc3.patch 7078 RMD160 90b58946e3dffc55ad28973b028e7648cbfba686 SHA1 21531d051329af1d94035e8c8d1440faddaa81b4 SHA256 c8798c8b5de3a517603aa8b8d83e742a073fbf27af694b892b7a0fced1eae645
+MD5 d41b7ec521804bd1ff821a49464f8688 files/zgv-5.7-gcc3.patch 7078
+RMD160 90b58946e3dffc55ad28973b028e7648cbfba686 files/zgv-5.7-gcc3.patch 7078
+SHA256 c8798c8b5de3a517603aa8b8d83e742a073fbf27af694b892b7a0fced1eae645 files/zgv-5.7-gcc3.patch 7078
+AUX zgv-5.8-integer-overflow-fix.diff 10910 RMD160 f4d6189be8489a06f2c4abcce5a2106f13243a88 SHA1 8b8d3fc898b7583e1e1566e36523fa8d50169524 SHA256 ef38904db4e183f9cbfa05f2b7cdccef32932322f26d33e6905e4bd43ca74a4b
+MD5 1683151022bec4c607d5c33c6eb65592 files/zgv-5.8-integer-overflow-fix.diff 10910
+RMD160 f4d6189be8489a06f2c4abcce5a2106f13243a88 files/zgv-5.8-integer-overflow-fix.diff 10910
+SHA256 ef38904db4e183f9cbfa05f2b7cdccef32932322f26d33e6905e4bd43ca74a4b files/zgv-5.8-integer-overflow-fix.diff 10910
+AUX zgv-5.9-cmyk-yccl-fix.diff 1554 RMD160 c7b9c9c4f1bfda5e7b49d4ced5da75e2de974953 SHA1 1e161341030ab69feba9926693e7e97bd8aaecad SHA256 17291c05c6d67c32b5bfc1c4afd0756bc8e168567c7a8e965a2befb20b18689c
+MD5 82cb1c3bf8606aa4c282698cf7d6d182 files/zgv-5.9-cmyk-yccl-fix.diff 1554
+RMD160 c7b9c9c4f1bfda5e7b49d4ced5da75e2de974953 files/zgv-5.9-cmyk-yccl-fix.diff 1554
+SHA256 17291c05c6d67c32b5bfc1c4afd0756bc8e168567c7a8e965a2befb20b18689c files/zgv-5.9-cmyk-yccl-fix.diff 1554
+DIST zgv-5.7.tar.gz 384977
+DIST zgv-5.8.tar.gz 391623
+DIST zgv-5.9.tar.gz 395525 RMD160 1d1c47c77adc732c581d9db1189243a94c510586 SHA1 e29b81bb51401376b43397de3857e8ed846a7cad SHA256 92e5d848fb51a77dc0ebb0ab383c1499c23aaff01f5445e9b0d75e067a8a64ba
+EBUILD zgv-5.7-r1.ebuild 1128 RMD160 e29d7fe52679f2c547bc12b8b554c21ec072b76d SHA1 534fd198415d55a3fde8071afd26c899fa04e845 SHA256 1cca9be36e1cd1a0c78068392305d9041eccf6fdfa0112b097b1d3157b22f75d
 MD5 065dec6535104ab6218a95c2fedbeb20 zgv-5.7-r1.ebuild 1128
-MD5 b00dbaba35d4f393907d22059146ddb7 ChangeLog 1547
+RMD160 e29d7fe52679f2c547bc12b8b554c21ec072b76d zgv-5.7-r1.ebuild 1128
+SHA256 1cca9be36e1cd1a0c78068392305d9041eccf6fdfa0112b097b1d3157b22f75d zgv-5.7-r1.ebuild 1128
+EBUILD zgv-5.8.ebuild 1221 RMD160 b14af89b9cfb3ee541d81087765ddd4d72ba0a66 SHA1 b2271cf4929b3b4510b047eee8d7f65cb8804bd8 SHA256 6a7dcaed9a741ab59aa713ad46d60383dc2f4e575d8245833ae7f035030ddb9f
+MD5 3ed7ebf62221997d28c3cb9940235bb1 zgv-5.8.ebuild 1221
+RMD160 b14af89b9cfb3ee541d81087765ddd4d72ba0a66 zgv-5.8.ebuild 1221
+SHA256 6a7dcaed9a741ab59aa713ad46d60383dc2f4e575d8245833ae7f035030ddb9f zgv-5.8.ebuild 1221
+EBUILD zgv-5.9.ebuild 1217 RMD160 29cc06d470431d1bea883df15dda11c828cc9249 SHA1 4f45e4ea49ef5ff0146bcdb3115d549f4a991abd SHA256 d0c5024efd7e96c6882d348db13d2a45a2c0ef11f47f6e631d58a2a24911f7fc
+MD5 38fcc8a2b17ae9691969a66b41d390cf zgv-5.9.ebuild 1217
+RMD160 29cc06d470431d1bea883df15dda11c828cc9249 zgv-5.9.ebuild 1217
+SHA256 d0c5024efd7e96c6882d348db13d2a45a2c0ef11f47f6e631d58a2a24911f7fc zgv-5.9.ebuild 1217
+MISC ChangeLog 1718 RMD160 cce34a17b3b0280a4a3f03d7d5ff0950f2884b75 SHA1 79a027c6e5f24e7b772d8c657a7b2ab06a8d3002 SHA256 e334d81e52cc199182327696a71d655f0e87677a3e87df916bc46720772cdc7e
+MD5 6435de331c67677306603fd6ce5a3a77 ChangeLog 1718
+RMD160 cce34a17b3b0280a4a3f03d7d5ff0950f2884b75 ChangeLog 1718
+SHA256 e334d81e52cc199182327696a71d655f0e87677a3e87df916bc46720772cdc7e ChangeLog 1718
+MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
 MD5 1c0e7ed3b8b41a4715baee9702d8f75b files/digest-zgv-5.7-r1 59
-MD5 d41b7ec521804bd1ff821a49464f8688 files/zgv-5.7-gcc3.patch 7078
+RMD160 d3302236680a63b98cb0247399d70cfc7624a073 files/digest-zgv-5.7-r1 59
+SHA256 069a13bc7a8fc3b687174bebc2b9c5718822acd5f4ee7a6ebdfa6ad7b88c25f2 files/digest-zgv-5.7-r1 59
 MD5 75f0cfb0c1cbe1f896115eaba8fe2e1a files/digest-zgv-5.8 59
-MD5 1683151022bec4c607d5c33c6eb65592 files/zgv-5.8-integer-overflow-fix.diff 10910
+RMD160 3739328c918dd1c75dc798df800b5ad0f13a0e6e files/digest-zgv-5.8 59
+SHA256 400bddf506a66014b3ae1c26d77f1ab44d26054d8260dd8fa934a3c617616c61 files/digest-zgv-5.8 59
+MD5 8d4d903cb6a438bc3960766aab9ac233 files/digest-zgv-5.9 223
+RMD160 8ba5f82ba483d336e996dcf6fb95233bd52d9804 files/digest-zgv-5.9 223
+SHA256 a1986bb0be782f1e7c268e0be9c7b0a3599685a7313ae078b4dfe2298578aeae files/digest-zgv-5.9 223
diff --git a/media-gfx/zgv/files/digest-zgv-5.9 b/media-gfx/zgv/files/digest-zgv-5.9
new file mode 100644
index 000000000000..f63e50c101d5
--- /dev/null
+++ b/media-gfx/zgv/files/digest-zgv-5.9
@@ -0,0 +1,3 @@
+MD5 d65a434ddeb612f0c488177f873afad2 zgv-5.9.tar.gz 395525
+RMD160 1d1c47c77adc732c581d9db1189243a94c510586 zgv-5.9.tar.gz 395525
+SHA256 92e5d848fb51a77dc0ebb0ab383c1499c23aaff01f5445e9b0d75e067a8a64ba zgv-5.9.tar.gz 395525
diff --git a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
new file mode 100644
index 000000000000..e510a4ba9ec2
--- /dev/null
+++ b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
@@ -0,0 +1,64 @@
+--- zgv-5.9/src/readjpeg.c	Sun Oct 31 14:54:26 2004
++++ zgv/src/readjpeg.c	Wed Sep 21 21:03:22 2005
+@@ -92,11 +92,13 @@
+ 	int *real_width,int *real_height)
+ {
+ static FILE *in;
++static int cmyk;
+ struct my_error_mgr jerr;
+ int row_stride;		/* physical row width in output buffer */
+ int tmp,f;
+-unsigned char *ptr;
++unsigned char *ptr,*ptr2;
+ 
++cmyk=0;
+ use_errmsg=0;
+ theimage=NULL;
+ howfar=howfarfunc;
+@@ -161,6 +163,15 @@
+     pal[f]=pal[256+f]=pal[512+f]=f;
+   }
+ 
++if(cinfo.jpeg_color_space==JCS_CMYK)
++  cmyk=1;
++
++if(cinfo.jpeg_color_space==JCS_YCCK)
++  {
++  cmyk=1;
++  cinfo.out_color_space=JCS_CMYK;
++  }
++  
+ width=cinfo.image_width;
+ height=cinfo.image_height;
+ 
+@@ -191,7 +202,7 @@
+   }
+ 
+ if(WH_BAD(width,height) ||
+-   (theimage=(byte *)malloc(pixelsize*width*height))==NULL)
++   (theimage=(byte *)malloc(pixelsize*width*(height+cmyk)))==NULL)
+   {
+   jpegerr("Out of memory");	/* XXX misleading if width/height are bad */
+   longjmp(jerr.setjmp_buffer,1);
+@@ -222,7 +233,20 @@
+   while(cinfo.output_scanline<height)
+     {
+     jpeg_read_scanlines(&cinfo,&ptr,1);
+-    for(f=0;f<width;f++) { tmp=*ptr; *ptr=ptr[2]; ptr[2]=tmp; ptr+=3; }
++    if(!cmyk)
++      for(f=0;f<width;f++) { tmp=*ptr; *ptr=ptr[2]; ptr[2]=tmp; ptr+=3; }
++    else
++      {
++      ptr2=ptr;
++      for(f=0;f<width;f++,ptr+=3,ptr2+=4)
++        {
++        tmp=ptr2[3];
++        ptr[0]=(tmp*ptr2[2])/255;
++        ptr[1]=(tmp*ptr2[1])/255;
++        ptr[2]=(tmp*ptr2[0])/255;
++        }
++      }
++    
+     if(howfar!=NULL) howfar(cinfo.output_scanline,height);
+     }
+ 
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild
new file mode 100644
index 000000000000..99208f006a1f
--- /dev/null
+++ b/media-gfx/zgv/zgv-5.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.9.ebuild,v 1.1 2006/05/30 12:48:18 dercorny Exp $
+
+inherit eutils
+
+DESCRIPTION="A svgalib console image viewer"
+HOMEPAGE="http://www.svgalib.org/rus/zgv/"
+SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-libs/svgalib-1.4.2
+	>=media-libs/jpeg-6b-r2
+	media-libs/libpng
+	>=media-libs/tiff-3.5.5
+	>=sys-libs/zlib-1.1.4
+	sys-apps/gawk"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk
+	sed -i "s:4755:0755:" src/Makefile
+	sed -i -e 's:$(RM):echo:' src/Makefile
+	sed -i -e 's:$(RM):echo:' doc/Makefile
+	epatch ${FILESDIR}/zgv-5.9-cmyk-yccl-fix.diff
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/info /usr/share/man/man1
+	make PREFIX=${D}/usr \
+		INFODIR=${D}/usr/share/info \
+		MANDIR=${D}/usr/share/man/man1 \
+		install || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
+
+	# Fix info files
+	cd ${D}/usr/share/info
+	rm dir*
+	mv zgv zgv.info
+	for i in 1 2 3 4 ; do
+		mv zgv-$i zgv.info-$i
+	done
+}