From 119f083e0690c2e10f687282d7cb251e36b5afcd Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 17 Dec 2004 22:41:15 +0000
Subject: Update to 2.3nb3: Add patch from Mandrake against CAN-2004-1010.

---
 archivers/zip/Makefile         |  4 ++--
 archivers/zip/distinfo         |  4 ++--
 archivers/zip/patches/patch-ab | 29 ++++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

(limited to 'archivers')

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index ddb447f228b..b17d1938b17 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2004/12/03 15:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2004/12/17 22:41:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
 #
 
 DISTNAME=	zip-2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/
 DISTFILES=	zip23.tar.gz zcrypt29.zip
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 4a5122b95b3..dd4d196b08b 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2002/04/18 16:42:30 yyamano Exp $
+$NetBSD: distinfo,v 1.4 2004/12/17 22:41:15 wiz Exp $
 
 SHA1 (zip23.tar.gz) = 0600c93218e6acf1be75dd79da4244eabc8e16cf
 Size (zip23.tar.gz) = 723283 bytes
 SHA1 (zcrypt29.zip) = 04223ea88ba3cf5d0f8d6a5fc9c1a4cd8c568f56
 Size (zcrypt29.zip) = 20248 bytes
 SHA1 (patch-aa) = c667d263bbc87e3f3daf7c80f68b915ac2706c9c
-SHA1 (patch-ab) = 10f7bd6df4c455049c93d21dc2a1b9003eff8349
+SHA1 (patch-ab) = ce481fbcf0d4c602e64251b0bc6a1c0dbc17578c
 SHA1 (patch-ac) = 7454650d1c9252a7062c9d9225cd47064dc167b5
 SHA1 (patch-ad) = 3204a7769d0ba73b0eae5de3292e30bf23f485d3
 SHA1 (patch-ae) = 7cb6cddb875af63dac6cfd9fe03b785f55f442ff
diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab
index 93247052c21..2adc8e0e178 100644
--- a/archivers/zip/patches/patch-ab
+++ b/archivers/zip/patches/patch-ab
@@ -1,8 +1,31 @@
-$NetBSD: patch-ab,v 1.1 2002/04/18 16:42:31 yyamano Exp $
+$NetBSD: patch-ab,v 1.2 2004/12/17 22:41:15 wiz Exp $
 
---- unix/unix.c.orig	Sat Mar  2 20:12:55 2002
+--- unix/unix.c.orig	1999-11-07 15:08:21.000000000 +0100
 +++ unix/unix.c
-@@ -698,7 +698,11 @@
+@@ -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';
+@@ -698,7 +703,11 @@ void version_local()
  #ifdef __QNXNTO__
        " (QNX Neutrino)",
  #else
-- 
cgit v1.2.3