CVS commit: pkgsrc/archivers/zziplib

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Nov 17 15:25:14 UTC 2023

Modified Files:
        pkgsrc/archivers/zziplib: distinfo
Added Files:
        pkgsrc/archivers/zziplib/patches: patch-zzip_mmapped.c

Log Message:
zziplib: fix clang 15 build with patch from FreeBSD Ports.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/archivers/zziplib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/zziplib/distinfo
diff -u pkgsrc/archivers/zziplib/distinfo:1.24 pkgsrc/archivers/zziplib/distinfo:1.25
--- pkgsrc/archivers/zziplib/distinfo:1.24      Tue Oct 26 09:57:20 2021
+++ pkgsrc/archivers/zziplib/distinfo   Fri Nov 17 15:25:13 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 09:57:20 nia Exp $
+$NetBSD: distinfo,v 1.25 2023/11/17 15:25:13 schmonz Exp $
 
 BLAKE2s (zziplib-0.13.72.tar.gz) = 6eed02a909c501f6b36043e49986cf8517459adc158f59e2e6c65b25239c6afd
 SHA512 (zziplib-0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 Size (zziplib-0.13.72.tar.gz) = 1162175 bytes
 SHA1 (patch-zzip_CMakeLists.txt) = 3ffad6de6dcb48189880d972052d917653f138aa
+SHA1 (patch-zzip_mmapped.c) = 70efa0b817f36a462d250ed8b1d5f86cd7357188
 SHA1 (patch-zzipwrap_CMakeLists.txt) = be632707cecafcdae76a7633d60cac6261f720d8

Added files:

Index: pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c
diff -u /dev/null pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c:1.1
--- /dev/null   Fri Nov 17 15:25:14 2023
+++ pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c       Fri Nov 17 15:25:13 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-zzip_mmapped.c,v 1.1 2023/11/17 15:25:13 schmonz Exp $
+
+Fix clang 15 build with patch from FreeBSD Ports.
+
+--- zzip/mmapped.c.orig        2021-01-04 23:05:08.000000000 +0000
++++ zzip/mmapped.c
+@@ -661,7 +661,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
+ 
+     ___ /* a ZIP64 extended block may follow. */
+     size_t csize = zzip_file_header_csize(header);
+-    off_t offset = zzip_file_header_to_data(header);
++    size_t offset = zzip_file_header_sizeto_end(header);
+     if (csize == 0xFFFFu) {
+         struct zzip_extra_zip64* zip64 =
+            zzip_file_header_to_extras(header);
+@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
+     file->zlib.zalloc = Z_NULL;
+     file->zlib.zfree = Z_NULL;
+     file->zlib.avail_in = csize;
+-    file->zlib.next_in = offset;
++    file->zlib.next_in = (Bytef *)header + offset;
+     ____;
+ 
+     DBG2("compressed size %i", (int) file->zlib.avail_in);