CVS commit: pkgsrc/archivers/unzip

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug  5 09:03:01 UTC 2024

Modified Files:
        pkgsrc/archivers/unzip: distinfo
Added Files:
        pkgsrc/archivers/unzip/patches: patch-globals.h

Log Message:
unzip: fix build with GCC 14


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/archivers/unzip/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/unzip/patches/patch-globals.h

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

Modified files:

Index: pkgsrc/archivers/unzip/distinfo
diff -u pkgsrc/archivers/unzip/distinfo:1.33 pkgsrc/archivers/unzip/distinfo:1.34
--- pkgsrc/archivers/unzip/distinfo:1.33        Tue Oct 26 09:57:19 2021
+++ pkgsrc/archivers/unzip/distinfo     Mon Aug  5 09:03:00 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 09:57:19 nia Exp $
+$NetBSD: distinfo,v 1.34 2024/08/05 09:03:00 tnn Exp $
 
 BLAKE2s (unzip60.tgz) = d083b60907af71a6870edc1e87be4566dee486d5089e1fc3b57cc6ebac00818f
 SHA512 (unzip60.tgz) = 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
@@ -8,6 +8,7 @@ SHA1 (patch-ac) = 27b91401d4d5ecc3842c91
 SHA1 (patch-crypt.c) = e44e14ba2c8e5651659c6756a5adbe88b4385ca4
 SHA1 (patch-extract.c) = 042fe7d233d0b3cb1e978902c901e8239f7a3732
 SHA1 (patch-fileio.c) = 910ddb3b847cae92326697a399234b2948555534
+SHA1 (patch-globals.h) = d537ad18fa4406cd4b78ccee694c3cccb832f5a3
 SHA1 (patch-list.c) = 29e6dc3f5d40bb087a8bff58f75eb02568f3ad87
 SHA1 (patch-process.c) = d6e6ed05ef7c2977353e848d9e9cba2877577812
 SHA1 (patch-unix_unxcfg.h) = b2831f38b2245dacedd4eb2eef12ee1e3cf20613

Added files:

Index: pkgsrc/archivers/unzip/patches/patch-globals.h
diff -u /dev/null pkgsrc/archivers/unzip/patches/patch-globals.h:1.1
--- /dev/null   Mon Aug  5 09:03:01 2024
+++ pkgsrc/archivers/unzip/patches/patch-globals.h      Mon Aug  5 09:03:00 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-globals.h,v 1.1 2024/08/05 09:03:00 tnn Exp $
+
+Match return type of get_crc_table() from zlib.h.
+Without it we get an error with GCC 14.
+This looks somewhat sketchy but make test succeeds,
+and 32-bit is the correct width for the crc32 table, so ...
+
+extract.c:363:25: error: assignment to 'const ulg *' {aka 'const long unsigned int *'} from incompatible pointer type 'const z_crc_t *' {aka 'const unsigned int *'} [-Wincompatible-pointer-types]
+363 |         if ((CRC_32_TAB = get_crc_table()) == NULL) {
+
+--- globals.h.orig     2024-08-05 10:40:15.418511764 +0000
++++ globals.h
+@@ -226,7 +226,7 @@ typedef struct Globals {
+ #if (!defined(USE_ZLIB) || defined(USE_OWN_CRCTAB))
+     ZCONST ulg near *crc_32_tab;
+ #else
+-    ZCONST ulg Far *crc_32_tab;
++    ZCONST z_crc_t Far *crc_32_tab;
+ #endif
+     ulg       crc32val;             /* CRC shift reg. (was static in funzip) */
+