Update to 1.0:

1.0 [2015/04/29]

* Implemented an I/O abstraction layer.
* Added support for native Windows API for files.
* Added support for setting the last modification time for a file.
* Added a new type zip_error_t for errors.
* Added more typedefs for structs.
* Torrentzip support was removed.
* CVE-2015-2331 was fixed.
* Addressed all Coverity CIDs.

4 files changed, 47 insertions, 39 deletions

diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index 6be6c828ccb..76d3356f670 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2015/03/26 09:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/05/03 12:11:42 wiz Exp $
 
-DISTNAME=		libzip-0.11.2
-PKGREVISION=		1
+DISTNAME=		libzip-1.0
 CATEGORIES=		archivers devel
 MASTER_SITES=		http://www.nih.at/libzip/
 EXTRACT_SUFX=		.tar.xz
@@ -15,6 +14,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libzip.pc.in
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		perl:build
 
 TEST_TARGET=		check
 
diff --git a/archivers/libzip/PLIST b/archivers/libzip/PLIST
index 349b94a6bee..071a9bce20c 100644
--- a/archivers/libzip/PLIST
+++ b/archivers/libzip/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2013/12/31 11:07:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/05/03 12:11:42 wiz Exp $
 bin/zipcmp
 bin/zipmerge
-bin/ziptorrent
 include/zip.h
 lib/libzip.la
 lib/libzip/include/zipconf.h
 lib/pkgconfig/libzip.pc
 man/man1/zipcmp.1
 man/man1/zipmerge.1
-man/man1/ziptorrent.1
+man/man3/ZIP_SOURCE_GET_ARGS.3
 man/man3/libzip.3
 man/man3/zip_add.3
 man/man3/zip_add_dir.3
@@ -17,8 +16,17 @@ man/man3/zip_delete.3
 man/man3/zip_dir_add.3
 man/man3/zip_discard.3
 man/man3/zip_error_clear.3
+man/man3/zip_error_code_system.3
+man/man3/zip_error_code_zip.3
+man/man3/zip_error_fini.3
 man/man3/zip_error_get.3
 man/man3/zip_error_get_sys_type.3
+man/man3/zip_error_init.3
+man/man3/zip_error_init_with_code.3
+man/man3/zip_error_set.3
+man/man3/zip_error_strerror.3
+man/man3/zip_error_system_type.3
+man/man3/zip_error_to_data.3
 man/man3/zip_error_to_str.3
 man/man3/zip_errors.3
 man/man3/zip_fclose.3
@@ -34,11 +42,13 @@ man/man3/zip_file_extra_field_set.3
 man/man3/zip_file_extra_fields_count.3
 man/man3/zip_file_extra_fields_count_by_id.3
 man/man3/zip_file_get_comment.3
+man/man3/zip_file_get_error.3
 man/man3/zip_file_get_external_attributes.3
 man/man3/zip_file_rename.3
 man/man3/zip_file_replace.3
 man/man3/zip_file_set_comment.3
 man/man3/zip_file_set_external_attributes.3
+man/man3/zip_file_set_mtime.3
 man/man3/zip_file_strerror.3
 man/man3/zip_fopen.3
 man/man3/zip_fopen_encrypted.3
@@ -47,12 +57,14 @@ man/man3/zip_fopen_index_encrypted.3
 man/man3/zip_fread.3
 man/man3/zip_get_archive_comment.3
 man/man3/zip_get_archive_flag.3
+man/man3/zip_get_error.3
 man/man3/zip_get_file_comment.3
 man/man3/zip_get_name.3
 man/man3/zip_get_num_entries.3
 man/man3/zip_get_num_files.3
 man/man3/zip_name_locate.3
 man/man3/zip_open.3
+man/man3/zip_open_from_source.3
 man/man3/zip_rename.3
 man/man3/zip_replace.3
 man/man3/zip_set_archive_comment.3
@@ -60,11 +72,36 @@ man/man3/zip_set_archive_flag.3
 man/man3/zip_set_default_password.3
 man/man3/zip_set_file_comment.3
 man/man3/zip_set_file_compression.3
+man/man3/zip_source.3
+man/man3/zip_source_begin_write.3
 man/man3/zip_source_buffer.3
