CVS commit: pkgsrc/net/microsocks

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Wed May 27 10:54:46 UTC 2026

Modified Files:
        pkgsrc/net/microsocks: Makefile distinfo
Added Files:
        pkgsrc/net/microsocks/patches: patch-sockssrv.c

Log Message:
net/microsocks: fix build for SunOS / illumos


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/microsocks/Makefile \
    pkgsrc/net/microsocks/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/microsocks/patches/patch-sockssrv.c

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

Modified files:

Index: pkgsrc/net/microsocks/Makefile
diff -u pkgsrc/net/microsocks/Makefile:1.1 pkgsrc/net/microsocks/Makefile:1.2
--- pkgsrc/net/microsocks/Makefile:1.1  Wed Jan 21 18:26:43 2026
+++ pkgsrc/net/microsocks/Makefile      Wed May 27 10:54:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/01/21 18:26:43 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2026/05/27 10:54:46 tm Exp $
 
 DISTNAME=      microsocks-1.0.5
 CATEGORIES=    net
@@ -15,6 +15,9 @@ WRKSRC=                       ${WRKDIR}/${DISTNAME}
 USE_LANGUAGES=         c
 USE_CC_FEATURES=       c99
 
+CFLAGS.SunOS+= -D__EXTENSIONS__        # getopt()
+LDFLAGS.SunOS+=        -lsocket -lnsl -lresolv
+
 pre-configure:
        ${ECHO} prefix=${PREFIX} > ${WRKSRC}/config.mak
 
Index: pkgsrc/net/microsocks/distinfo
diff -u pkgsrc/net/microsocks/distinfo:1.1 pkgsrc/net/microsocks/distinfo:1.2
--- pkgsrc/net/microsocks/distinfo:1.1  Wed Jan 21 18:26:43 2026
+++ pkgsrc/net/microsocks/distinfo      Wed May 27 10:54:46 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2026/01/21 18:26:43 gdt Exp $
+$NetBSD: distinfo,v 1.2 2026/05/27 10:54:46 tm Exp $
 
 BLAKE2s (microsocks-1.0.5.tar.gz) = b1432cc8028cbeb14e6a0618ceb845befbcc26dd336972b7e2e5889965bd1eeb
 SHA512 (microsocks-1.0.5.tar.gz) = 1180e007f586108b299f4861e8bf94e06a35fa986af90ce66844ef002c06557803825a1b5e73d08bd7a5463337d6bfe0c913bc69b3342e3932b582f05b522ab2
 Size (microsocks-1.0.5.tar.gz) = 10413 bytes
+SHA1 (patch-sockssrv.c) = 170f7a2b7c84ad5efe00b4c0707e15dca47033d1

Added files:

Index: pkgsrc/net/microsocks/patches/patch-sockssrv.c
diff -u /dev/null pkgsrc/net/microsocks/patches/patch-sockssrv.c:1.1
--- /dev/null   Wed May 27 10:54:46 2026
+++ pkgsrc/net/microsocks/patches/patch-sockssrv.c      Wed May 27 10:54:46 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-sockssrv.c,v 1.1 2026/05/27 10:54:46 tm Exp $
+
+dprintf is not available on SunOS / illumos.
+
+--- sockssrv.c.orig    2026-05-27 10:27:34.259067822 +0000
++++ sockssrv.c
+@@ -61,6 +61,23 @@
+ #define THREAD_STACK_SIZE 32*1024
+ #endif
+ 
++#if defined(__sun)
++#include <stdarg.h>
++
++int dprintf(int fd, const char *restrict format, ...) {
++    va_list ap;
++    FILE *f = fdopen(fd, "w");
++    if (!f) {
++        return -1;
++    }
++    va_start(ap, format);
++    int result = fprintf(f, format, ap);
++    va_end(ap);
++
++    return result;
++}
++#endif
++
+ static int quiet;
+ static const char* auth_user;
+ static const char* auth_pass;