Update libzip to 1.4.0 -- now using CMake and enabling bzip2

ok sthen@
This commit is contained in:
bcallah 2018-01-09 23:10:43 +00:00
parent 4dfde9ce55
commit b01beb866e
4 changed files with 19 additions and 14 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2017/11/20 19:13:23 bcallah Exp $
# $OpenBSD: Makefile,v 1.18 2018/01/09 23:10:43 bcallah Exp $
COMMENT= library for reading, creating and modifying zip archives
DISTNAME= libzip-1.3.2
DISTNAME= libzip-1.4.0
CATEGORIES= archivers
SHARED_LIBS += zip 2.2 # 5.0
SHARED_LIBS += zip 2.3 # 5.0
HOMEPAGE= https://www.nih.at/libzip/
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
@ -12,11 +12,12 @@ MAINTAINER= Brian Callahan <bcallah@openbsd.org>
# BSD-3
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c z
WANTLIB += bz2 c z
MASTER_SITES= ${HOMEPAGE}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --without-bzip2
MODULES = devel/cmake
LIB_DEPENDS = archivers/bzip2
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (libzip-1.3.2.tar.gz) = q0w062w6CLZ4zQ8kUKbFehPpYYsbo07kXQDrUycxZFc=
SIZE (libzip-1.3.2.tar.gz) = 1523449
SHA256 (libzip-1.4.0.tar.gz) = dZqJaQ4VXKUiR2OLn5fhbkj7tgd6u3zi2SHdW4ElmUA=
SIZE (libzip-1.4.0.tar.gz) = 1179961

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_ziptool_c,v 1.2 2017/11/20 19:13:23 bcallah Exp $
$OpenBSD: patch-src_ziptool_c,v 1.3 2018/01/09 23:10:43 bcallah Exp $
time_t == %lld
Index: src/ziptool.c
--- src/ziptool.c.orig
+++ src/ziptool.c
@@ -522,7 +522,7 @@ set_file_mtime(int argc, char *argv[]) {
@@ -500,7 +500,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;
@@ -542,7 +542,7 @@ set_file_mtime_all(int argc, char *argv[]) {
@@ -520,7 +520,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) {

View File

@ -1,11 +1,9 @@
@comment $OpenBSD: PLIST,v 1.9 2017/11/20 19:13:23 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.10 2018/01/09 23:10:43 bcallah Exp $
@bin bin/zipcmp
@bin bin/zipmerge
@bin bin/ziptool
include/zip.h
include/zipconf.h
lib/libzip.a
lib/libzip.la
@lib lib/libzip.so.${LIBzip_VERSION}
lib/pkgconfig/libzip.pc
@man man/man1/zipcmp.1
@ -84,12 +82,18 @@ lib/pkgconfig/libzip.pc
@man man/man3/zip_set_file_compression.3
@man man/man3/zip_source.3
@man man/man3/zip_source_begin_write.3
@man man/man3/zip_source_begin_write_cloning.3
@man man/man3/zip_source_buffer.3
@man man/man3/zip_source_buffer_create.3
@man man/man3/zip_source_buffer_fragment.3
@man man/man3/zip_source_buffer_fragment_create.3
@man man/man3/zip_source_close.3
@man man/man3/zip_source_commit_write.3
@man man/man3/zip_source_error.3
@man man/man3/zip_source_file.3
@man man/man3/zip_source_file_create.3
@man man/man3/zip_source_filep.3
@man man/man3/zip_source_filep_create.3
@man man/man3/zip_source_free.3
@man man/man3/zip_source_function.3
@man man/man3/zip_source_function_create.3