diff options
| author | wiz <wiz@pkgsrc.org> | 2018-03-12 08:51:54 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-03-12 08:51:54 +0000 |
| commit | 20d11bd2a7991bd8a7fc02865dcb1662b9aeb69a (patch) | |
| tree | 9a0437b3031581c6756abaa4106a0622137ac753 /archivers | |
| parent | 966419bd0172078c883c04d6e951797883a9e13b (diff) | |
| download | pkgsrc-20d11bd2a7991bd8a7fc02865dcb1662b9aeb69a.tar.gz | |
libzip: update to 1.5.0.
1.5.0 [2018-03-11]
==================
* Use standard cryptographic library instead of custom AES implementation.
This also simplifies the license.
* Use `clang-format` to format the source code.
* More Windows improvements.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libzip/Makefile | 14 | ||||
| -rw-r--r-- | archivers/libzip/distinfo | 10 | ||||
| -rw-r--r-- | archivers/libzip/options.mk | 18 |
3 files changed, 26 insertions, 16 deletions
diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile index ddd85fcbb6f..1862cc460a8 100644 --- a/archivers/libzip/Makefile +++ b/archivers/libzip/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2018/02/11 15:46:58 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2018/03/12 08:51:54 wiz Exp $ -DISTNAME= libzip-1.4.0 +DISTNAME= libzip-1.5.0 CATEGORIES= archivers devel MASTER_SITES= https://libzip.org/download/ EXTRACT_SUFX= .tar.xz @@ -17,15 +17,7 @@ TEST_TARGET= test # for tests MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -# avoid running regression tests with not yet installed libs, -# the above LD_LIBRARY_PATH is not passed to commands executed -# via cmake and zip lib is not found when invoking ziptool -BUILD_TARGET= zip -INSTALL_TARGET= install/fast -.endif +.include "options.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo index 45bb4f34148..22edd51397c 100644 --- a/archivers/libzip/distinfo +++ b/archivers/libzip/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.28 2017/12/30 00:19:56 wiz Exp $ +$NetBSD: distinfo,v 1.29 2018/03/12 08:51:54 wiz Exp $ -SHA1 (libzip-1.4.0.tar.xz) = 6dded3edf48eeb10b97fa0fb8f7aa661d3137823 -RMD160 (libzip-1.4.0.tar.xz) = 3dfdceb7432996f691622a189a165756b5ef3b3f -SHA512 (libzip-1.4.0.tar.xz) = 125e4de8b02781023f9bed450747b9c36942cbf41de7a863402786d1c7b848e19b425f4b0c26ab3857c6bbfd8571bcd9cb1434df355c59148db54f1b951f5c56 -Size (libzip-1.4.0.tar.xz) = 713912 bytes +SHA1 (libzip-1.5.0.tar.xz) = 19176e2cf88ee335dab7fcef0afd9b2f81ede39f +RMD160 (libzip-1.5.0.tar.xz) = 9d25c8160247af0e45c087ac2cc35c52879dfaec +SHA512 (libzip-1.5.0.tar.xz) = 6854c0cc40cbff4fe2efc407b3a52019a234ff734fccfc5068117e29541232827f5100b74fdf68537e5ba7165b41b14312fe934aebe388372e1d6face2185ef1 +Size (libzip-1.5.0.tar.xz) = 695660 bytes diff --git a/archivers/libzip/options.mk b/archivers/libzip/options.mk new file mode 100644 index 00000000000..a04b7f31d11 --- /dev/null +++ b/archivers/libzip/options.mk @@ -0,0 +1,18 @@ +# $NetBSD: options.mk,v 1.1 2018/03/12 08:51:54 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libzip +PKG_OPTIONS_OPTIONAL_GROUPS= crypto +PKG_OPTIONS_GROUP.crypto= gnutls openssl +PKG_SUGGESTED_OPTIONS= openssl + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgnutls) +CMAKE_ARGS+= -DENABLE_OPENSSL=OFF +.include "../../security/gnutls/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mopenssl) +CMAKE_ARGS+= -DENABLE_GNUTLS=OFF +.include "../../security/openssl/buildlink3.mk" +.endif |