CVS commit: pkgsrc/net/mDNSResponder

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Feb 12 11:41:44 UTC 2025

Modified Files:
        pkgsrc/net/mDNSResponder: Makefile distinfo
        pkgsrc/net/mDNSResponder/patches: patch-mDNSPosix_mDNSPosix.c

Log Message:
net/mDNSResponder: Build fix for (disabled) option "inet6"

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/mDNSResponder/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/mDNSResponder/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.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/mDNSResponder/Makefile
diff -u pkgsrc/net/mDNSResponder/Makefile:1.48 pkgsrc/net/mDNSResponder/Makefile:1.49
--- pkgsrc/net/mDNSResponder/Makefile:1.48      Mon Nov 25 21:33:23 2024
+++ pkgsrc/net/mDNSResponder/Makefile   Wed Feb 12 11:41:44 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2024/11/25 21:33:23 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2025/02/12 11:41:44 micha Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVER}
+PKGREVISION=   1
 GITHUB_PROJECT=        mDNSResponder
 PKGVER=                2559.1.1
 GITHUB_TAG=    refs/tags/${GITHUB_PROJECT}-${PKGVER}

Index: pkgsrc/net/mDNSResponder/distinfo
diff -u pkgsrc/net/mDNSResponder/distinfo:1.43 pkgsrc/net/mDNSResponder/distinfo:1.44
--- pkgsrc/net/mDNSResponder/distinfo:1.43      Thu Nov 28 10:03:32 2024
+++ pkgsrc/net/mDNSResponder/distinfo   Wed Feb 12 11:41:44 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2024/11/28 10:03:32 jperkin Exp $
+$NetBSD: distinfo,v 1.44 2025/02/12 11:41:44 micha Exp $
 
 BLAKE2s (mDNSResponder-2559.1.1.tar.gz) = e72fbea9df78d0cf811e1af6d08483973487210594e165b7b075f0b32f595d97
 SHA512 (mDNSResponder-2559.1.1.tar.gz) = 1112d78e3a46115ffdae4849d847a6cfe1052d6e4a6af3afa6058eb900ac7f7c8fee20874b479ff3d40af2da95a371241f2c821a193f148f844bf9efc06fcc79
@@ -6,7 +6,7 @@ Size (mDNSResponder-2559.1.1.tar.gz) = 3
 SHA1 (patch-Clients_Makefile) = 7b3d6da98f8d8bdf1f3b11feafc68aa514e37d7e
 SHA1 (patch-DSO_dso.c) = 12139edda92d9cab01e4acaf707812a1d337124d
 SHA1 (patch-mDNSPosix_Makefile) = 3e91025e5e878d0f2552d3f82839db31c67b31d7
-SHA1 (patch-mDNSPosix_mDNSPosix.c) = bfefa8d1252d0ba9afdf6506dd6686492dd1f10b
+SHA1 (patch-mDNSPosix_mDNSPosix.c) = 1e98da5ca488eb07afe51809309d62da587340eb
 SHA1 (patch-mDNSPosix_mDNSUNP.c) = a900ad9991aaee21fbe9094a65900b1d172c2abc
 SHA1 (patch-mDNSShared_CommonServices.h) = b67ab3e9821cb30406ff5cfb1a394c5b18bb0009
 SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a

Index: pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.c
diff -u pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.c:1.1 pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.c:1.2
--- pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.c:1.1    Wed Nov 20 17:56:21 2024
+++ pkgsrc/net/mDNSResponder/patches/patch-mDNSPosix_mDNSPosix.c        Wed Feb 12 11:41:44 2025
@@ -1,11 +1,14 @@
-$NetBSD: patch-mDNSPosix_mDNSPosix.c,v 1.1 2024/11/20 17:56:21 hauke Exp $
+$NetBSD: patch-mDNSPosix_mDNSPosix.c,v 1.2 2025/02/12 11:41:44 micha Exp $
 
  - OpenBSD fix from
 https://web.archive.org/web/20140115063128/http://lists.apple.com/archives/bonjour-dev/2007/Jan/msg00003.html
 
  - NetBSD HINFO record from hw.model and kern.osrelease
 
---- mDNSPosix/mDNSPosix.c.orig 2024-11-20 15:54:56.086626755 +0000
+ - pkgsrc fix for (disabled) option "inet6"
+error: 'IPV6_2292_PKTINFO' undeclared
+
+--- mDNSPosix/mDNSPosix.c.orig 2024-09-24 20:38:46.000000000 +0000
 +++ mDNSPosix/mDNSPosix.c
 @@ -453,7 +453,7 @@ mDNSlocal void SocketDataReady(mDNS *con
          // so all we can do is just assume it's a multicast
@@ -16,7 +19,28 @@ https://web.archive.org/web/201401150631
          {
              destAddr.type = senderAddr.type;
              if      (senderAddr.type == mDNSAddrType_IPv4) destAddr.ip.v4 = AllDNSLinkGroup_v4.ip.v4;
-@@ -1849,6 +1855,37 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR
+@@ -1096,12 +1096,20 @@ mDNSlocal int SetupIPv6Socket(int fd)
+ {
+     int err;
+ 
++#if HAVE_IPV6
+     #if defined(IPV6_PKTINFO)
+     err = setsockopt(fd, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn));
+     if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); }
+     #else
+         #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
+     #endif
++#else  // HAVE_IPV6
++    (void)fd;
++
++    // pkgsrc: Added for (disabled) option "inet6"
++    errno = ENOPROTOOPT;
++    err = errno; perror("setsockopt - IPV6_PKTINFO");
++#endif  // HAVE_IPV6
+     return err;
+ }
+ 
+@@ -1849,6 +1857,37 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR
      return(err == 0);
  }
  
@@ -54,7 +78,7 @@ https://web.archive.org/web/201401150631
  // mDNS core calls this routine to initialise the platform-specific data.
  mDNSexport mStatus mDNSPlatformInit(mDNS *const m)
  {
-@@ -1870,6 +1907,10 @@ mDNSexport mStatus mDNSPlatformInit(mDNS
+@@ -1870,6 +1909,10 @@ mDNSexport mStatus mDNSPlatformInit(mDNS
      GetUserSpecifiedRFC1034ComputerName(&m->hostlabel);
      if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer");