Version bump. Security bug #178986. Patch prepared by Lars Hartmann <lars at chaotika.org>.

Package-Manager: portage-2.1.2.7

5 files changed, 145 insertions, 5 deletions

diff --git a/app-arch/zoo/ChangeLog b/app-arch/zoo/ChangeLog
index cc4f9364ce4c..89d38951b42c 100644
--- a/app-arch/zoo/ChangeLog
+++ b/app-arch/zoo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zoo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/ChangeLog,v 1.31 2007/02/21 20:05:50 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/ChangeLog,v 1.32 2007/05/23 22:30:42 ticho Exp $
+
+*zoo-2.10-r3 (23 May 2007)
+
+  23 May 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/zoo-2.10-multiple-dos-fix.patch, +zoo-2.10-r3.ebuild:
+  Version bump. Security bug #178986. Patch prepared by Lars Hartmann <lars at
+  chaotika.org>.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index dd12ca271770..6fedef394a0b 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zoo-2.10-CAN-2005-2349.patch 908 RMD160 5057112d761ef2c932cfe971915f12dc136c547b SHA1 fd54301d2e4f2da318f59b102d629d1921979ab0 SHA256 77e94e8e0eaf6cdcd01ffc9eb48cf5a8b26930bcd13fd837913987225562fb2f
 MD5 542b1f0fd149443b55f4c6599088b3aa files/zoo-2.10-CAN-2005-2349.patch 908
 RMD160 5057112d761ef2c932cfe971915f12dc136c547b files/zoo-2.10-CAN-2005-2349.patch 908
@@ -6,6 +9,10 @@ AUX zoo-2.10-febz-183426.patch 396 RMD160 93ae1b99fbcd36439b54a94e94576ec8ae0ee3
 MD5 a652ed9245f789beda375e5c419f8c51 files/zoo-2.10-febz-183426.patch 396
 RMD160 93ae1b99fbcd36439b54a94e94576ec8ae0ee3bd files/zoo-2.10-febz-183426.patch 396
 SHA256 b8fbbedf6587bc40367d5802b54ccd9d39229ffb964100f19f251ee951267ca8 files/zoo-2.10-febz-183426.patch 396
+AUX zoo-2.10-multiple-dos-fix.patch 2504 RMD160 97d278c059850a02131a58fefa968bfc7ed7486b SHA1 ed7381978c2004c6c8a034306d5de8f9cb91f469 SHA256 50647ee732ee62187df22c7445607dddb5e21cb1ffb2c2ca1cda43e6d5490f6a
+MD5 4dda98c9da213030603ef93f86101d71 files/zoo-2.10-multiple-dos-fix.patch 2504
+RMD160 97d278c059850a02131a58fefa968bfc7ed7486b files/zoo-2.10-multiple-dos-fix.patch 2504
+SHA256 50647ee732ee62187df22c7445607dddb5e21cb1ffb2c2ca1cda43e6d5490f6a files/zoo-2.10-multiple-dos-fix.patch 2504
 AUX zoo-2.10-security_pathsize.patch 565 RMD160 52e50c3beae1a0e8c0ac26238146f63cbeb1f67e SHA1 45593c3f15968b876e343f1cddcf3a18e9d5e1bb SHA256 c260b6a49f17aa4da7247bb153fb9f77284a6b9d48fb8e454dd2ab19f213545e
 MD5 5623912bbc3508bfa006afd1fb1ee183 files/zoo-2.10-security_pathsize.patch 565
 RMD160 52e50c3beae1a0e8c0ac26238146f63cbeb1f67e files/zoo-2.10-security_pathsize.patch 565
@@ -20,10 +27,14 @@ EBUILD zoo-2.10-r2.ebuild 874 RMD160 1c36cb16d0e4660610f58df8da0a80f62723fe92 SH
 MD5 3d2f3df9bd1bf39633f7da069f1a9cd9 zoo-2.10-r2.ebuild 874
 RMD160 1c36cb16d0e4660610f58df8da0a80f62723fe92 zoo-2.10-r2.ebuild 874
 SHA256 b3fec5cfd7868685944bd695085e95e4b52c5bfb9f6190170f3911a9140e02db zoo-2.10-r2.ebuild 874
