Update zziplib to 0.13.56.

Major change since 0.10.x:

There were some problematic zip files out there that can trigger
segfaults in 0.10.x.  Later zzip file decoders have extra checks and
helper routines for that.

6 files changed, 29 insertions, 54 deletions

diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile
index 10387c159c7..ab90d78c79b 100644
--- a/archivers/zziplib/Makefile
+++ b/archivers/zziplib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/07/14 12:55:56 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/26 10:29:08 minskim Exp $
 #
 
-DISTNAME=	zziplib-0.10.82
-PKGREVISION=	3
+DISTNAME=	zziplib-0.13.56
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zziplib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://zziplib.sourceforge.net/
 COMMENT=	Library for ZIP archive handling
+LICENSE=	gnu-lgpl-v2 OR mpl-1.1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -21,6 +21,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--disable-builddir
 
+BUILD_DIRS=	${WRKSRC}/zzip ${WRKSRC}/zzipwrap ${WRKSRC}/bins
+
 TEST_TARGET=		check
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/archivers/zziplib/PLIST b/archivers/zziplib/PLIST
index beb967fa4b7..bdfb7d8d5d8 100644
--- a/archivers/zziplib/PLIST
+++ b/archivers/zziplib/PLIST
@@ -1,7 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:28:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/07/26 10:29:08 minskim Exp $
+bin/unzip-mem
+bin/unzzip
+bin/unzzipcat
+bin/unzzipcat-mem
+bin/unzzipcat-seeko
+bin/unzzipdir
+bin/unzzipdir-mem
 bin/zzcat
 bin/zzdir
-bin/zzip-config
 bin/zzxorcat
 bin/zzxorcopy
 bin/zzxordir
@@ -9,20 +15,30 @@ include/zzip-io.h
 include/zzip.h
 include/zzip/_config.h
 include/zzip/_msvc.h
+include/zzip/autoconf.h
 include/zzip/conf.h
+include/zzip/fetch.h
 include/zzip/file.h
 include/zzip/format.h
+include/zzip/fseeko.h
+include/zzip/info.h
 include/zzip/lib.h
+include/zzip/memdisk.h
+include/zzip/mmapped.h
 include/zzip/plugin.h
 include/zzip/stdint.h
+include/zzip/types.h
 include/zzip/wrap.h
+include/zzip/write.h
 include/zzip/zzip.h
-include/zzipformat.h
 include/zziplib.h
-include/zzipwrap.h
 lib/libzzip.la
+lib/libzzipfseeko.la
+lib/libzzipmmapped.la
 lib/libzzipwrap.la
 lib/pkgconfig/zzip-zlib-config.pc
+lib/pkgconfig/zzipfseeko.pc
 lib/pkgconfig/zziplib.pc
+lib/pkgconfig/zzipmmapped.pc
 lib/pkgconfig/zzipwrap.pc
 share/aclocal/zziplib.m4
diff --git a/archivers/zziplib/distinfo b/archivers/zziplib/distinfo
index ee2777a01e8..663ad2bfeb5 100644
--- a/archivers/zziplib/distinfo
+++ b/archivers/zziplib/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/09/02 20:32:56 jdolecek Exp $
+$NetBSD: distinfo,v 1.6 2009/07/26 10:29:08 minskim Exp $
 
-SHA1 (zziplib-0.10.82.tar.bz2) = 7f9e07a200a52e38b9011acefcbed9fff0e4b6d3
-RMD160 (zziplib-0.10.82.tar.bz2) = 58be317eda7657e7e9d4a26e3070a70134d416a0
-Size (zziplib-0.10.82.tar.bz2) = 572573 bytes
-SHA1 (patch-aa) = b72e1fb94e1c91f5c3f920d0aa6e1e450bf7eace
-SHA1 (patch-ab) = 166bbab7eb90e0d756f8eada2fdc67eee6ac0e51
-SHA1 (patch-ac) = 76131a0c3c17149a02691b86146a9885abff32c4
+SHA1 (zziplib-0.13.56.tar.bz2) = aa8cebc8c5e815a1071b17c6878876adedc4a333
+RMD160 (zziplib-0.13.56.tar.bz2) = c217cff4c4b1ec6bc868a0d89a55c75b8ea46fa9
+Size (zziplib-0.13.56.tar.bz2) = 696931 bytes
diff --git a/archivers/zziplib/patches/patch-aa b/archivers/zziplib/patches/patch-aa
deleted file mode 100644
index 248ae135681..00000000000
--- a/archivers/zziplib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/11 12:50:40 taca Exp $
-
---- bins/zziptest.c.orig	2002-12-18 23:06:29.000000000 +0900
-+++ bins/zziptest.c
-@@ -73,7 +73,7 @@ int main(int argc, char ** argv)
-                 printf("filename: %s\n\n", hdr->d_name);
-     
-                 if (hdr->d_reclen == 0) break;
--                (char *)hdr += hdr->d_reclen;
-+                hdr = (struct zzip_dir_hdr *)((char *)hdr + hdr->d_reclen);
-                 sleep(1);
-             }
-         }
diff --git a/archivers/zziplib/patches/patch-ab b/archivers/zziplib/patches/patch-ab
deleted file mode 100644
index c9628bf3bfa..00000000000
--- a/archivers/zziplib/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/05/06 00:28:57 taca Exp $
-
---- zzip/file.c.orig	2003-07-29 04:52:49.000000000 +0900
-+++ zzip/file.c
-@@ -708,7 +708,9 @@ zzip_open_shared_io (ZZIP_FILE* stream,
-     /* see if we can open a file that is a zip file */
-     { char basename[PATH_MAX];
-       char* p;
--      strcpy (basename, filename);
-+      int filename_len = strlen (filename);
-+      if (filename_len >= PATH_MAX) { errno = ENAMETOOLONG; return 0; }
-+      memcpy (basename, filename, filename_len+1);
- 
-       /* see if we can share the same zip directory */
-       if (stream && stream->dir && stream->dir->realname)
diff --git a/archivers/zziplib/patches/patch-ac b/archivers/zziplib/patches/patch-ac
deleted file mode 100644
index c327b35c1b3..00000000000
--- a/archivers/zziplib/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/09/02 20:32:56 jdolecek Exp $
-
---- zzip/zzip.h.orig	2007-09-02 22:26:57.000000000 +0200
-+++ zzip/zzip.h
-@@ -22,6 +22,7 @@
- #include <zzip/conf.h>
- 
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <stddef.h> /* size_t and friends */
- /* msvc6 has neither ssize_t (we assume "int") nor off_t (assume "long") */
-