archivers/libzip:

- Update to 1.0.1
- Remove obsolete patches

7 files changed, 57 insertions, 47 deletions

diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index e0f092292e3a..b66dfa1f3e90 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzip
-PORTVERSION=	0.11.2
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.nih.at/libzip/
 
@@ -14,7 +13,8 @@ CPE_VENDOR=	nih
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	LC_ALL="C"
-USES=		cpe libtool pathfix tar:xz
+USES=		cpe libtool pathfix perl5 tar:xz
+USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo
index bc718de77832..fb33de91877e 100644
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libzip-0.11.2.tar.xz) = 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb
-SIZE (libzip-0.11.2.tar.xz) = 413352
+SHA256 (libzip-1.0.1.tar.xz) = f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840
+SIZE (libzip-1.0.1.tar.xz) = 450308
diff --git a/archivers/libzip/files/patch-lib__Makefile.in b/archivers/libzip/files/patch-lib__Makefile.in
index cf4faaa94988..cd4d7ffaad5d 100644
--- a/archivers/libzip/files/patch-lib__Makefile.in
+++ b/archivers/libzip/files/patch-lib__Makefile.in
@@ -1,6 +1,6 @@
---- ./lib/Makefile.in.orig	2014-04-06 20:16:47.095370563 +0000
-+++ ./lib/Makefile.in	2014-04-06 20:17:22.769365707 +0000
-@@ -349,8 +349,8 @@
+--- lib/Makefile.in.orig	2015-08-26 18:39:20 UTC
++++ lib/Makefile.in
+@@ -355,8 +355,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@
  libincludedir = ${libdir}/@PACKAGE@/include
  lib_LTLIBRARIES = libzip.la
  noinst_HEADERS = zipint.h
@@ -10,8 +10,8 @@
 +nodist_libinclude_HEADERS =
  
  # also update CMakeLists.txt when changing version
- libzip_la_LDFLAGS = -no-undefined -version-info 3:0:1
-@@ -830,8 +830,7 @@
+ libzip_la_LDFLAGS = -no-undefined -version-info 4:0:0
+@@ -869,8 +869,7 @@ info: info-am
  
  info-am:
  
diff --git a/archivers/libzip/files/patch-lib_zip__dirent.c b/archivers/libzip/files/patch-lib_zip__dirent.c
deleted file mode 100644
index 3e67d83b475f..000000000000
--- a/archivers/libzip/files/patch-lib_zip__dirent.c
+++ /dev/null
@@ -1,14 +0,0 @@
-CVE-2015-2331: ZIP Integer Overflow
-Upstream commit: http://hg.nih.at/libzip/rev/9f11d54f692e
-
---- lib/zip_dirent.c.orig	2013-11-28 16:57:10 UTC
-+++ 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;
diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in
index dab8ad1ac423..4c6607709e47 100644
--- a/archivers/libzip/files/patch-libzip.pc.in
+++ b/archivers/libzip/files/patch-libzip.pc.in
@@ -1,6 +1,6 @@
---- ./libzip.pc.in.orig	2010-03-08 15:27:48.000000000 +0300
-+++ ./libzip.pc.in	2011-04-24 23:19:07.996595003 +0400
-@@ -2,7 +2,6 @@
+--- libzip.pc.in.orig	2014-03-08 20:13:21 UTC
++++ libzip.pc.in
+@@ -2,7 +2,6 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
@@ -8,10 +8,10 @@
  
  zipcmp=@prefix@/bin/zipcmp
  
-@@ -10,5 +9,4 @@
+@@ -10,5 +9,5 @@ Name: libzip
  Description: library for handling zip archives
  Version: @VERSION@
- Libs: -L${libdir} -lzip @LIBS@
+ Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip @LIBS@
 -Cflags: -I${includedir} -I${libincludedir}
--
 +Cflags: -I${includedir}
+ 
diff --git a/archivers/libzip/files/patch-man_Makefile.in b/archivers/libzip/files/patch-man_Makefile.in
deleted file mode 100644
index 5ef1893e6800..000000000000
--- a/archivers/libzip/files/patch-man_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig	2007-08-02 13:44:34.000000000 +0400
-+++ man/Makefile.in	2007-08-02 13:46:45.000000000 +0400
-@@ -154,8 +154,8 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--man1_MANS = ${MAN1:.mdoc=.${MANFMT}}
--man3_MANS = ${MAN3:.mdoc=.${MANFMT}}
-+man1_MANS = ${MAN1}
-+man3_MANS = ${MAN3}
- DISTCLEANFILES = ${HTML}
- EXTRA_DIST = ${MANDOC} ${MAN} CMakeLists.txt
- MAN1 = zipcmp.mdoc zipmerge.mdoc
diff --git a/archivers/libzip/pkg-plist b/archivers/libzip/pkg-plist
index ee95c61993fc..18ab79d4df2b 100644
--- a/archivers/libzip/pkg-plist
+++ b/archivers/libzip/pkg-plist
@@ -1,16 +1,15 @@
 bin/zipcmp
 bin/zipmerge
