diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile index 9caeaa589e95..9465145dea4e 100644 --- a/archivers/libzip/Makefile +++ b/archivers/libzip/Makefile @@ -1,21 +1,24 @@ PORTNAME= libzip -PORTVERSION= 1.7.3 +PORTVERSION= 1.9.2 CATEGORIES= archivers devel -MASTER_SITES= https://libzip.org/download/ +MASTER_SITES= https://github.com/nih-at/${PORTNAME}/releases/download/v${DISTVERSION}/ \ + https://libzip.org/download/ MAINTAINER= rakuco@FreeBSD.org COMMENT= C library for reading, creating, and modifying ZIP archives LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CPE_VENDOR= nih +LIB_DEPENDS= libzstd.so:archivers/zstd USES= cmake cpe perl5 ssl tar:xz +CPE_VENDOR= nih USE_LDCONFIG= yes USE_PERL5= test + TEST_TARGET= test CMAKE_OFF= ENABLE_COMMONCRYPTO ENABLE_GNUTLS ENABLE_MBEDTLS .include diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo index a175458b135e..e27c6facec90 100644 --- a/archivers/libzip/distinfo +++ b/archivers/libzip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609865777 -SHA256 (libzip-1.7.3.tar.xz) = a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 -SIZE (libzip-1.7.3.tar.xz) = 747372 +TIMESTAMP = 1657800190 +SHA256 (libzip-1.9.2.tar.xz) = c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 +SIZE (libzip-1.9.2.tar.xz) = 763980 diff --git a/archivers/libzip/files/patch-git_fd89e242 b/archivers/libzip/files/patch-git_fd89e242 deleted file mode 100644 index c78a4ec0c6cb..000000000000 --- a/archivers/libzip/files/patch-git_fd89e242 +++ /dev/null @@ -1,18 +0,0 @@ -commit fd89e242d16128dedef08f47d99ae56aa19b0591 -Author: Ørjan Malde -Date: Wed Jul 15 12:16:16 2020 +0200 - - Include limits.h for INT_MAX - -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c -index 1cb00479..60f92758 100644 ---- lib/zip_crypto_openssl.c -+++ lib/zip_crypto_openssl.c -@@ -38,6 +38,7 @@ - #include "zip_crypto.h" - - #include -+#include - - #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_0_API diff --git a/archivers/libzip/pkg-plist b/archivers/libzip/pkg-plist index 6968145ef779..e5713f79a16c 100644 --- a/archivers/libzip/pkg-plist +++ b/archivers/libzip/pkg-plist @@ -1,135 +1,138 @@ bin/zipcmp bin/zipmerge bin/ziptool include/zip.h include/zipconf.h lib/cmake/libzip/libzip-config-version.cmake lib/cmake/libzip/libzip-config.cmake lib/cmake/libzip/libzip-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libzip/libzip-targets.cmake lib/libzip.so lib/libzip.so.5 -lib/libzip.so.5.3 +lib/libzip.so.5.5 libdata/pkgconfig/libzip.pc share/man/man1/zipcmp.1.gz share/man/man1/zipmerge.1.gz share/man/man1/ziptool.1.gz share/man/man3/ZIP_SOURCE_GET_ARGS.3.gz share/man/man3/libzip.3.gz share/man/man3/zip_add.3.gz share/man/man3/zip_add_dir.3.gz -share/man/man3/zip_compression_method_supported.3.gz share/man/man3/zip_close.3.gz +share/man/man3/zip_compression_method_supported.3.gz share/man/man3/zip_delete.3.gz share/man/man3/zip_dir_add.3.gz share/man/man3/zip_discard.3.gz share/man/man3/zip_encryption_method_supported.3.gz share/man/man3/zip_error_clear.3.gz share/man/man3/zip_error_code_system.3.gz share/man/man3/zip_error_code_zip.3.gz share/man/man3/zip_error_fini.3.gz share/man/man3/zip_error_get.3.gz share/man/man3/zip_error_get_sys_type.3.gz share/man/man3/zip_error_init.3.gz share/man/man3/zip_error_init_with_code.3.gz share/man/man3/zip_error_set.3.gz share/man/man3/zip_error_strerror.3.gz share/man/man3/zip_error_system_type.3.gz share/man/man3/zip_error_to_data.3.gz share/man/man3/zip_error_to_str.3.gz share/man/man3/zip_errors.3.gz share/man/man3/zip_fclose.3.gz share/man/man3/zip_fdopen.3.gz share/man/man3/zip_file_add.3.gz share/man/man3/zip_file_attributes_init.3.gz share/man/man3/zip_file_error_clear.3.gz share/man/man3/zip_file_error_get.3.gz share/man/man3/zip_file_extra_field_delete.3.gz share/man/man3/zip_file_extra_field_delete_by_id.3.gz share/man/man3/zip_file_extra_field_get.3.gz share/man/man3/zip_file_extra_field_get_by_id.3.gz share/man/man3/zip_file_extra_field_set.3.gz share/man/man3/zip_file_extra_fields_count.3.gz share/man/man3/zip_file_extra_fields_count_by_id.3.gz share/man/man3/zip_file_get_comment.3.gz share/man/man3/zip_file_get_error.3.gz share/man/man3/zip_file_get_external_attributes.3.gz +share/man/man3/zip_file_is_seekable.3.gz share/man/man3/zip_file_rename.3.gz share/man/man3/zip_file_replace.3.gz share/man/man3/zip_file_set_comment.3.gz share/man/man3/zip_file_set_dostime.3.gz share/man/man3/zip_file_set_encryption.3.gz share/man/man3/zip_file_set_external_attributes.3.gz share/man/man3/zip_file_set_mtime.3.gz share/man/man3/zip_file_strerror.3.gz share/man/man3/zip_fopen.3.gz share/man/man3/zip_fopen_encrypted.3.gz share/man/man3/zip_fopen_index.3.gz share/man/man3/zip_fopen_index_encrypted.3.gz share/man/man3/zip_fread.3.gz share/man/man3/zip_fseek.3.gz share/man/man3/zip_ftell.3.gz share/man/man3/zip_get_archive_comment.3.gz share/man/man3/zip_get_archive_flag.3.gz share/man/man3/zip_get_error.3.gz share/man/man3/zip_get_file_comment.3.gz share/man/man3/zip_get_name.3.gz share/man/man3/zip_get_num_entries.3.gz share/man/man3/zip_get_num_files.3.gz share/man/man3/zip_libzip_version.3.gz share/man/man3/zip_name_locate.3.gz share/man/man3/zip_open.3.gz share/man/man3/zip_open_from_source.3.gz +share/man/man3/zip_register_cancel_callback_with_state.3.gz share/man/man3/zip_register_progress_callback.3.gz share/man/man3/zip_register_progress_callback_with_state.3.gz share/man/man3/zip_rename.3.gz share/man/man3/zip_replace.3.gz share/man/man3/zip_set_archive_comment.3.gz share/man/man3/zip_set_archive_flag.3.gz share/man/man3/zip_set_default_password.3.gz share/man/man3/zip_set_file_comment.3.gz share/man/man3/zip_set_file_compression.3.gz share/man/man3/zip_source.3.gz share/man/man3/zip_source_begin_write.3.gz share/man/man3/zip_source_begin_write_cloning.3.gz share/man/man3/zip_source_buffer.3.gz share/man/man3/zip_source_buffer_create.3.gz share/man/man3/zip_source_buffer_fragment.3.gz share/man/man3/zip_source_buffer_fragment_create.3.gz share/man/man3/zip_source_close.3.gz share/man/man3/zip_source_commit_write.3.gz share/man/man3/zip_source_error.3.gz share/man/man3/zip_source_file.3.gz share/man/man3/zip_source_file_create.3.gz share/man/man3/zip_source_filep.3.gz share/man/man3/zip_source_filep_create.3.gz share/man/man3/zip_source_free.3.gz share/man/man3/zip_source_function.3.gz share/man/man3/zip_source_function_create.3.gz share/man/man3/zip_source_is_deleted.3.gz share/man/man3/zip_source_keep.3.gz share/man/man3/zip_source_make_command_bitmap.3.gz share/man/man3/zip_source_open.3.gz share/man/man3/zip_source_read.3.gz share/man/man3/zip_source_rollback_write.3.gz share/man/man3/zip_source_seek.3.gz share/man/man3/zip_source_seek_compute_offset.3.gz share/man/man3/zip_source_seek_write.3.gz share/man/man3/zip_source_stat.3.gz share/man/man3/zip_source_tell.3.gz share/man/man3/zip_source_tell_write.3.gz share/man/man3/zip_source_win32a.3.gz share/man/man3/zip_source_win32a_create.3.gz share/man/man3/zip_source_win32handle.3.gz share/man/man3/zip_source_win32handle_create.3.gz share/man/man3/zip_source_win32w.3.gz share/man/man3/zip_source_win32w_create.3.gz +share/man/man3/zip_source_window.3.gz share/man/man3/zip_source_write.3.gz share/man/man3/zip_source_zip.3.gz share/man/man3/zip_stat.3.gz share/man/man3/zip_stat_index.3.gz share/man/man3/zip_stat_init.3.gz share/man/man3/zip_strerror.3.gz share/man/man3/zip_unchange.3.gz share/man/man3/zip_unchange_all.3.gz share/man/man3/zip_unchange_archive.3.gz