CVS commit: pkgsrc/chat/ii

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 12 14:41:44 UTC 2025

Modified Files:
        pkgsrc/chat/ii: Makefile distinfo
        pkgsrc/chat/ii/patches: patch-ii.c

Log Message:
chat/ii: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/chat/ii/Makefile pkgsrc/chat/ii/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/ii/patches/patch-ii.c

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

Modified files:

Index: pkgsrc/chat/ii/Makefile
diff -u pkgsrc/chat/ii/Makefile:1.6 pkgsrc/chat/ii/Makefile:1.7
--- pkgsrc/chat/ii/Makefile:1.6 Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/Makefile     Sun Oct 12 14:41:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2025/09/02 20:24:02 vins Exp $
+# $NetBSD: Makefile,v 1.7 2025/10/12 14:41:43 vins Exp $
 
 DISTNAME=      ii-2.0
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  https://dl.suckless.org/tools/
 
@@ -21,7 +22,6 @@ CFLAGS.SunOS+=        -D__EXTENSIONS__
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
 .if !${OPSYS:M*BSD} && ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS"
-# build strlcpy() compatibility
 CPPFLAGS+=     -DNEED_STRLCPY
 MAKE_FLAGS+=   LIBS+=strlcpy.o
 .endif
Index: pkgsrc/chat/ii/distinfo
diff -u pkgsrc/chat/ii/distinfo:1.6 pkgsrc/chat/ii/distinfo:1.7
--- pkgsrc/chat/ii/distinfo:1.6 Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/distinfo     Sun Oct 12 14:41:43 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2025/09/02 20:24:02 vins Exp $
+$NetBSD: distinfo,v 1.7 2025/10/12 14:41:43 vins Exp $
 
 BLAKE2s (ii-2.0-tls.diff) = 4fd3b60f07c254a040810d15721cb9675154868c3656b7eadce67ad763c4eed5
 SHA512 (ii-2.0-tls.diff) = ee41dc661988b0158b5fc5e3fb92c0b6753993645882fe6a8fc1dc81e904bbcd01ca05623af4eaf8aa1a3fb31b1423ff533e35771f5b47c45fef7546be3c4cb9
@@ -7,4 +7,4 @@ BLAKE2s (ii-2.0.tar.gz) = 85d8a85333511e
 SHA512 (ii-2.0.tar.gz) = ab8102b5669495b7bc6a3311245f3eb49d2add1e387290e41deb51e121f4c7c98a09d117052c345d8b896149276a83790c0b78efe3ed19fc52bc00575bf8e44a
 Size (ii-2.0.tar.gz) = 11129 bytes
 SHA1 (patch-Makefile) = 2af128eecb5f60aae0f74d939975a05fbe1e8342
-SHA1 (patch-ii.c) = e958dad9b3f7fa2a11d5fe4715dc677178c94723
+SHA1 (patch-ii.c) = 4c2c0dbcf24defe873b76293618b237b9700bbd5

Index: pkgsrc/chat/ii/patches/patch-ii.c
diff -u pkgsrc/chat/ii/patches/patch-ii.c:1.1 pkgsrc/chat/ii/patches/patch-ii.c:1.2
--- pkgsrc/chat/ii/patches/patch-ii.c:1.1       Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/patches/patch-ii.c   Sun Oct 12 14:41:44 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-ii.c,v 1.1 2025/09/02 20:24:02 vins Exp $
+$NetBSD: patch-ii.c,v 1.2 2025/10/12 14:41:44 vins Exp $
 
-Make sure PATH_MAX is defined. 
+* Make sure PATH_MAX is defined. 
+* Prevent type clash on SunOS.
 
---- ii.c.orig  2022-10-04 17:25:51.000000000 +0000
+--- ii.c.orig  2025-10-12 14:33:14.984921552 +0000
 +++ ii.c
-@@ -24,6 +24,10 @@ char *argv0;
+@@ -27,6 +27,10 @@ char *argv0;
  
  #include "arg.h"
  
@@ -15,3 +16,28 @@ Make sure PATH_MAX is defined. 
  #ifdef NEED_STRLCPY
  size_t strlcpy(char *, const char *, size_t);
  #endif /* NEED_STRLCPY */
+@@ -369,19 +373,19 @@ loginuser(int ircfd, const char *host, c
+ static int
+ udsopen(const char *uds)
+ {
+-      struct sockaddr_un sun;
++      struct sockaddr_un lsun;
+       size_t len;
+       int fd;
+ 
+       if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+               die("%s: socket: %s\n", argv0, strerror(errno));
+ 
+-      sun.sun_family = AF_UNIX;
+-      if (strlcpy(sun.sun_path, uds, sizeof(sun.sun_path)) >= sizeof(sun.sun_path))
++      lsun.sun_family = AF_UNIX;
++      if (strlcpy(lsun.sun_path, uds, sizeof(lsun.sun_path)) >= sizeof(lsun.sun_path))
+               die("%s: UNIX domain socket path truncation\n", argv0);
+ 
+-      len = strlen(sun.sun_path) + 1 + sizeof(sun.sun_family);
+-      if (connect(fd, (struct sockaddr *)&sun, len) == -1)
++      len = strlen(lsun.sun_path) + 1 + sizeof(lsun.sun_family);
++      if (connect(fd, (struct sockaddr *)&lsun, len) == -1)
+               die("%s: connect: %s\n", argv0, strerror(errno));
+ 
+       return fd;