CVS commit: pkgsrc/archivers/unzip

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul  3 09:59:10 UTC 2025

Modified Files:
        pkgsrc/archivers/unzip: Makefile distinfo
        pkgsrc/archivers/unzip/patches: patch-unix_unxcfg.h

Log Message:
unzip: Fix GCC 14 implicit decl errors on illumos.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/archivers/unzip/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/archivers/unzip/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.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/Makefile
diff -u pkgsrc/archivers/unzip/Makefile:1.100 pkgsrc/archivers/unzip/Makefile:1.101
--- pkgsrc/archivers/unzip/Makefile:1.100       Mon Apr  7 15:26:36 2025
+++ pkgsrc/archivers/unzip/Makefile     Thu Jul  3 09:59:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2025/04/07 15:26:36 nia Exp $
+# $NetBSD: Makefile,v 1.101 2025/07/03 09:59:10 jperkin Exp $
 
 DISTNAME=      unzip60
 PKGNAME=       unzip-6.0
@@ -38,7 +38,7 @@ CPPFLAGS+=    -DBSD
 CPPFLAGS+=     -DNO_LCHMOD
 .endif
 CPPFLAGS+=     -DUNIX -Dunix -DUSE_UNSHRINK -I.
-.if empty(MACHINE_PLATFORM:MSunOS-*-sparc)
+.if !${MACHINE_PLATFORM:MSunOS-*-sparc}
 CPPFLAGS+=     -DLARGE_FILE_SUPPORT
 .endif
 

Index: pkgsrc/archivers/unzip/distinfo
diff -u pkgsrc/archivers/unzip/distinfo:1.36 pkgsrc/archivers/unzip/distinfo:1.37
--- pkgsrc/archivers/unzip/distinfo:1.36        Thu Apr 24 14:10:54 2025
+++ pkgsrc/archivers/unzip/distinfo     Thu Jul  3 09:59:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2025/04/24 14:10:54 tnn Exp $
+$NetBSD: distinfo,v 1.37 2025/07/03 09:59:10 jperkin Exp $
 
 BLAKE2s (unzip60.tgz) = d083b60907af71a6870edc1e87be4566dee486d5089e1fc3b57cc6ebac00818f
 SHA512 (unzip60.tgz) = 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
@@ -11,5 +11,5 @@ SHA1 (patch-fileio.c) = ef87b5e8a60b9268
 SHA1 (patch-globals.h) = d537ad18fa4406cd4b78ccee694c3cccb832f5a3
 SHA1 (patch-list.c) = 29e6dc3f5d40bb087a8bff58f75eb02568f3ad87
 SHA1 (patch-process.c) = a9c95ada1a0d3ac706d97a0bbd7dd99220f1fe69
-SHA1 (patch-unix_unxcfg.h) = dc719e62014dadd53d4fbbfc5cca7bea8d0b57aa
+SHA1 (patch-unix_unxcfg.h) = 8128ea53719ca88e9a4f4788fb7b4f706399f8ae
 SHA1 (patch-zipinfo.c) = 0d93fd9b145e7e707762119ee30ddf8eac9c2f31

Index: pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h
diff -u pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h:1.3 pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h:1.4
--- pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h:1.3      Thu Apr 24 14:10:55 2025
+++ pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h  Thu Jul  3 09:59:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_unxcfg.h,v 1.3 2025/04/24 14:10:55 tnn Exp $
+$NetBSD: patch-unix_unxcfg.h,v 1.4 2025/07/03 09:59:10 jperkin Exp $
 
 * Fix build on Debian GNU/kFreeBSD.
 * Fix build under OpenBSD 5.5
@@ -16,7 +16,7 @@ $NetBSD: patch-unix_unxcfg.h,v 1.3 2025/
  
  #ifdef NO_OFF_T
    typedef long zoff_t;
-@@ -111,13 +112,14 @@ typedef struct stat z_stat;
+@@ -111,16 +112,17 @@ typedef struct stat z_stat;
  
  #ifdef BSD
  #  include <sys/time.h>
@@ -32,4 +32,17 @@ $NetBSD: patch-unix_unxcfg.h,v 1.3 2025/
 -   struct tm *gmtime(), *localtime();
  #endif
  
- #if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN)))
+-#if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN)))
++#if (defined(BSD4_4) || defined(__illumos__) || (defined(SYSV) && defined(MODERN)))
+ #  include <unistd.h>           /* this includes utime.h on SGIs */
+ #  if (defined(BSD4_4) || defined(linux) || defined(__GLIBC__))
+ #    include <utime.h>
+@@ -130,7 +132,7 @@ typedef struct stat z_stat;
+ #    include <utime.h>
+ #    define GOT_UTIMBUF
+ #  endif
+-#  if (!defined(GOT_UTIMBUF) && defined(__GNU__))
++#  if (!defined(GOT_UTIMBUF) && (defined(__GNU__) || defined(__illumos__)))
+ #    include <utime.h>
+ #    define GOT_UTIMBUF
+ #  endif