-MISC ChangeLog 3269 RMD160 065852872b45ba8318873036ddadaaa5368c2941 SHA1 7b53ddc557e4369fb9c320003c9e044f0e8a3f13 SHA256 c751a7b5b3a268ee2571339b31cffaf9a18f3544e68abb51a753b2b70f06bfbc
-MD5 b13ab58b319daaf023bfba4f9ffc418b ChangeLog 3269
-RMD160 065852872b45ba8318873036ddadaaa5368c2941 ChangeLog 3269
-SHA256 c751a7b5b3a268ee2571339b31cffaf9a18f3544e68abb51a753b2b70f06bfbc ChangeLog 3269
+EBUILD zoo-2.10-r3.ebuild 930 RMD160 f5848e97e197fa0bce0468e3925b37a6a7d16ce2 SHA1 382fda1d97c299a6199c3f0b20ba3b44d8f69352 SHA256 c31f78ae41ea5beb434641851a5be08cb73f7ff2290c17ca05c71b741e319cb2
+MD5 8c7faff5281f6ef8e998e3939a3f11fa zoo-2.10-r3.ebuild 930
+RMD160 f5848e97e197fa0bce0468e3925b37a6a7d16ce2 zoo-2.10-r3.ebuild 930
+SHA256 c31f78ae41ea5beb434641851a5be08cb73f7ff2290c17ca05c71b741e319cb2 zoo-2.10-r3.ebuild 930
+MISC ChangeLog 3505 RMD160 72b3385304b44f5e2a3de7a67082a6b79c7e5867 SHA1 40acc1bf139274a1355424bb9caa3c9ee47f82cd SHA256 d6f38839400c622ed3984a01ed1341b518912102012cc2ccf18ac251b6a270b7
+MD5 a950bf4ad0d9add4282b0c38f1c45ac2 ChangeLog 3505
+RMD160 72b3385304b44f5e2a3de7a67082a6b79c7e5867 ChangeLog 3505
+SHA256 d6f38839400c622ed3984a01ed1341b518912102012cc2ccf18ac251b6a270b7 ChangeLog 3505
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
@@ -31,3 +42,13 @@ SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata
 MD5 f2b3ad402d127b5a135b6c98e2feca9a files/digest-zoo-2.10-r2 500
 RMD160 3f8e513c7d81fae6c69c130143d11919d9aff529 files/digest-zoo-2.10-r2 500
 SHA256 7fcb470b240335cd4a5c3c1490619759f3ca90824951492f0f47f70e60d6e403 files/digest-zoo-2.10-r2 500
