Grab a bunch of patches from Fedora and cleanup the sources more.

Package-Manager: portage-2.1_pre5-r4

7 files changed, 152 insertions, 5 deletions

diff --git a/app-arch/zoo/ChangeLog b/app-arch/zoo/ChangeLog
index 87e18dba475f..4448b11777af 100644
--- a/app-arch/zoo/ChangeLog
+++ b/app-arch/zoo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zoo
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/ChangeLog,v 1.21 2006/02/27 19:28:55 blubb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/ChangeLog,v 1.22 2006/03/10 00:37:36 vapier Exp $
+
+*zoo-2.10-r2 (10 Mar 2006)
+
+  10 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/zoo-2.10-CAN-2005-2349.patch, +files/zoo-2.10-febz-183426.patch,
+  +files/zoo-2.10-security_pathsize.patch, +zoo-2.10-r2.ebuild:
+  Grab a bunch of patches from Fedora and cleanup the sources more.
 
   27 Feb 2006; Simon Stelling <blubb@gentoo.org> zoo-2.10-r1.ebuild:
   stable on amd64 wrt bug 123782
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index fa0e12909272..4ae20eabb27c 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,12 +1,27 @@
-MD5 9ca933ce8a474e142ae2bb34fc1b9bac ChangeLog 2092
-RMD160 df6109616daff43b44472a011028a4bac31660b0 ChangeLog 2092
-SHA256 a083b5e0b04a284f3984d64005c1b2ffce34ea1c855443804c75f481a4d99d2f ChangeLog 2092
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f006e061faadc0155e422b347533b3b3 ChangeLog 2378
+RMD160 8792d1394406cefff50172779dd9a253ae0bedbe ChangeLog 2378
+SHA256 5d2820caa2b68622e704bdc9b5dc90fe8e0fcfe869994143f98d49d2adfd9fc4 ChangeLog 2378
 MD5 71d3c9fdec09cd2559f44f313f10f40b files/digest-zoo-2.10 506
 RMD160 914cdf6c342f29e229fdfd2da27db654c267bd31 files/digest-zoo-2.10 506
 SHA256 0fba2fdc31d833a380d331161723b8228333490cb5bffb13c1bce06792aa8382 files/digest-zoo-2.10 506
 MD5 d85ccb77d9413d5e114987bdec670270 files/digest-zoo-2.10-r1 138
 RMD160 3da2b449d07cdf6be254498559b0f9f4254260c3 files/digest-zoo-2.10-r1 138
 SHA256 842cf9d14ec9edf6d451097b58990fa9858a88dfe522204618199ece673b92fb files/digest-zoo-2.10-r1 138
+MD5 b51741bc016a9dff3781022596ced964 files/digest-zoo-2.10-r2 500
+RMD160 4d7a4145f571eb8608da7970846c875f84f16e7e files/digest-zoo-2.10-r2 500
+SHA256 bcfba4e2370dab26a60a77a5e95eee95656b48cd7220828e0c12df80d825dd74 files/digest-zoo-2.10-r2 500
+MD5 542b1f0fd149443b55f4c6599088b3aa files/zoo-2.10-CAN-2005-2349.patch 908
+RMD160 5057112d761ef2c932cfe971915f12dc136c547b files/zoo-2.10-CAN-2005-2349.patch 908
+SHA256 77e94e8e0eaf6cdcd01ffc9eb48cf5a8b26930bcd13fd837913987225562fb2f files/zoo-2.10-CAN-2005-2349.patch 908
+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
+MD5 5623912bbc3508bfa006afd1fb1ee183 files/zoo-2.10-security_pathsize.patch 565
+RMD160 52e50c3beae1a0e8c0ac26238146f63cbeb1f67e files/zoo-2.10-security_pathsize.patch 565
+SHA256 c260b6a49f17aa4da7247bb153fb9f77284a6b9d48fb8e454dd2ab19f213545e files/zoo-2.10-security_pathsize.patch 565
 MD5 678a28bb007c2daea8ae2f733f36ec06 files/zoo-security-fix.patch 557
 RMD160 e3e30d07bcf7aa86ec15ede24d04dfd35d92c894 files/zoo-security-fix.patch 557
 SHA256 b645e7f4e3d29cb65abcaeb87959ad3da83196a6c8c398dc3c8360c37238f674 files/zoo-security-fix.patch 557
@@ -16,6 +31,16 @@ SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata
 MD5 96bd389c315a20742baa5c002b9dc987 zoo-2.10-r1.ebuild 775
 RMD160 357b6dbfbfed8129ee02f5dbe0d3cfa2a2dc5318 zoo-2.10-r1.ebuild 775
 SHA256 f272c77e3cd714a00b1459e25c5a082f6296c94dd18dd147ab254f531077b94c zoo-2.10-r1.ebuild 775
