From d3c0002ccac01f27fa2d44e985136e2fe8071c9f Mon Sep 17 00:00:00 2001 From: pho Date: Mon, 29 Apr 2024 04:04:12 +0000 Subject: [PATCH] archivers/hs-zip-archive: Update to 0.4.3.2 zip-archive 0.4.3.2 * readEntry: Fix computation of modification time (#67). It should be a UNIX time (seconds since UNIX epoch), but computed relative to the local time zone, not UTC. zip-archive 0.4.3.1 * Use streaming decompress to identify extent of compressed data (#66). This fixes a problem that arises for local files with bit 3 of the general purpose bit flag set. In this case, we don't get information up front about the size of the compressed data. So how do we know where the compressed data ends? Previously, we tried to determine this by looking for the signature of the data descriptor. But the data descriptor doesn't always HAVE a signature, and it is also possible for signatures to occur accidentally in the compressed data itself (#65). Instead, we now use the streaming decompression interface from zlib's Internal module to identify where the compressed data ends. Fixes both #65 and #25. --- archivers/hs-zip-archive/Makefile | 5 ++--- archivers/hs-zip-archive/PLIST | 4 +--- archivers/hs-zip-archive/buildlink3.mk | 4 ++-- archivers/hs-zip-archive/distinfo | 8 ++++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile index 282eae070f77..1b9a408746c4 100644 --- a/archivers/hs-zip-archive/Makefile +++ b/archivers/hs-zip-archive/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2023/11/02 06:36:10 pho Exp $ +# $NetBSD: Makefile,v 1.11 2024/04/29 04:04:12 pho Exp $ -DISTNAME= zip-archive-0.4.3 -PKGREVISION= 1 +DISTNAME= zip-archive-0.4.3.2 CATEGORIES= archivers MAINTAINER= zecrazytux@zecrazytux.net diff --git a/archivers/hs-zip-archive/PLIST b/archivers/hs-zip-archive/PLIST index 6b44a39c82f1..86270d7f6623 100644 --- a/archivers/hs-zip-archive/PLIST +++ b/archivers/hs-zip-archive/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2023/10/27 08:33:32 pho Exp $ +@comment $NetBSD: PLIST,v 1.5 2024/04/29 04:04:12 pho Exp $ ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Zip.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Zip.hi @@ -10,12 +10,10 @@ lib/zip-archive-${PKGVERSION}/${HS_VERSION}/package-id share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/Codec-Archive-Zip.html ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/quick-jump.css -${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/synopsis.png ${PLIST.doc}share/doc/${HS_PLATFORM}/zip-archive-${PKGVERSION}/html/zip-archive.haddock diff --git a/archivers/hs-zip-archive/buildlink3.mk b/archivers/hs-zip-archive/buildlink3.mk index fc8a2f403f71..3010c07002f6 100644 --- a/archivers/hs-zip-archive/buildlink3.mk +++ b/archivers/hs-zip-archive/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2023/11/02 06:36:10 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2024/04/29 04:04:12 pho Exp $ BUILDLINK_TREE+= hs-zip-archive @@ -6,7 +6,7 @@ BUILDLINK_TREE+= hs-zip-archive HS_ZIP_ARCHIVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-zip-archive+= hs-zip-archive>=0.4.3 -BUILDLINK_ABI_DEPENDS.hs-zip-archive+= hs-zip-archive>=0.4.3nb1 +BUILDLINK_ABI_DEPENDS.hs-zip-archive+= hs-zip-archive>=0.4.3.2 BUILDLINK_PKGSRCDIR.hs-zip-archive?= ../../archivers/hs-zip-archive .include "../../security/hs-digest/buildlink3.mk" diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo index 3614ab8ac7aa..dc0e1e4b7158 100644 --- a/archivers/hs-zip-archive/distinfo +++ b/archivers/hs-zip-archive/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2023/10/27 08:33:32 pho Exp $ +$NetBSD: distinfo,v 1.6 2024/04/29 04:04:12 pho Exp $ -BLAKE2s (zip-archive-0.4.3.tar.gz) = da357ecdd5562cecdcd50eb475ff9f72ed789cd7db93599d9382b64ac8ab16b9 -SHA512 (zip-archive-0.4.3.tar.gz) = b98791a22d0dc4b499653bbd88254cff86108bd3a13b59a107cc54e36dc0702c2934eb4b497cbc6239235a45b3486006e52d27faa5af589a124443f8938670ad -Size (zip-archive-0.4.3.tar.gz) = 22161 bytes +BLAKE2s (zip-archive-0.4.3.2.tar.gz) = 845b7469435379ac0015f6e0aa867d1a5f8e519db0d7fc739a31b27705cbc84c +SHA512 (zip-archive-0.4.3.2.tar.gz) = 8062598d6403e4f6ebbbb9db09ea04ecb58d4223d38e8b017d5050847d5194fa64c6abeb3d518f1e3bec963b641be8d7bd949a562b69b59feffb8c1e3e69aff6 +Size (zip-archive-0.4.3.2.tar.gz) = 22806 bytes