CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 30 20:39:59 UTC 2025

Modified Files:
        pkgsrc/mail/qmail: distinfo
Added Files:
        pkgsrc/mail/qmail/patches: patch-dns.c

Log Message:
qmail: fix macOS build by not shadowing system resolver's getshort().


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/qmail/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-dns.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/qmail/distinfo
diff -u pkgsrc/mail/qmail/distinfo:1.51 pkgsrc/mail/qmail/distinfo:1.52
--- pkgsrc/mail/qmail/distinfo:1.51     Sat Apr 27 19:34:26 2024
+++ pkgsrc/mail/qmail/distinfo  Mon Jun 30 20:39:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2024/04/27 19:34:26 schmonz Exp $
+$NetBSD: distinfo,v 1.52 2025/06/30 20:39:59 schmonz Exp $
 
 BLAKE2s (netqmail-1.05-TAI-leapsecs.patch) = 9904388c38820c4866fe9b57cddbc0a8d4c12655e903da1b1701142c31454fe2
 SHA512 (netqmail-1.05-TAI-leapsecs.patch) = 2278139b825330a418171ad6dd4667410819591d3828f8b40dda789e1aafe1cefcc638fdc6d9de21a8c0ca6caffb41fbbb44bab2dd80f570e81c6e900c8596f7
@@ -30,3 +30,4 @@ Size (qmail-queue-custom-error-v2.netqma
 BLAKE2s (qmail-spp-0.42.tar.gz) = 42d05876e0ce5423cdc343c16970fa554a91c094e21b7150f5c6d49399eea99c
 SHA512 (qmail-spp-0.42.tar.gz) = 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 Size (qmail-spp-0.42.tar.gz) = 18689 bytes
+SHA1 (patch-dns.c) = f13f1b3dc778c836035c6edf8ebb3bf0b79c6113

Added files:

Index: pkgsrc/mail/qmail/patches/patch-dns.c
diff -u /dev/null pkgsrc/mail/qmail/patches/patch-dns.c:1.1
--- /dev/null   Mon Jun 30 20:39:59 2025
+++ pkgsrc/mail/qmail/patches/patch-dns.c       Mon Jun 30 20:39:58 2025
@@ -0,0 +1,48 @@
+$NetBSD: patch-dns.c,v 1.1 2025/06/30 20:39:58 schmonz Exp $
+
+Avoid shadowing system resolver's getshort(). Fixes macOS build.
+
+--- dns.c.orig 2025-06-30 20:27:36.398753160 +0000
++++ dns.c
+@@ -19,7 +19,7 @@ extern int res_search();
+ #include "dns.h"
+ #include "case.h"
+ 
+-static unsigned short getshort(c) unsigned char *c;
++static unsigned short nqgetshort(c) unsigned char *c;
+ { unsigned short u; u = c[0]; return (u << 8) + c[1]; }
+ 
+ static struct { unsigned char *buf; } response;
+@@ -106,8 +106,8 @@ int wanttype;
+  i = responseend - responsepos;
+  if (i < 4 + 3 * 2) return DNS_SOFT;
+    
+- rrtype = getshort(responsepos);
+- rrdlen = getshort(responsepos + 8);
++ rrtype = nqgetshort(responsepos);
++ rrdlen = nqgetshort(responsepos + 8);
+  responsepos += 10;
+ 
+  if (rrtype == wanttype)
+@@ -140,8 +140,8 @@ int wanttype;
+  i = responseend - responsepos;
+  if (i < 4 + 3 * 2) return DNS_SOFT;
+    
+- rrtype = getshort(responsepos);
+- rrdlen = getshort(responsepos + 8);
++ rrtype = nqgetshort(responsepos);
++ rrdlen = nqgetshort(responsepos + 8);
+  responsepos += 10;
+ 
+  if (rrtype == wanttype)
+@@ -178,8 +178,8 @@ int wanttype;
+  i = responseend - responsepos;
+  if (i < 4 + 3 * 2) return DNS_SOFT;
+    
+- rrtype = getshort(responsepos);
+- rrdlen = getshort(responsepos + 8);
++ rrtype = nqgetshort(responsepos);
++ rrdlen = nqgetshort(responsepos + 8);
+  responsepos += 10;
+ 
+  if (rrtype == wanttype)