Hi ports --
Here's a simple-ish update to libzip. The HOMEPAGE changed, as did
MASTER_SITES. There's a license simplification because now libzip will
use libcrypto instead of a custom AES implementation, so I took the
opportunity to simply our license marker. And there's a new patch that I
will send upstream.
Major bump, as some functions were removed from the library.
Passed a "successfully built all dependencies on amd64" check.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/libzip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 9 Jan 2018 23:10:43 -0000 1.18
+++ Makefile 23 Apr 2018 21:21:15 -0000
@@ -2,19 +2,19 @@
COMMENT= library for reading, creating and modifying zip archives
-DISTNAME= libzip-1.4.0
+DISTNAME= libzip-1.5.1
CATEGORIES= archivers
-SHARED_LIBS += zip 2.3 # 5.0
+SHARED_LIBS += zip 3.0 # 5.0
-HOMEPAGE= https://www.nih.at/libzip/
+HOMEPAGE= https://libzip.org/
MAINTAINER= Brian Callahan <bcal...@openbsd.org>
-# BSD-3
+# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += bz2 c z
+WANTLIB += bz2 c crypto ssl z
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://libzip.org/download/
MODULES = devel/cmake
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/libzip/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 9 Jan 2018 23:10:43 -0000 1.12
+++ distinfo 23 Apr 2018 21:21:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (libzip-1.4.0.tar.gz) = dZqJaQ4VXKUiR2OLn5fhbkj7tgd6u3zi2SHdW4ElmUA=
-SIZE (libzip-1.4.0.tar.gz) = 1179961
+SHA256 (libzip-1.5.1.tar.gz) = R+qkX6pEjHK9aQbloJaEbEaaGF8pPK/YRWq7FlhBs/I=
+SIZE (libzip-1.5.1.tar.gz) = 1189827
Index: patches/patch-lib_zip_crypto_openssl_c
===================================================================
RCS file: patches/patch-lib_zip_crypto_openssl_c
diff -N patches/patch-lib_zip_crypto_openssl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_zip_crypto_openssl_c 23 Apr 2018 21:21:15 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add limits.h for INT_MAX
+
+Index: lib/zip_crypto_openssl.c
+--- lib/zip_crypto_openssl.c.orig
++++ lib/zip_crypto_openssl.c
+@@ -31,6 +31,7 @@
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <limits.h>
+ #include <stdlib.h>
+
+ #include "zipint.h"
Index: patches/patch-src_ziptool_c
===================================================================
RCS file: /cvs/ports/archivers/libzip/patches/patch-src_ziptool_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_ziptool_c
--- patches/patch-src_ziptool_c 9 Jan 2018 23:10:43 -0000 1.3
+++ patches/patch-src_ziptool_c 23 Apr 2018 21:21:15 -0000
@@ -5,7 +5,7 @@ time_t == %lld
Index: src/ziptool.c
--- src/ziptool.c.orig
+++ src/ziptool.c
-@@ -500,7 +500,7 @@ set_file_mtime(int argc, char *argv[]) {
+@@ -503,7 +503,7 @@ set_file_mtime(int argc, char *argv[]) {
idx = strtoull(argv[0], NULL, 10);
mtime = (time_t)strtoull(argv[1], NULL, 10);
if (zip_file_set_mtime(za, idx, mtime, 0) < 0) {
@@ -14,7 +14,7 @@ Index: src/ziptool.c
return -1;
}
return 0;
-@@ -520,7 +520,7 @@ set_file_mtime_all(int argc, char *argv[]) {
+@@ -523,7 +523,7 @@ set_file_mtime_all(int argc, char *argv[]) {
}
for (idx = 0; idx < (zip_uint64_t)num_entries; idx++) {
if (zip_file_set_mtime(za, idx, mtime, 0) < 0) {