+MD5 b51741bc016a9dff3781022596ced964 files/digest-zoo-2.10-r3 500
+RMD160 4d7a4145f571eb8608da7970846c875f84f16e7e files/digest-zoo-2.10-r3 500
+SHA256 bcfba4e2370dab26a60a77a5e95eee95656b48cd7220828e0c12df80d825dd74 files/digest-zoo-2.10-r3 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGVMCYQlM6RnzZP+IRAvYxAJ9Vapn6YkFjOwkA2LhXONTKuR97DQCePx6j
+eUQ6nrc+0ewWqsTvqd9JmvE=
+=lDB0
+-----END PGP SIGNATURE-----
diff --git a/app-arch/zoo/files/digest-zoo-2.10-r3 b/app-arch/zoo/files/digest-zoo-2.10-r3
new file mode 100644
index 000000000000..f0934af7ed78
--- /dev/null
+++ b/app-arch/zoo/files/digest-zoo-2.10-r3
@@ -0,0 +1,6 @@
+MD5 5de8e6d16ab168ef2f4e8db412068054 zoo-2.10-gcc-issues-fix.patch 19467
+RMD160 c58595ae3d5744b0d8dc38b6b0e1c66c370dd086 zoo-2.10-gcc-issues-fix.patch 19467
+SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b zoo-2.10-gcc-issues-fix.patch 19467
+MD5 70a0a785ecc8f7f747be1421e495d837 zoo-2.10pl1.tar.gz 172096
+RMD160 971d388b8cb29def1e4e31011463563e91c3d700 zoo-2.10pl1.tar.gz 172096
+SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 zoo-2.10pl1.tar.gz 172096
diff --git a/app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch b/app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch
new file mode 100644
index 000000000000..b37cee0c94dc
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch
@@ -0,0 +1,71 @@
+diff -ur zoo-2.10-r2/zooext.c zoo-2.10-r3/zooext.c
+--- zoo-2.10-r2/zooext.c	2007-05-23 23:39:14.000000000 +0200
++++ zoo-2.10-r3/zooext.c	2007-05-23 23:36:37.000000000 +0200
+@@ -89,6 +89,7 @@
+ #endif
+ struct direntry direntry;                 /* directory entry */
+ int first_dir = 1;								/* first dir entry seen? */
++ unsigned long zoo_pointer = 0;           /* Track our position in the file */
+ 
+ static char extract_ver[] = "Zoo %d.%d is needed to extract %s.\n";
+ static char no_space[] = "Insufficient disk space to extract %s.\n";
+@@ -169,6 +170,9 @@
+ 		exit_status = 1;
+    }
+    zooseek (zoo_file, zoo_header.zoo_start, 0); /* seek to where data begins */
++
++   /* Begin tracking our position in the file */ 
++   zoo_pointer = zoo_header.zoo_start; 
+ }
+ 
+ #ifndef PORTABLE
+@@ -597,6 +601,11 @@
+    } /* end if */
+ 
+ loop_again:
++   /* Make sure we are not seeking to already processed data */ 
++   if (next_ptr <= zoo_pointer)
++     prterror ('f', "ZOO chain structure is corrupted\n");
++   zoo_pointer = next_ptr; 
++
+    zooseek (zoo_file, next_ptr, 0); /* ..seek to next dir entry */
+ } /* end while */
+ 
+Nur in zoo-2.10-r3: zooext.c~.
+Nur in zoo-2.10-r3: zooext.c.orig.
+diff -ur zoo-2.10-r2/zoolist.c zoo-2.10-r3/zoolist.c
+--- zoo-2.10-r2/zoolist.c	1991-07-20 00:57:27.000000000 +0200
++++ zoo-2.10-r3/zoolist.c	2007-05-23 23:38:19.000000000 +0200
+@@ -92,7 +92,7 @@
+ int show_mode = 0;				/* show file protection */
+ #endif
+ int first_dir = 1;				/* if first direntry -- to adjust dat_ofs */
+-
++unsigned long zoo_pointer = 0; /* Track our position in the file */
+ while (*option) {
+    switch (*option) {
+       case 'a': show_name++; break;
+@@ -211,6 +211,9 @@
+ 		show_acmt (&zoo_header, zoo_file, 0);		/* show archive comment */
+ 	}
+ 
++	/* Begin tracking our position in the file */
++	zoo_pointer = zoo_header.zoo_start;
++
+    /* Seek to the beginning of the first directory entry */
+    if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) {
+       ercount++;
+@@ -437,6 +440,11 @@
+          if (verb_list && !fast)
+             show_comment (&direntry, zoo_file, 0, (char *) NULL);
+       } /* end if (lots of conditions) */
++
++      /* Make sure we are not seeking to already processed data */
++      if (direntry.next <= zoo_pointer)
++        prterror ('f', "ZOO chain structure is corrupted\n");
++      zoo_pointer = direntry.next;
+    
+ 		/* ..seek to next dir entry */
+       zooseek (zoo_file, direntry.next, 0);
+Nur in zoo-2.10-r3: zoolist.c~.
+Nur in zoo-2.10-r3: zoolist.c.orig.
diff --git a/app-arch/zoo/zoo-2.10-r3.ebuild b/app-arch/zoo/zoo-2.10-r3.ebuild
new file mode 100644
index 000000000000..5d87114c3f70
--- /dev/null
+++ b/app-arch/zoo/zoo-2.10-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/zoo-2.10-r3.ebuild,v 1.1 2007/05/23 22:30:42 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Manipulate archives of files in compressed form."
+HOMEPAGE="ftp://ftp.kiarchive.ru/pub/unix/arcers"
+SRC_URI="ftp://ftp.kiarchive.ru/pub/unix/arcers/${P}pl1.tar.gz
+	mirror://gentoo/${P}-gcc-issues-fix.patch"
+
+LICENSE="zoo"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${P}pl1.tar.gz
+	epatch "${DISTDIR}"/${P}-gcc-issues-fix.patch
+	epatch "${FILESDIR}"/${P}-CAN-2005-2349.patch
+	epatch "${FILESDIR}"/${P}-febz-183426.patch
+	epatch "${FILESDIR}"/${P}-security_pathsize.patch
+	epatch "${FILESDIR}"/${P}-multiple-dos-fix.patch
+}
+
+src_compile() {
+	emake linux || die
+}
+
+src_install() {
+	dobin zoo fiz || die
+	doman zoo.1 fiz.1
+}