CVS commit: pkgsrc/mail/opensmtpd-table-socketmap

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Mar 10 05:44:52 UTC 2025

Modified Files:
        pkgsrc/mail/opensmtpd-table-socketmap: Makefile distinfo
Added Files:
        pkgsrc/mail/opensmtpd-table-socketmap/patches: patch-table__socketmap.c

Log Message:
opensmtpd-table-socketmap: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/opensmtpd-table-socketmap/Makefile \
    pkgsrc/mail/opensmtpd-table-socketmap/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/opensmtpd-table-socketmap/patches/patch-table__socketmap.c

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

Modified files:

Index: pkgsrc/mail/opensmtpd-table-socketmap/Makefile
diff -u pkgsrc/mail/opensmtpd-table-socketmap/Makefile:1.1 pkgsrc/mail/opensmtpd-table-socketmap/Makefile:1.2
--- pkgsrc/mail/opensmtpd-table-socketmap/Makefile:1.1  Wed Dec  4 22:54:18 2024
+++ pkgsrc/mail/opensmtpd-table-socketmap/Makefile      Mon Mar 10 05:44:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/12/04 22:54:18 vins Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/10 05:44:52 vins Exp $
 
 DISTNAME=      table-socketmap-1.1.1
 PKGNAME=       ${DISTNAME:S|^|opensmtpd-|}
@@ -25,7 +25,9 @@ SUBST_MESSAGE.dir=    Fixing smtpdir for pk
 SUBST_FILES.dir=       Makefile.am
 SUBST_SED.dir+=                -e "s:libexec/smtpd:libexec/opensmtpd:g"
 
+LIBS.SunOS+=   -lsocket
+
 pre-configure:
-       set -e; cd ${WRKSRC} && autoreconf -fiv
+       ${RUN}set -e; cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/opensmtpd-table-socketmap/distinfo
diff -u pkgsrc/mail/opensmtpd-table-socketmap/distinfo:1.1 pkgsrc/mail/opensmtpd-table-socketmap/distinfo:1.2
--- pkgsrc/mail/opensmtpd-table-socketmap/distinfo:1.1  Wed Dec  4 22:54:18 2024
+++ pkgsrc/mail/opensmtpd-table-socketmap/distinfo      Mon Mar 10 05:44:52 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/12/04 22:54:18 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/03/10 05:44:52 vins Exp $
 
 BLAKE2s (table-socketmap-1.1.1.tar.gz) = 212cb2526bc1a2c9abb3c58bdfacbab6babb7a1045502583e4ee84e19bb86512
 SHA512 (table-socketmap-1.1.1.tar.gz) = acca3becfdd27a8dddccb9f1460ee5589e88415279ccc4ad9e577f185ea287fbb99e627f1e6de6e81e22c3b9c6892e7df2cc333a152c0502ac7ad80c0370e6ba
 Size (table-socketmap-1.1.1.tar.gz) = 17351 bytes
+SHA1 (patch-table__socketmap.c) = 593a0d0c0e6428ac4eae05ba1e7a6110384f419f

Added files:

Index: pkgsrc/mail/opensmtpd-table-socketmap/patches/patch-table__socketmap.c
diff -u /dev/null pkgsrc/mail/opensmtpd-table-socketmap/patches/patch-table__socketmap.c:1.1
--- /dev/null   Mon Mar 10 05:44:52 2025
+++ pkgsrc/mail/opensmtpd-table-socketmap/patches/patch-table__socketmap.c      Mon Mar 10 05:44:52 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-table__socketmap.c,v 1.1 2025/03/10 05:44:52 vins Exp $
+
+Rename local variables to avoid name clash on SunOS.
+
+--- table_socketmap.c.orig     2024-11-03 12:42:12.000000000 +0000
++++ table_socketmap.c
+@@ -53,22 +53,22 @@ enum socketmap_reply{
+ static int
+ table_socketmap_connect(const char *s)
+ {
+-      struct sockaddr_un      sun;
++      struct sockaddr_un      lsun;
+ 
+       if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+               log_warn("warn: socket");
+               goto err;
+       }
+ 
+-      memset(&sun, 0, sizeof sun);
+-      sun.sun_family = AF_UNIX;
+-      if (strlcpy(sun.sun_path, s, sizeof(sun.sun_path)) >=
+-          sizeof(sun.sun_path)) {
++      memset(&lsun, 0, sizeof lsun);
++      lsun.sun_family = AF_UNIX;
++      if (strlcpy(lsun.sun_path, s, sizeof(lsun.sun_path)) >=
++          sizeof(lsun.sun_path)) {
+               log_warnx("warn: socket path too long");
+               goto err;
+       }
+ 
+-      if (connect(sock, (struct sockaddr *)&sun, sizeof(sun)) == -1) {
++      if (connect(sock, (struct sockaddr *)&lsun, sizeof(lsun)) == -1) {
+               log_warn("warn: connect");
+               goto err;
+       }