Update to libzip-1.6.0

Changelog: https://libzip.org/news/release-1.6.0.html
ok bket@ cwen@
This commit is contained in:
bcallah 2020-02-02 00:11:34 +00:00
parent f75807e019
commit 60ef61e7c8
3 changed files with 8 additions and 32 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2019/09/21 15:56:20 bcallah Exp $
# $OpenBSD: Makefile,v 1.22 2020/02/02 00:11:34 bcallah Exp $
COMMENT= library for reading, creating and modifying zip archives
DISTNAME= libzip-1.5.2
DISTNAME= libzip-1.6.0
CATEGORIES= archivers
SHARED_LIBS += zip 3.0 # 5.0
SHARED_LIBS += zip 4.0 # 5.0
HOMEPAGE= https://libzip.org/
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
@ -12,13 +12,14 @@ MAINTAINER= Brian Callahan <bcallah@openbsd.org>
# BSD
PERMIT_PACKAGE= Yes
WANTLIB += bz2 c crypto ssl z
WANTLIB += bz2 c crypto lzma ssl z
MASTER_SITES= https://libzip.org/download/
MODULES = devel/cmake
LIB_DEPENDS = archivers/bzip2
LIB_DEPENDS = archivers/bzip2 \
archivers/xz
CONFIGURE_ARGS = -DENABLE_COMMONCRYPTO=OFF \
-DENABLE_GNUTLS=OFF \

View File

@ -1,2 +1,2 @@
SHA256 (libzip-1.5.2.tar.gz) = vmlKSrsv/l7AIHQUZ1fItWCE286/MpEjyEsgVBdDXhU=
SIZE (libzip-1.5.2.tar.gz) = 1203524
SHA256 (libzip-1.6.0.tar.gz) = cMS7NR3sJW+3JwU6Fh+qFMb+JEmIsSlDgAqvxcy/Wv8=
SIZE (libzip-1.6.0.tar.gz) = 1214206

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_ziptool_c,v 1.4 2018/04/23 21:48:07 bcallah Exp $
time_t == %lld
Index: src/ziptool.c
--- src/ziptool.c.orig
+++ src/ziptool.c
@@ -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) {
- fprintf(stderr, "can't set file mtime at index '%" PRIu64 "' to '%ld': %s\n", idx, mtime, zip_strerror(za));
+ fprintf(stderr, "can't set file mtime at index '%" PRIu64 "' to '%lld': %s\n", idx, (long long) mtime, zip_strerror(za));
return -1;
}
return 0;
@@ -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) {
- fprintf(stderr, "can't set file mtime at index '%" PRIu64 "' to '%ld': %s\n", idx, mtime, zip_strerror(za));
+ fprintf(stderr, "can't set file mtime at index '%" PRIu64 "' to '%lld': %s\n", idx, (long long) mtime, zip_strerror(za));
return -1;
}
}