Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CB2C484E78 for ; Mon, 26 Jun 2023 11:37:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jjjS48fvkYZs for ; Mon, 26 Jun 2023 11:37:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 05FF284CFD for ; Mon, 26 Jun 2023 11:37:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 034CFFA89; Mon, 26 Jun 2023 11:37:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168777946085080" MIME-Version: 1.0 Date: Mon, 26 Jun 2023 11:37:40 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/archivers/libzip To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230626113741.034CFFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168777946085080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Jun 26 11:37:40 UTC 2023 Modified Files: pkgsrc/archivers/libzip: Makefile PLIST distinfo Added Files: pkgsrc/archivers/libzip/patches: patch-regress_nihtest.conf.in Log Message: libzip: update to 1.10.0. # 1.10.0 [2023-06-23] * Make support for layered sources public. * Add `zip_source_zip_file` and `zip_source_zip_file_create`, deprecate `zip_source_zip` and `zip_source_zip_create`. * Allow reading changed file data. * Fix handling of files of size 4294967295. * `zipmerge`: copy extra fields. * `zipmerge`: add option to keep files uncompressed. * Switch test framework to use nihtest instead of Perl. * Fix reading/writing compressed data with buffers > 4GiB. * Restore support for torrentzip. * Add warnings when using deprecated functions. * Allow keeping files for empty archives. * Support mbedTLS>=3.3.0. * Support OpenSSL 3. * Use ISO C secure library functions, if available. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 pkgsrc/archivers/libzip/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/archivers/libzip/PLIST cvs rdiff -u -r1.43 -r1.44 pkgsrc/archivers/libzip/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168777946085080 Content-Disposition: inline Content-Length: 4750 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libzip/Makefile diff -u pkgsrc/archivers/libzip/Makefile:1.63 pkgsrc/archivers/libzip/Makefile:1.64 --- pkgsrc/archivers/libzip/Makefile:1.63 Wed Apr 19 08:08:04 2023 +++ pkgsrc/archivers/libzip/Makefile Mon Jun 26 11:37:40 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.63 2023/04/19 08:08:04 adam Exp $ +# $NetBSD: Makefile,v 1.64 2023/06/26 11:37:40 wiz Exp $ -DISTNAME= libzip-1.9.2 -PKGREVISION= 2 +DISTNAME= libzip-1.10.0 CATEGORIES= archivers devel MASTER_SITES= https://libzip.org/download/ MASTER_SITES+= ${MASTER_SITE_GITHUB:=nih-at/} @@ -13,15 +12,19 @@ HOMEPAGE= https://www.libzip.org/ COMMENT= C library to manipulate zip archives LICENSE= modified-bsd -USE_TOOLS+= perl:build +TEST_DEPENDS+= ${PYPKGPREFIX}-nihtest-[0-9]*:../../devel/py-nihtest TEST_TARGET= test # for tests +CMAKE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX} MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib +PYTHON_VERSIONS_INCOMPATIBLE= 27 + .include "options.mk" .include "../../devel/cmake/build.mk" +.include "../../lang/python/pyversion.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" Index: pkgsrc/archivers/libzip/PLIST diff -u pkgsrc/archivers/libzip/PLIST:1.19 pkgsrc/archivers/libzip/PLIST:1.20 --- pkgsrc/archivers/libzip/PLIST:1.19 Tue Jun 28 20:14:51 2022 +++ pkgsrc/archivers/libzip/PLIST Mon Jun 26 11:37:40 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2022/06/28 20:14:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.20 2023/06/26 11:37:40 wiz Exp $ bin/zipcmp bin/zipmerge bin/ziptool @@ -8,6 +8,9 @@ lib/cmake/libzip/libzip-config-version.c lib/cmake/libzip/libzip-config.cmake lib/cmake/libzip/libzip-targets-noconfig.cmake lib/cmake/libzip/libzip-targets.cmake +lib/cmake/libzip/modules/FindMbedTLS.cmake +lib/cmake/libzip/modules/FindNettle.cmake +lib/cmake/libzip/modules/Findzstd.cmake lib/libzip.so lib/libzip.so.5 lib/libzip.so.5.5 @@ -110,7 +113,10 @@ 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_is_seekable.3 man/man3/zip_source_keep.3 +man/man3/zip_source_layered.3 +man/man3/zip_source_layered_create.3 man/man3/zip_source_make_command_bitmap.3 man/man3/zip_source_open.3 man/man3/zip_source_read.3 @@ -127,9 +133,12 @@ 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_window_create.3 man/man3/zip_source_write.3 man/man3/zip_source_zip.3 +man/man3/zip_source_zip_create.3 +man/man3/zip_source_zip_file.3 +man/man3/zip_source_zip_file_create.3 man/man3/zip_stat.3 man/man3/zip_stat_index.3 man/man3/zip_stat_init.3 Index: pkgsrc/archivers/libzip/distinfo diff -u pkgsrc/archivers/libzip/distinfo:1.43 pkgsrc/archivers/libzip/distinfo:1.44 --- pkgsrc/archivers/libzip/distinfo:1.43 Tue Jun 28 20:14:51 2022 +++ pkgsrc/archivers/libzip/distinfo Mon Jun 26 11:37:40 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.43 2022/06/28 20:14:51 wiz Exp $ +$NetBSD: distinfo,v 1.44 2023/06/26 11:37:40 wiz Exp $ -BLAKE2s (libzip-1.9.2.tar.xz) = 4d197144839df180450547ec919a8565b5dcc0e5c0bd66d317c31d1e335b2cc3 -SHA512 (libzip-1.9.2.tar.xz) = 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 -Size (libzip-1.9.2.tar.xz) = 763980 bytes +BLAKE2s (libzip-1.10.0.tar.xz) = a61cae94d6e1b6ae431bb57e20695765d717b1f50f797ef4eac13c19d40cce97 +SHA512 (libzip-1.10.0.tar.xz) = 558dcb58f0c209fea22463fb2bb705e3e3f45066200c1f87f7c7139da10d14445e4d9ce208b7eedf5d46470f6c1120f77aa6c9619b221275e6f8f4facbebac0b +Size (libzip-1.10.0.tar.xz) = 771676 bytes +SHA1 (patch-regress_nihtest.conf.in) = 7bce6b18161d885f3795820a1f222c258fee8c1b Added files: Index: pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in diff -u /dev/null pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in:1.1 --- /dev/null Mon Jun 26 11:37:40 2023 +++ pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in Mon Jun 26 11:37:40 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-regress_nihtest.conf.in,v 1.1 2023/06/26 11:37:40 wiz Exp $ + +To allow testing in uninstalled state. + +--- regress/nihtest.conf.in.orig 2023-06-23 14:27:16.000000000 +0000 ++++ regress/nihtest.conf.in +@@ -5,6 +5,7 @@ program-directories = @PROJECT_BINARY_DI + @PROJECT_BINARY_DIR@/src + default-program = ziptool_regress + default-stderr-replace = "^[^ :]*: " "" ++environment-passthrough = LD_LIBRARY_PATH + + [comparators] + zip.zip = zipcmp -pv --_----------=_168777946085080--