CVS commit: pkgsrc/archivers/libzip

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun 24 21:40:06 UTC 2021

Modified Files:
        pkgsrc/archivers/libzip: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/archivers/libzip/patches: patch-CMakeLists.txt

Log Message:
libzip: update to 1.8.0.

Add one post-release patch.

1.8.0 [2021-06-18]
==================

* Add support for zstd (Zstandard) compression.
* Add support for lzma (ID 14) compression.
* Add `zip_source_window_create()`.
* Add `zip_source_zip_create()` variant to `zip_source_zip()`.
* Allow method specific `comp_flags` in `zip_set_file_compression()`.
* Allow `zip_source_tell()` on sources that don't support seeking and `zip_ftell()` on compressed data.
* Provide more details for consistency check errors.
* Improve output of `zipcmp`.
* In `zipcmp`, don’t ignore empty directories when comparing directory listing.
* Treat empty string as no password given in `zip_file_set_encryption()`, `zip_fopen_encrypted()`, and `zip_set_default_password()`.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/archivers/libzip/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/libzip/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/archivers/libzip/buildlink3.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/archivers/libzip/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/libzip/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libzip/Makefile
diff -u pkgsrc/archivers/libzip/Makefile:1.54 pkgsrc/archivers/libzip/Makefile:1.55
--- pkgsrc/archivers/libzip/Makefile:1.54       Mon May 24 19:49:02 2021
+++ pkgsrc/archivers/libzip/Makefile    Thu Jun 24 21:40:06 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2021/05/24 19:49:02 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2021/06/24 21:40:06 wiz Exp $
 
-DISTNAME=              libzip-1.7.3
-PKGREVISION=           3
+DISTNAME=              libzip-1.8.0
 CATEGORIES=            archivers devel
 MASTER_SITES=          https://libzip.org/download/
 MASTER_SITES+=         ${MASTER_SITE_GITHUB:=nih-at/}
-EXTRACT_SUFX=          .tar.xz
 GITHUB_RELEASE=                v${PKGVERSION_NOREV}
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            wiz%NetBSD.org@localhost
 HOMEPAGE=              https://www.libzip.org/
@@ -25,4 +24,5 @@ MAKE_ENV+=            LD_LIBRARY_PATH=${WRKSRC}/li
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/libzip/PLIST
diff -u pkgsrc/archivers/libzip/PLIST:1.16 pkgsrc/archivers/libzip/PLIST:1.17
--- pkgsrc/archivers/libzip/PLIST:1.16  Sat Jul 11 10:26:04 2020
+++ pkgsrc/archivers/libzip/PLIST       Thu Jun 24 21:40:06 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/07/11 10:26:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/06/24 21:40:06 wiz Exp $
 bin/zipcmp
 bin/zipmerge
 bin/ziptool
@@ -10,7 +10,7 @@ lib/cmake/libzip/libzip-targets-noconfig
 lib/cmake/libzip/libzip-targets.cmake
 lib/libzip.so
 lib/libzip.so.5
-lib/libzip.so.5.3
+lib/libzip.so.5.4
 lib/pkgconfig/libzip.pc
 man/man1/zipcmp.1
 man/man1/zipmerge.1
@@ -81,6 +81,7 @@ man/man3/zip_libzip_version.3
 man/man3/zip_name_locate.3
 man/man3/zip_open.3
 man/man3/zip_open_from_source.3
+man/man3/zip_register_cancel_callback_with_state.3
 man/man3/zip_register_progress_callback.3
 man/man3/zip_register_progress_callback_with_state.3
 man/man3/zip_rename.3
@@ -125,6 +126,7 @@ 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_window.3
 man/man3/zip_source_write.3
 man/man3/zip_source_zip.3
 man/man3/zip_stat.3

Index: pkgsrc/archivers/libzip/buildlink3.mk
diff -u pkgsrc/archivers/libzip/buildlink3.mk:1.25 pkgsrc/archivers/libzip/buildlink3.mk:1.26
--- pkgsrc/archivers/libzip/buildlink3.mk:1.25  Wed Apr 21 13:24:06 2021
+++ pkgsrc/archivers/libzip/buildlink3.mk       Thu Jun 24 21:40:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2021/04/21 13:24:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2021/06/24 21:40:06 wiz Exp $
 
 BUILDLINK_TREE+=       libzip
 
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.libzip+=  libzip>=1
 BUILDLINK_ABI_DEPENDS.libzip+= libzip>=1.7.3nb2
 BUILDLINK_PKGSRCDIR.libzip?=   ../../archivers/libzip
 
-BUILDLINK_FILES.libzip+=               bin/zipcmp
-BUILDLINK_FILES.libzip+=               bin/zipmerge
-BUILDLINK_FILES.libzip+=               bin/ziptool
+BUILDLINK_FILES.libzip+=       bin/zipcmp
+BUILDLINK_FILES.libzip+=       bin/zipmerge
+BUILDLINK_FILES.libzip+=       bin/ziptool
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/archivers/libzip/distinfo
diff -u pkgsrc/archivers/libzip/distinfo:1.38 pkgsrc/archivers/libzip/distinfo:1.39
--- pkgsrc/archivers/libzip/distinfo:1.38       Wed Jul 15 08:15:39 2020
+++ pkgsrc/archivers/libzip/distinfo    Thu Jun 24 21:40:06 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.38 2020/07/15 08:15:39 wiz Exp $
+$NetBSD: distinfo,v 1.39 2021/06/24 21:40:06 wiz Exp $
 
-SHA1 (libzip-1.7.3.tar.xz) = 2a2e2fb4f18a65a996252dfa247b38a6519af712
-RMD160 (libzip-1.7.3.tar.xz) = 51efb3e8b7b219e05b9146604cd6398a6ab391ff
-SHA512 (libzip-1.7.3.tar.xz) = 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-Size (libzip-1.7.3.tar.xz) = 747372 bytes
+SHA1 (libzip-1.8.0.tar.xz) = cfe0c5cdaa6c3bc4986464797de8fd4359d2d4d5
+RMD160 (libzip-1.8.0.tar.xz) = 2041a081ad92828d98ce1ec39199e80a57d52dd7
+SHA512 (libzip-1.8.0.tar.xz) = fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
+Size (libzip-1.8.0.tar.xz) = 760604 bytes
+SHA1 (patch-CMakeLists.txt) = 17745d56f98cd4a6298c54b8562b463207c5a7ee

Added files:

Index: pkgsrc/archivers/libzip/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/archivers/libzip/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Jun 24 21:40:06 2021
+++ pkgsrc/archivers/libzip/patches/patch-CMakeLists.txt        Thu Jun 24 21:40:06 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/06/24 21:40:06 wiz Exp $
+
+Upstream commit ca61524e05d785f0d14f40802c6a1a54a46b74bb
+
+--- CMakeLists.txt.orig        2021-06-18 16:08:29.000000000 +0000
++++ CMakeLists.txt
+@@ -299,6 +299,7 @@ foreach(LIB ${LIBS_PRIVATE})
+ endforeach()
+ string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
+ string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS})
++string(REGEX REPLACE "-lZstd::Zstd" "-lzstd" LIBS ${LIBS})
+ string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS})
+ string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS})
+ string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS})