CVS commit: pkgsrc/net/ucspi-udp

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 27 17:27:41 UTC 2025

Modified Files:
        pkgsrc/net/ucspi-udp: distinfo
Added Files:
        pkgsrc/net/ucspi-udp/patches: patch-sgetopt.c patch-sgetopt.h

Log Message:
ucspi-udp: fix SmartOS build. Still good on NetBSD, macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ucspi-udp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-udp/patches/patch-sgetopt.c \
    pkgsrc/net/ucspi-udp/patches/patch-sgetopt.h

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

Modified files:

Index: pkgsrc/net/ucspi-udp/distinfo
diff -u pkgsrc/net/ucspi-udp/distinfo:1.2 pkgsrc/net/ucspi-udp/distinfo:1.3
--- pkgsrc/net/ucspi-udp/distinfo:1.2   Mon Dec 13 21:59:09 2021
+++ pkgsrc/net/ucspi-udp/distinfo       Fri Jun 27 17:27:41 2025
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.2 2021/12/13 21:59:09 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2025/06/27 17:27:41 schmonz Exp $
 
 BLAKE2s (tsi-ucspi-udp/ea972137e1da3189237aecc954bff2377398cb36-ea972137e1da3189237aecc954bff2377398cb36.tar.gz) = ca0ee4bb86ad92a438af53f86edb5edeeb576c4e0afd1387f9179066509da276
 SHA512 (tsi-ucspi-udp/ea972137e1da3189237aecc954bff2377398cb36-ea972137e1da3189237aecc954bff2377398cb36.tar.gz) = 
d3af287e08dd038de92f286b3d71ec65d211ea257e85aedf8a404dd7eb3a784cbae216966b861a55224ede9259b0530c66695439b55340c8f219944ac131284e
 Size (tsi-ucspi-udp/ea972137e1da3189237aecc954bff2377398cb36-ea972137e1da3189237aecc954bff2377398cb36.tar.gz) = 52786 bytes
 SHA1 (patch-Makefile) = 5f06c5ca1491be733f9bdbc0ef45e9b80fb89744
 SHA1 (patch-hier.c) = ae0acd2c1ed227cd44a295c785f8d7a2f83c37ad
+SHA1 (patch-sgetopt.c) = d26eea1088c729e772525199ffef3dc127300bb7
+SHA1 (patch-sgetopt.h) = 866aa4224b7d3a8760c06a9e4fb0d2588b2e9dcf
 SHA1 (patch-udpconnect.c) = 8ab601d52981c8ae26fd0f69e071c866988a42f5

Added files:

Index: pkgsrc/net/ucspi-udp/patches/patch-sgetopt.c
diff -u /dev/null pkgsrc/net/ucspi-udp/patches/patch-sgetopt.c:1.1
--- /dev/null   Fri Jun 27 17:27:41 2025
+++ pkgsrc/net/ucspi-udp/patches/patch-sgetopt.c        Fri Jun 27 17:27:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-sgetopt.c,v 1.1 2025/06/27 17:27:41 schmonz Exp $
+
+Avoid "conflicting types for 'sgetoptmine'" on Illumos.
+
+--- sgetopt.c.orig     2016-03-29 19:44:38.000000000 +0000
++++ sgetopt.c
+@@ -25,7 +25,7 @@ Documentation in sgetopt.3.
+ int opterr = 1;
+ char *optprogname = 0;
+ 
+-int getopt(int argc,char **argv,char *opts)
++int getopt(int argc, char * const* argv, const char *opts)
+ {
+   int c;
+   char *s;
Index: pkgsrc/net/ucspi-udp/patches/patch-sgetopt.h
diff -u /dev/null pkgsrc/net/ucspi-udp/patches/patch-sgetopt.h:1.1
--- /dev/null   Fri Jun 27 17:27:41 2025
+++ pkgsrc/net/ucspi-udp/patches/patch-sgetopt.h        Fri Jun 27 17:27:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-sgetopt.h,v 1.1 2025/06/27 17:27:41 schmonz Exp $
+
+Avoid "conflicting types for 'sgetoptmine'" on Illumos.
+
+--- sgetopt.h.orig     2016-03-29 19:44:38.000000000 +0000
++++ sgetopt.h
+@@ -14,7 +14,7 @@
+ 
+ #include "subgetopt.h"
+ 
+-extern int sgetoptmine(int,char **,char *);
++extern int sgetoptmine(int, char * const*, const char *);
+ extern int sgetopterr;
+ extern char *sgetoptprogname;
+