+MD5 e9af78916984364d707b29edc7f1e717 zoo-2.10-r2.ebuild 881
+RMD160 2819fe3d5d4134421aca28ccb2d375aafcccd000 zoo-2.10-r2.ebuild 881
+SHA256 b46c48aabaa38c70d286d036ed0a6b5804e683dbff6fe14bb308d3ac4327df47 zoo-2.10-r2.ebuild 881
 MD5 c14edf1e6eb8585f9a07f634a560aab6 zoo-2.10.ebuild 728
 RMD160 1cd382b3d70d6421361d9968526102329a1bfbab zoo-2.10.ebuild 728
 SHA256 15ac1a9e664644ec48b1781005a55b33c0fb0d2a6979533b3995e1d682d4050b zoo-2.10.ebuild 728
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEEMqx2+ySkm8kpY0RAt8VAJ4qq2QsksHDti8O4hus/Rt9/LHQ1QCfdIZU
+aQS7Fuxtf/QCiGoUhz00Kj8=
+=BvcM
+-----END PGP SIGNATURE-----
diff --git a/app-arch/zoo/files/digest-zoo-2.10-r2 b/app-arch/zoo/files/digest-zoo-2.10-r2
new file mode 100644
index 000000000000..f0934af7ed78
--- /dev/null
+++ b/app-arch/zoo/files/digest-zoo-2.10-r2
@@ -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-CAN-2005-2349.patch b/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch
new file mode 100644
index 000000000000..3752728c8e5a
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch
@@ -0,0 +1,36 @@
+Taken from Fedora
+
+--- portable.c
++++ portable.c
+@@ -364,6 +364,31 @@
+       show_dir(direntry);
+    }
+ #endif
++   char *p;
++   /* take off '../'   */
++   while ((p = strstr( direntry->dirname, "../" )) != NULL) {
++      while (*(p+3) != '\0') {
++        *p = *(p + 3);
++        p++;
++      }
++      *p = *(p+3); /* move last null */
++      //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname);
++   }
++   /* take off  '/'  */
++   if ( direntry->dirname[0] == '/' ) {
++      p = direntry->dirname;
++      while (*p != '\0') {
++        *p = *(p + 1);
++        p++;
++      }
++      *p = *(p+1); /* move last null */
++      //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname);
++   }
++   /* take off '..'   */
++   if(!strcmp(direntry->dirname, ".."))
++      direntry->dirname[0] = '\0';
++   /* direntry->dirlen = strlen(direntry->dirname); */
++
+    return (0);
+ }
+ 
diff --git a/app-arch/zoo/files/zoo-2.10-febz-183426.patch b/app-arch/zoo/files/zoo-2.10-febz-183426.patch
new file mode 100644
index 000000000000..d8e34d628094
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-febz-183426.patch
@@ -0,0 +1,16 @@
+Taken from Fedora
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426
+http://bugs.gentoo.org/125622
+
+--- zoo/parse.c
++++ zoo/parse.c
+@@ -39,7 +39,7 @@
+    char *namep;                   /* points to relevant part of tempname */
+ 
+    char *p;
+-   strcpy (tempname, fname);
++   strncpy(tempname, fname, LFNAMESIZE);
+ 
+ #ifdef DEBUG
+ printf ("parse:  supplied name is [%s].\n", tempname);
diff --git a/app-arch/zoo/files/zoo-2.10-security_pathsize.patch b/app-arch/zoo/files/zoo-2.10-security_pathsize.patch
new file mode 100644
index 000000000000..4f89530f43e7
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-security_pathsize.patch
@@ -0,0 +1,23 @@
+Taken from Fedora
+
+--- misc.c
++++ misc.c
+@@ -135,11 +135,17 @@
+ char *fullpath (direntry)
+ struct direntry *direntry;
+ {
+-	static char result[PATHSIZE];
++	static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/
+ 	combine (result,
+ 				direntry->dirlen != 0 ? direntry->dirname : "", 
+ 				(direntry->namlen != 0) ? direntry->lfname : direntry->fname
+ 			  );
++
++       if (strlen (result) >= PATHSIZE) {
++               prterror ('f', "Combined dirname and filename too long!\n");
++               *result = '\0';
++       }
++
+ 	return (result);
+ }
+ 
diff --git a/app-arch/zoo/zoo-2.10-r2.ebuild b/app-arch/zoo/zoo-2.10-r2.ebuild
new file mode 100644
index 000000000000..c5450dd8da71
--- /dev/null
+++ b/app-arch/zoo/zoo-2.10-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/zoo-2.10-r2.ebuild,v 1.1 2006/03/10 00:37:36 vapier 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
+}
+
+src_compile() {
+	emake linux || die
+}
+
+src_install() {
+	dobin zoo fiz || die
+	doman zoo.1 fiz.1
+}