From 51427b2e8b005c8574aa5dd5b159ed3986432499 Mon Sep 17 00:00:00 2001
From: Ned Ludd <solar@gentoo.org>
Date: Sat, 6 Nov 2004 14:32:47 +0000
Subject: [PATCH] security bump for bug #70227 - CAN-2004-1010

---
 app-arch/zip/ChangeLog                     |  8 +++-
 app-arch/zip/Manifest                      | 19 ++++++++--
 app-arch/zip/files/digest-zip-2.3-r4       |  2 +
 app-arch/zip/files/zip-CAN-2004-1010.patch | 25 ++++++++++++
 app-arch/zip/zip-2.3-r4.ebuild             | 44 ++++++++++++++++++++++
 5 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 app-arch/zip/files/digest-zip-2.3-r4
 create mode 100644 app-arch/zip/files/zip-CAN-2004-1010.patch
 create mode 100644 app-arch/zip/zip-2.3-r4.ebuild

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index ec7b8402d3f9..b544314190c5 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/zip
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.25 2004/09/28 19:23:31 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.26 2004/11/06 14:32:47 solar Exp $
+
+*zip-2.3-r4 (06 Nov 2004)
+
+  06 Nov 2004; <solar@gentoo.org> +files/zip-CAN-2004-1010.patch,
+  +zip-2.3-r4.ebuild:
+  security bump for bug #70227 - CAN-2004-1010
 
 *zip-2.3-r3 (28 Sep 2004)
 
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index b402a4d08c0c..d3792b5651a5 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,6 +1,19 @@
-MD5 160b019c3672f2fb9e68c4f79950df45 ChangeLog 2993
-MD5 be95da43ccf9816b592b241797c372fa zip-2.3-r2.ebuild 984
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a3c80560391ef7908418ca7b8fffb5e2 zip-2.3-r3.ebuild 1062
+MD5 be95da43ccf9816b592b241797c372fa zip-2.3-r2.ebuild 984
+MD5 ff93308810ba24f903338ef914895943 zip-2.3-r4.ebuild 1105
+MD5 cb84f8e02c5716fe4950263034ae9734 ChangeLog 3156
+MD5 ceb628bca144581dbeff71136122a8e2 files/zip-CAN-2004-1010.patch 673
+MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r2 113
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r3 113
-MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
+MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r4 113
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBjOCS94CCfB4KcwwRAtvAAKCNYBSuscaeVoQxZTwGfHM8XHzO0ACgkJRL
+ktkOJz7zLE3LC7wfizQxHoQ=
+=MU+t
+-----END PGP SIGNATURE-----
diff --git a/app-arch/zip/files/digest-zip-2.3-r4 b/app-arch/zip/files/digest-zip-2.3-r4
new file mode 100644
index 000000000000..09d293f79547
--- /dev/null
+++ b/app-arch/zip/files/digest-zip-2.3-r4
@@ -0,0 +1,2 @@
+MD5 5206a99541f3b0ab90f1baa167392c4f zip23.tar.gz 723283
+MD5 0c969ba1661183b041a142945ed2710e zcrypt29.zip 20248
diff --git a/app-arch/zip/files/zip-CAN-2004-1010.patch b/app-arch/zip/files/zip-CAN-2004-1010.patch
new file mode 100644
index 000000000000..150d6407cbfb
--- /dev/null
+++ b/app-arch/zip/files/zip-CAN-2004-1010.patch
@@ -0,0 +1,25 @@
+--- zip-2.3/unix/unix.c.orig    2004-11-05 15:44:41.000000000 -0500
++++ zip-2.3/unix/unix.c 2004-11-05 15:50:28.000000000 -0500
+@@ -319,8 +319,8 @@ iztimes *t;             /* return value:
+    a file size of -1 */
+ {
+   struct stat s;        /* results of stat() */
+-  char name[FNMAX];
+-  int len = strlen(f);
++  char *name;
++  size_t len = strlen(f);
+ 
+   if (f == label) {
+     if (a != NULL)
+@@ -331,6 +331,11 @@ iztimes *t;             /* return value:
+       t->atime = t->mtime = t->ctime = label_utim;
+     return label_time;
+   }
++
++  name = malloc(len+1);
++  if (!name)
++    return 0;
++
+   strcpy(name, f);
+   if (name[len - 1] == '/')
+     name[len - 1] = '\0';
diff --git a/app-arch/zip/zip-2.3-r4.ebuild b/app-arch/zip/zip-2.3-r4.ebuild
new file mode 100644
index 000000000000..33a7718e811d
--- /dev/null
+++ b/app-arch/zip/zip-2.3-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r4.ebuild,v 1.1 2004/11/06 14:32:47 solar Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
+SRC_URI="mirror://gentoo/${PN}${PV/./}.tar.gz
+	crypt? ( ftp://ftp.icce.rug.nl/infozip/src/zcrypt29.zip )"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt"
+
+DEPEND="crypt? ( app-arch/unzip )"
+
+src_unpack() {
+	unpack ${A}
+	if use crypt; then
+		mv -f crypt.h ${S}
+		mv -f crypt.c ${S}
+	fi
+	cd ${S}
+	epatch ${FILESDIR}/zip-2.3-unix_configure-pic.patch
+	epatch ${FILESDIR}/zip-CAN-2004-1010.patch
+	cd ${S}/unix
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	emake \
+		-f unix/Makefile \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCC) -E" \
+		generic || die
+}
+
+src_install() {
+	dobin zip zipcloak zipnote zipsplit || die
+	doman man/zip.1
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE
+}
-- 
2.26.2