-bin/ziptorrent
 include/zip.h
 include/zipconf.h
 lib/libzip.a
 lib/libzip.so
-lib/libzip.so.2
-lib/libzip.so.2.1.0
+lib/libzip.so.4
+lib/libzip.so.4.0.0
 libdata/pkgconfig/libzip.pc
 man/man1/zipcmp.1.gz
 man/man1/zipmerge.1.gz
-man/man1/ziptorrent.1.gz
+man/man3/ZIP_SOURCE_GET_ARGS.3.gz
 man/man3/libzip.3.gz
 man/man3/zip_add.3.gz
 man/man3/zip_add_dir.3.gz
@@ -19,8 +18,17 @@ man/man3/zip_delete.3.gz
 man/man3/zip_dir_add.3.gz
 man/man3/zip_discard.3.gz
 man/man3/zip_error_clear.3.gz
+man/man3/zip_error_code_system.3.gz
+man/man3/zip_error_code_zip.3.gz
+man/man3/zip_error_fini.3.gz
 man/man3/zip_error_get.3.gz
 man/man3/zip_error_get_sys_type.3.gz
+man/man3/zip_error_init.3.gz
+man/man3/zip_error_init_with_code.3.gz
+man/man3/zip_error_set.3.gz
+man/man3/zip_error_strerror.3.gz
+man/man3/zip_error_system_type.3.gz
+man/man3/zip_error_to_data.3.gz
 man/man3/zip_error_to_str.3.gz
 man/man3/zip_errors.3.gz
 man/man3/zip_fclose.3.gz
@@ -36,11 +44,13 @@ man/man3/zip_file_extra_field_set.3.gz
 man/man3/zip_file_extra_fields_count.3.gz
 man/man3/zip_file_extra_fields_count_by_id.3.gz
 man/man3/zip_file_get_comment.3.gz
+man/man3/zip_file_get_error.3.gz
 man/man3/zip_file_get_external_attributes.3.gz
 man/man3/zip_file_rename.3.gz
 man/man3/zip_file_replace.3.gz
 man/man3/zip_file_set_comment.3.gz
 man/man3/zip_file_set_external_attributes.3.gz
+man/man3/zip_file_set_mtime.3.gz
 man/man3/zip_file_strerror.3.gz
 man/man3/zip_fopen.3.gz
 man/man3/zip_fopen_encrypted.3.gz
@@ -49,12 +59,14 @@ man/man3/zip_fopen_index_encrypted.3.gz
 man/man3/zip_fread.3.gz
 man/man3/zip_get_archive_comment.3.gz
 man/man3/zip_get_archive_flag.3.gz
+man/man3/zip_get_error.3.gz
 man/man3/zip_get_file_comment.3.gz
 man/man3/zip_get_name.3.gz
 man/man3/zip_get_num_entries.3.gz
 man/man3/zip_get_num_files.3.gz
 man/man3/zip_name_locate.3.gz
 man/man3/zip_open.3.gz
+man/man3/zip_open_from_source.3.gz
 man/man3/zip_rename.3.gz
 man/man3/zip_replace.3.gz
 man/man3/zip_set_archive_comment.3.gz
@@ -62,11 +74,36 @@ man/man3/zip_set_archive_flag.3.gz
 man/man3/zip_set_default_password.3.gz
 man/man3/zip_set_file_comment.3.gz
 man/man3/zip_set_file_compression.3.gz
+man/man3/zip_source.3.gz
+man/man3/zip_source_begin_write.3.gz
 man/man3/zip_source_buffer.3.gz
+man/man3/zip_source_close.3.gz
+man/man3/zip_source_commit_write.3.gz
+man/man3/zip_source_error.3.gz
 man/man3/zip_source_file.3.gz
 man/man3/zip_source_filep.3.gz
 man/man3/zip_source_free.3.gz
 man/man3/zip_source_function.3.gz
+man/man3/zip_source_function_create.3.gz
+man/man3/zip_source_is_deleted.3.gz
+man/man3/zip_source_keep.3.gz
+man/man3/zip_source_make_command_bitmap.3.gz
+man/man3/zip_source_open.3.gz
+man/man3/zip_source_read.3.gz
+man/man3/zip_source_rollback_write.3.gz
+man/man3/zip_source_seek.3.gz
+man/man3/zip_source_seek_compute_offset.3.gz
+man/man3/zip_source_seek_write.3.gz
+man/man3/zip_source_stat.3.gz
+man/man3/zip_source_tell.3.gz
+man/man3/zip_source_tell_write.3.gz
+man/man3/zip_source_win32a.3.gz
+man/man3/zip_source_win32a_create.3.gz
+man/man3/zip_source_win32handle.3.gz
+man/man3/zip_source_win32handle_create.3.gz
+man/man3/zip_source_win32w.3.gz
+man/man3/zip_source_win32w_create.3.gz
+man/man3/zip_source_write.3.gz
 man/man3/zip_source_zip.3.gz
 man/man3/zip_stat.3.gz
 man/man3/zip_stat_index.3.gz