pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/zziplib zziplib: update to 0.13.72.
details: https://anonhg.NetBSD.org/pkgsrc/rev/930d711ab742
branches: trunk
changeset: 444737:930d711ab742
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jan 11 22:41:56 2021 +0000
description:
zziplib: update to 0.13.72.
This now uses cmake to build.
2021-01-04 gdraheim@github
* The testbuilds were fixed to make cmake install and automake install the same
* The cmake install did need patches for man3 installation on Unix
* The cmake install did need patches for dll installation on Windows
* The cmake install did need patches for dylib installation on MacOS
* The cmake install did need patches for pkgconfig generation
* Bump testbuilds to modern distro versions (ubuntu 20.04 centos 7.9 / 8.3)
* Takeover docker_mirror.py for air-gap testings (for testbuilds.py)
* handle UNZZIP-NOTFOUND in cmake and mark Ubuntu 'unzip' to be broken
* merge patches for zzip_pread feature from Max Kellermann
* merge patches for some bugs being found and reported via GitHub issues
* run azure-pipelines with -DZZIP_TESTCVE=OFF to skip CVE *.zip downloads
* use zziptests.py --downloadonly to get the CVE zip files for local storage
* The ninja builds for cmake were run regularly as it seems to be widely used.
* AND ... rename configure.ac to old.configure.ac to break outdated packaging scripts
* ....... see testbuilds/*-am-*.dockerfile that it still works to rename them back
* release 0.13.72
diffstat:
archivers/zziplib/Makefile | 18 ++-
archivers/zziplib/PLIST | 122 ++++++++++++++++++++++++++++-
archivers/zziplib/distinfo | 14 +--
archivers/zziplib/patches/patch-aa | 12 --
archivers/zziplib/patches/patch-bb | 12 --
archivers/zziplib/patches/patch-bc | 16 ---
archivers/zziplib/patches/patch-configure | 104 -------------------------
7 files changed, 131 insertions(+), 167 deletions(-)
diffs (truncated from 352 to 300 lines):
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/Makefile
--- a/archivers/zziplib/Makefile Mon Jan 11 22:32:33 2021 +0000
+++ b/archivers/zziplib/Makefile Mon Jan 11 22:41:56 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2020/11/25 13:26:21 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2021/01/11 22:41:56 wiz Exp $
-DISTNAME= zziplib-0.13.71
+DISTNAME= zziplib-0.13.72
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=gdraheim/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -10,14 +10,16 @@
COMMENT= Library for ZIP archive handling
LICENSE= gnu-lgpl-v2 OR mpl-1.1
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+= --disable-builddir
+BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
+BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-BUILD_DIRS= zzip zzipwrap bins
+USE_CMAKE= yes
+USE_TOOLS+= bash:build
-TEST_TARGET= check
+CMAKE_ARGS+= -DZZIPTEST=NO
+
+CHECK_PORTABILITY_SKIP+= old.configure
.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/PLIST
--- a/archivers/zziplib/PLIST Mon Jan 11 22:32:33 2021 +0000
+++ b/archivers/zziplib/PLIST Mon Jan 11 22:41:56 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/05/15 08:40:21 spz Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/01/11 22:41:56 wiz Exp $
bin/unzip-mem
bin/unzzip
bin/unzzip-big
@@ -31,13 +31,123 @@
include/zzip/zzip.h
include/zzip/zzip32.h
include/zziplib.h
-lib/libzzip.la
-lib/libzzipfseeko.la
-lib/libzzipmmapped.la
-lib/libzzipwrap.la
-lib/pkgconfig/zzip-zlib-config.pc
+lib/libzzip-0.so
+lib/libzzip-0.so.10
+lib/libzzip-0.so.11
+lib/libzzip-0.so.12
+lib/libzzip-0.so.13
+lib/libzzip-0.so.13.0.72
+lib/libzzip.so
+lib/libzzipfseeko-0.so
+lib/libzzipfseeko-0.so.10
+lib/libzzipfseeko-0.so.11
+lib/libzzipfseeko-0.so.12
+lib/libzzipfseeko-0.so.13
+lib/libzzipfseeko-0.so.13.0.72
+lib/libzzipfseeko.so
+lib/libzzipmmapped-0.so
+lib/libzzipmmapped-0.so.10
+lib/libzzipmmapped-0.so.11
+lib/libzzipmmapped-0.so.12
+lib/libzzipmmapped-0.so.13
+lib/libzzipmmapped-0.so.13.0.72
+lib/libzzipmmapped.so
+lib/libzzipwrap-0.so
+lib/libzzipwrap-0.so.13
+lib/libzzipwrap-0.so.13.0.72
+lib/libzzipwrap.so
lib/pkgconfig/zzipfseeko.pc
lib/pkgconfig/zziplib.pc
lib/pkgconfig/zzipmmapped.pc
lib/pkgconfig/zzipwrap.pc
+man/man3/__zzip_fetch_disk_trailer.3
+man/man3/__zzip_parse_root_directory.3
+man/man3/__zzip_try_open.3
+man/man3/zzip_close.3
+man/man3/zzip_closedir.3
+man/man3/zzip_compr_str.3
+man/man3/zzip_dir_alloc.3
+man/man3/zzip_dir_alloc_ext_io.3
+man/man3/zzip_dir_close.3
+man/man3/zzip_dir_fdopen.3
+man/man3/zzip_dir_fdopen_ext_io.3
+man/man3/zzip_dir_free.3
+man/man3/zzip_dir_open.3
+man/man3/zzip_dir_open_ext_io.3
+man/man3/zzip_dir_read.3
+man/man3/zzip_dir_real.3
+man/man3/zzip_dir_stat.3
+man/man3/zzip_dirfd.3
+man/man3/zzip_dirhandle.3
+man/man3/zzip_disk_buffer.3
+man/man3/zzip_disk_close.3
+man/man3/zzip_disk_entry_fopen.3
+man/man3/zzip_disk_entry_strdup_comment.3
+man/man3/zzip_disk_entry_strdup_name.3
+man/man3/zzip_disk_entry_to_data.3
+man/man3/zzip_disk_entry_to_file_header.3
+man/man3/zzip_disk_fclose.3
+man/man3/zzip_disk_feof.3
+man/man3/zzip_disk_findfile.3
+man/man3/zzip_disk_findfirst.3
+man/man3/zzip_disk_findmatch.3
+man/man3/zzip_disk_findnext.3
+man/man3/zzip_disk_fopen.3
+man/man3/zzip_disk_fread.3
+man/man3/zzip_disk_init.3
+man/man3/zzip_disk_mmap.3
+man/man3/zzip_disk_munmap.3
+man/man3/zzip_disk_new.3
+man/man3/zzip_disk_open.3
+man/man3/zzip_entry_data_offset.3
+man/man3/zzip_entry_fclose.3
+man/man3/zzip_entry_feof.3
+man/man3/zzip_entry_ffile.3
+man/man3/zzip_entry_findfile.3
+man/man3/zzip_entry_findfirst.3
+man/man3/zzip_entry_findmatch.3
+man/man3/zzip_entry_findnext.3
+man/man3/zzip_entry_fopen.3
+man/man3/zzip_entry_fread.3
+man/man3/zzip_entry_fread_file_header.3
+man/man3/zzip_entry_free.3
+man/man3/zzip_entry_strdup_name.3
+man/man3/zzip_errno.3
+man/man3/zzip_error.3
+man/man3/zzip_fclose.3
+man/man3/zzip_file_close.3
+man/man3/zzip_file_open.3
+man/man3/zzip_file_read.3
+man/man3/zzip_file_real.3
+man/man3/zzip_file_stat.3
+man/man3/zzip_filesize.3
+man/man3/zzip_fopen.3
+man/man3/zzip_fread.3
+man/man3/zzip_freopen.3
+man/man3/zzip_fstat.3
+man/man3/zzip_get_default_io.3
+man/man3/zzip_inflate_init.3
+man/man3/zzip_init_io.3
+man/man3/zzip_open.3
+man/man3/zzip_open_ext_io.3
+man/man3/zzip_open_shared_io.3
+man/man3/zzip_opendir.3
+man/man3/zzip_opendir_ext_io.3
+man/man3/zzip_read.3
+man/man3/zzip_readdir.3
+man/man3/zzip_realdir.3
+man/man3/zzip_realfd.3
+man/man3/zzip_rewind.3
+man/man3/zzip_rewinddir.3
+man/man3/zzip_seek.3
+man/man3/zzip_seek32.3
+man/man3/zzip_seekdir.3
+man/man3/zzip_seekdir32.3
+man/man3/zzip_seterror.3
+man/man3/zzip_strerror.3
+man/man3/zzip_strerror_of.3
+man/man3/zzip_tell.3
+man/man3/zzip_tell32.3
+man/man3/zzip_telldir.3
+man/man3/zzip_telldir32.3
share/aclocal/zziplib.m4
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/distinfo
--- a/archivers/zziplib/distinfo Mon Jan 11 22:32:33 2021 +0000
+++ b/archivers/zziplib/distinfo Mon Jan 11 22:41:56 2021 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.18 2020/11/25 13:26:21 wiz Exp $
+$NetBSD: distinfo,v 1.19 2021/01/11 22:41:56 wiz Exp $
-SHA1 (zziplib-0.13.71.tar.gz) = c03f539c8a6fe5f1b39db4b5d4646d869f78bdd6
-RMD160 (zziplib-0.13.71.tar.gz) = e6418c792911ad5b19771e02cc28f441a1844cea
-SHA512 (zziplib-0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-Size (zziplib-0.13.71.tar.gz) = 1150654 bytes
-SHA1 (patch-aa) = 0dd9535effc69940bfc0853b85685e7ba5f4fb30
-SHA1 (patch-bb) = aeedbec78e30e7d28c02509c934947e6f0d50693
-SHA1 (patch-bc) = b9f364ab66c218dafd176c0c5c33e74c208a634e
-SHA1 (patch-configure) = 55cc2214eb8dd3f0ad82464cb51afc0a5cddd0a5
+SHA1 (zziplib-0.13.72.tar.gz) = 330cab1c477196d2d26d30d5f4cb031647fd4597
+RMD160 (zziplib-0.13.72.tar.gz) = d1bcdbf0df1e1eb222c31b8d4c659bb1a45744f4
+SHA512 (zziplib-0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
+Size (zziplib-0.13.72.tar.gz) = 1162175 bytes
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/patches/patch-aa
--- a/archivers/zziplib/patches/patch-aa Mon Jan 11 22:32:33 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2017/05/15 08:40:21 spz Exp $
-
---- zzip/Makefile.in.orig 2017-04-23 23:46:28.000000000 +0000
-+++ zzip/Makefile.in
-@@ -892,6 +892,7 @@ install-data-hook : install-zzipHEADERS
- $(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h
-
- install-exec-hook:
-+xxx:
- @ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \
- ; do test -d $$i && continue ; test -f $$i || continue \
- ; lib=`basename "$$i" .so.13` \
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/patches/patch-bb
--- a/archivers/zziplib/patches/patch-bb Mon Jan 11 22:32:33 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2017/05/15 08:40:21 spz Exp $
-
---- configure.ac.orig 2017-04-23 23:46:28.000000000 +0000
-+++ configure.ac
-@@ -308,6 +308,7 @@ case "$host_os" in mingw*)
- # TODO: that is for backward compatibility only
- fi
- fi
-+ ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
- RESOLVES=" # "
- ;; esac
- AC_MSG_RESULT([$ZZIPLIB_LDFLAGS $RESOLVES])
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/patches/patch-bc
--- a/archivers/zziplib/patches/patch-bc Mon Jan 11 22:32:33 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.4 2018/08/06 12:55:38 snj Exp $
-
-replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
-for xlc
-
---- m4/libtool.m4.orig 2018-03-17 05:46:45.000000000 -0700
-+++ m4/libtool.m4 2018-08-06 05:48:51.960497787 -0700
-@@ -7032,7 +7032,7 @@ if test yes != "$_lt_caught_CXX_error";
- xl* | mpixl* | bgxl*)
- # IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-- _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test yes = "$supports_anon_versioning"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
diff -r 66cb92ca34cb -r 930d711ab742 archivers/zziplib/patches/patch-configure
--- a/archivers/zziplib/patches/patch-configure Mon Jan 11 22:32:33 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2020/11/25 13:26:22 wiz Exp $
-
-Avoid unportable test operator.
-
-Use as_echo to handle quoted characters correctly (on Solaris?)
-
---- configure.orig 2020-04-15 23:36:46.000000000 +0000
-+++ configure
-@@ -15459,13 +15459,14 @@ case "$host_os" in mingw*)
- ;; *)
- if test ".$can_build_shared" != ".no" ; then
- ZZIPLIB_LDFLAGS="-export-dynamic"
-- if test ".$lt_cv_prog_gnu_ld" == ".yes" ; then
-+ if test ".$lt_cv_prog_gnu_ld" = ".yes" ; then
- ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
- # TODO: that is for backward compatibility only
- fi
- fi
- RESOLVES=" # "
- ;; esac
-+ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
- $as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; }
-
-@@ -18969,24 +18970,24 @@ else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
- $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
- if test -f $ac_prefix_conf_INP ; then
-- echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
-- echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
-- echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
-- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
-- echo "#endif/" >>conftest.prefix
-- echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
-- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
-- echo "#endif/" >> conftest.prefix
-+ $as_echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
-+ $as_echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
-+ $as_echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
-+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
-+ $as_echo "#endif/" >>conftest.prefix
-+ $as_echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
-+ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
-+ $as_echo "#endif/" >> conftest.prefix
- # now executing _script on _DEF input to create _OUT output file
-- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
-- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
-- echo ' ' >>$tmp/pconfig.h
-- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
-+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
-+ $as_echo ' ' >>$tmp/pconfig.h
Home |
Main Index |
Thread Index |
Old Index