+man/man3/zip_source_close.3
+man/man3/zip_source_commit_write.3
+man/man3/zip_source_error.3
 man/man3/zip_source_file.3
 man/man3/zip_source_filep.3
 man/man3/zip_source_free.3
 man/man3/zip_source_function.3
+man/man3/zip_source_function_create.3
+man/man3/zip_source_is_deleted.3
+man/man3/zip_source_keep.3
+man/man3/zip_source_make_command_bitmap.3
+man/man3/zip_source_open.3
+man/man3/zip_source_read.3
+man/man3/zip_source_rollback_write.3
+man/man3/zip_source_seek.3
+man/man3/zip_source_seek_compute_offset.3
+man/man3/zip_source_seek_write.3
+man/man3/zip_source_stat.3
+man/man3/zip_source_tell.3
+man/man3/zip_source_tell_write.3
+man/man3/zip_source_win32a.3
+man/man3/zip_source_win32a_create.3
+man/man3/zip_source_win32handle.3
+man/man3/zip_source_win32handle_create.3
+man/man3/zip_source_win32w.3
+man/man3/zip_source_win32w_create.3
+man/man3/zip_source_write.3
 man/man3/zip_source_zip.3
 man/man3/zip_stat.3
 man/man3/zip_stat_index.3
diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo
index d7ff74b8cd3..7a7d8e9467b 100644
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2015/03/26 09:30:01 wiz Exp $
+$NetBSD: distinfo,v 1.16 2015/05/03 12:11:42 wiz Exp $
 
-SHA1 (libzip-0.11.2.tar.xz) = da86a7b4bb2b7ab7c8c5fb773f8a48a5adc7a405
-RMD160 (libzip-0.11.2.tar.xz) = 4f94874c2f1d06c8c3020f22f17c9ef6da388051
-Size (libzip-0.11.2.tar.xz) = 413352 bytes
-SHA1 (patch-lib_zip__dirent.c) = e6d63693b29a3818943ed39ccd5353c146a2a7fc
+SHA1 (libzip-1.0.tar.xz) = f086b90607270f22cc7eeecfc32b34a7adb16fcd
+RMD160 (libzip-1.0.tar.xz) = 0e06174fdae0118f0709f736de1f0005aef9ecd7
+Size (libzip-1.0.tar.xz) = 446524 bytes
diff --git a/archivers/libzip/patches/patch-lib_zip__dirent.c b/archivers/libzip/patches/patch-lib_zip__dirent.c
deleted file mode 100644
index a9476ae2349..00000000000
--- a/archivers/libzip/patches/patch-lib_zip__dirent.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-lib_zip__dirent.c,v 1.1 2015/03/26 09:30:01 wiz Exp $
-
-Based on:
-# HG changeset patch
-# User Thomas Klausner <tk@giga.or.at>
-# Date 1426937322 -3600
-#      Sat Mar 21 12:28:42 2015 +0100
-# Node ID 9f11d54f692edc152afef04178cdf16f906a21b4
-# Parent  fa78ab51417f2fbf19586195dc3662497a5d790d
-Avoid integer overflow. Addresses CVE-2015-2331.
-
-Fixed similarly to patch used in PHP copy of libzip:
-https://github.com/php/php-src/commit/ef8fc4b53d92fbfcd8ef1abbd6f2f5fe2c4a11e5
-
-Thanks to Emmanuel Law <emmanuel.law@gmail.com> for the notification
-about the bug.
-
---- lib/zip_dirent.c.orig	2013-11-28 16:57:10.000000000 +0000
-+++ lib/zip_dirent.c
-@@ -110,7 +110,7 @@ _zip_cdir_new(zip_uint64_t nentry, struc
- 
-     if (nentry == 0)
- 	cd->entry = NULL;
--    else if ((cd->entry=(struct zip_entry *)malloc(sizeof(*(cd->entry))*(size_t)nentry)) == NULL) {
-+    else if ((nentry > SIZE_MAX/sizeof(*(cd->entry))) || (cd->entry=(struct zip_entry *)malloc(sizeof(*(cd->entry))*(size_t)nentry)) == NULL) {
- 	_zip_error_set(error, ZIP_ER_MEMORY, 0);
- 	free(cd);
- 	return NULL;