CVS commit: pkgsrc/archivers/unzip

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Apr 24 14:10:55 UTC 2025

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

Log Message:
unzip: remove K&R prototype for gmtime()

These cause conflict with system headers in C23 and later.
(gnu23 is the new default in GCC 15.)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/archivers/unzip/distinfo
cvs rdiff -u -r1.2 -r1.3 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/distinfo
diff -u pkgsrc/archivers/unzip/distinfo:1.35 pkgsrc/archivers/unzip/distinfo:1.36
--- pkgsrc/archivers/unzip/distinfo:1.35        Tue Aug  6 14:40:13 2024
+++ pkgsrc/archivers/unzip/distinfo     Thu Apr 24 14:10:54 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2024/08/06 14:40:13 nia Exp $
+$NetBSD: distinfo,v 1.36 2025/04/24 14:10:54 tnn 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) = b2831f38b2245dacedd4eb2eef12ee1e3cf20613
+SHA1 (patch-unix_unxcfg.h) = dc719e62014dadd53d4fbbfc5cca7bea8d0b57aa
 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.2 pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h:1.3
--- pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h:1.2      Sat May  3 11:24:19 2014
+++ pkgsrc/archivers/unzip/patches/patch-unix_unxcfg.h  Thu Apr 24 14:10:55 2025
@@ -1,9 +1,10 @@
-$NetBSD: patch-unix_unxcfg.h,v 1.2 2014/05/03 11:24:19 ryoon Exp $
+$NetBSD: patch-unix_unxcfg.h,v 1.3 2025/04/24 14:10:55 tnn Exp $
 
 * Fix build on Debian GNU/kFreeBSD.
 * Fix build under OpenBSD 5.5
   Patch from OpenBSD Ports
   "timeb was already well deprecated on 4.4BSD"
+* Remove K&R prototype for gmtime()
 
 --- unix/unxcfg.h.orig 2009-04-16 18:36:12.000000000 +0000
 +++ unix/unxcfg.h
@@ -15,7 +16,7 @@ $NetBSD: patch-unix_unxcfg.h,v 1.2 2014/
  
  #ifdef NO_OFF_T
    typedef long zoff_t;
-@@ -111,7 +112,9 @@ typedef struct stat z_stat;
+@@ -111,13 +112,14 @@ typedef struct stat z_stat;
  
  #ifdef BSD
  #  include <sys/time.h>
@@ -26,3 +27,9 @@ $NetBSD: patch-unix_unxcfg.h,v 1.2 2014/
  #  if (defined(_AIX) || defined(__GLIBC__) || defined(__GNU__))
  #    include <time.h>
  #  endif
+ #else
+ #  include <time.h>
+-   struct tm *gmtime(), *localtime();
+ #endif
+ 
+ #if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN)))