head 1.10; access; symbols pkgsrc-2024Q3:1.9.0.84 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.82 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.80 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.78 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.76 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.74 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.72 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.70 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.68 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.66 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.64 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.62 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.60 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.58 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.56 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.54 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.52 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.48 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.28 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.50 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.46 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.44 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.42 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.40 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.38 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.36 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.34 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.32 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.30 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.26 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.24 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.22 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.20 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.18 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.16 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.14 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.12 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.10 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.8 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.6 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.4 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.2 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.8.0.26 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.24 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.22 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.20 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.18 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.16 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.14 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.12 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.10 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.8 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.6 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.4 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.2 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.7.0.4 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.2 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.5.0.36 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.34 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.32 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.30 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.28 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.26 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.24 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.22 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.20 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.18 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.16 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4; locks; strict; comment @# @; 1.10 date 2024.11.20.17.56.21; author hauke; state dead; branches; next 1.9; commitid UwmVVWasHAuzypyF; 1.9 date 2014.05.12.15.06.56; author ryoon; state Exp; branches; next 1.8; commitid qkY4VYpMtLs6egAx; 1.8 date 2011.01.12.08.53.52; author adam; state Exp; branches; next 1.7; 1.7 date 2010.07.14.09.29.04; author sbd; state Exp; branches; next 1.6; 1.6 date 2010.07.01.15.05.06; author tez; state Exp; branches; next 1.5; 1.5 date 2006.07.11.14.39.29; author drochner; state Exp; branches 1.5.36.1; next 1.4; 1.4 date 2006.03.03.22.30.56; author wiz; state dead; branches; next 1.3; 1.3 date 2006.02.04.21.02.31; author markd; state Exp; branches; next 1.2; 1.2 date 2006.01.15.01.46.55; author wiz; state dead; branches; next 1.1; 1.1 date 2006.01.06.17.39.17; author wiz; state Exp; branches; next ; 1.5.36.1 date 2010.07.04.07.23.33; author agc; state Exp; branches; next ; desc @@ 1.10 log @Upgrade net/mDNSResponder to v2559.1.1 Upstream's github repository mainly has patch bombs from Apple's internal tree, so no changelog. There is an rc.d script now, and mdnsd will change to a configurable unprivileged user. @ text @$NetBSD: patch-ab,v 1.9 2014/05/12 15:06:56 ryoon Exp $ 1) From http://lists.apple.com/archives/bonjour-dev/2007/Jan/msg00003.html 2) add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 -enable ipv6 -fix some RFC2292 vs 3542 confusion which made the former fail -on NetBSD, build a HINFO record from hw.model and kern.osrelease --- mDNSPosix/mDNSPosix.c.orig 2010-05-20 22:35:08.000000000 +0000 +++ mDNSPosix/mDNSPosix.c @@@@ -256,7 +256,7 @@@@ mDNSlocal void SocketDataReady(mDNS *con // so all we can do is just assume it's a multicast #if HAVE_BROKEN_RECVDSTADDR || (!defined(IP_PKTINFO) && !defined(IP_RECVDSTADDR)) - if ((destAddr.NotAnInteger == 0) && (flags & MSG_MCAST)) + if ((destAddr.ip.v4.NotAnInteger == 0) && (flags & MSG_MCAST)) { destAddr.type = senderAddr.type; if (senderAddr.type == mDNSAddrType_IPv4) destAddr.ip.v4 = AllDNSLinkGroup_v4.ip.v4; @@@@ -467,7 +467,7 @@@@ mDNSexport int ParseDNSServers(mDNS *m, { char line[256]; char nameserver[16]; - char keyword[10]; + char keyword[11]; int numOfServers = 0; FILE *fp = fopen(filePath, "r"); if (fp == NULL) return -1; @@@@ -486,6 +486,7 @@@@ mDNSexport int ParseDNSServers(mDNS *m, numOfServers++; } } + fclose(fp); return (numOfServers > 0) ? 0 : -1; } @@@@ -690,7 +691,13 @@@@ mDNSlocal int SetupSocket(struct sockadd { struct ipv6_mreq imr6; struct sockaddr_in6 bindAddr6; - #if defined(IPV6_PKTINFO) + #if defined(IPV6_RECVPKTINFO) + if (err == 0) + { + err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn)); + if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); } + } +#elif defined(IPV6_PKTINFO) if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn)); @@@@ -699,7 +706,13 @@@@ mDNSlocal int SetupSocket(struct sockadd #else #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts #endif - #if defined(IPV6_HOPLIMIT) + #if defined(IPV6_RECVHOPLIMIT) + if (err == 0) + { + err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn)); + if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); } + } + #elif defined(IPV6_HOPLIMIT) if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn)); @@@@ -1181,6 +1194,36 @@@@ mDNSlocal mDNSBool mDNSPlatformInit_CanR return(err == 0); } +#ifdef __NetBSD__ +#include +#include + +void +initmachinedescr(mDNS *const m) +{ + char hwbuf[256], swbuf[256]; + size_t hwlen, swlen; + const int hwmib[] = { CTL_HW, HW_MODEL }; + const int swmib[] = { CTL_KERN, KERN_OSRELEASE }; + const char netbsd[] = "NetBSD "; + + hwlen = sizeof(hwbuf); + swlen = sizeof(swbuf); + if (sysctl(hwmib, 2, hwbuf, &hwlen, 0, 0) || + sysctl(swmib, 2, swbuf, &swlen, 0, 0)) + return; + + if (hwlen + swlen + sizeof(netbsd) >=254) + return; + + m->HIHardware.c[0] = hwlen - 1; + m->HISoftware.c[0] = swlen + sizeof(netbsd) - 2; + memcpy(&m->HIHardware.c[1], hwbuf, hwlen - 1); + memcpy(&m->HISoftware.c[1], netbsd, sizeof(netbsd) - 1); + memcpy(&m->HISoftware.c[1 + sizeof(netbsd) - 1], swbuf, swlen - 1); +} +#endif + // mDNS core calls this routine to initialise the platform-specific data. mDNSexport mStatus mDNSPlatformInit(mDNS *const m) { @@@@ -1202,6 +1245,10 @@@@ mDNSexport mStatus mDNSPlatformInit(mDNS GetUserSpecifiedRFC1034ComputerName(&m->hostlabel); if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer"); +#ifdef __NetBSD__ + initmachinedescr(m); +#endif + mDNS_SetFQDN(m); sa.sa_family = AF_INET; @ 1.9 log @Fix build under OpenBSD/amd64 5.5 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2011/01/12 08:53:52 adam Exp $ @ 1.8 log @Changes 258.14: This is the version supplied with Mac OS X 10.6.6. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2010/07/14 09:29:04 sbd Exp $ d3 3 a5 1 1) add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 d13 9 @ 1.7 log @Update to mDNSResponder-214.3.2 Changes unknown. Also install dns-sd and manpages. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2010/07/01 15:05:06 tez Exp $ d9 1 a9 1 --- mDNSPosix/mDNSPosix.c.orig 2009-01-25 03:16:46.000000000 +0000 d11 1 a11 1 @@@@ -581,7 +581,7 @@@@ mDNSexport int ParseDNSServers(mDNS *m, d20 1 a20 1 @@@@ -600,6 +600,7 @@@@ mDNSexport int ParseDNSServers(mDNS *m, d28 1 a28 1 @@@@ -802,7 +803,13 @@@@ mDNSlocal int SetupSocket(struct sockadd d43 1 a43 1 @@@@ -811,7 +818,13 @@@@ mDNSlocal int SetupSocket(struct sockadd d58 1 a58 1 @@@@ -1293,6 +1306,36 @@@@ mDNSlocal mDNSBool mDNSPlatformInit_CanR d95 1 a95 1 @@@@ -1314,6 +1357,10 @@@@ mDNSexport mStatus mDNSPlatformInit(mDNS @ 1.6 log @fix off-by-one error parsing resolv.conf fix fd leak @ text @d1 1 a1 2 $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 d3 9 a11 3 --- mDNSPosix/mDNSPosix.c.orig 2006-02-20 15:40:36.000000000 -0600 +++ mDNSPosix/mDNSPosix.c 2010-06-30 17:57:01.575378400 -0500 @@@@ -633,7 +633,7 @@@@ d20 1 a20 1 @@@@ -652,6 +652,7 @@@@ d28 1 a28 1 @@@@ -852,7 +853,13 @@@@ d43 1 a43 1 @@@@ -861,7 +868,13 @@@@ d58 1 a58 1 @@@@ -1339,6 +1352,36 @@@@ d95 1 a95 1 @@@@ -1360,6 +1403,10 @@@@ @ 1.5 log @-enable ipv6 -fix some RFC2292 vs 3542 confusion which made the former fail -on NetBSD, build a HINFO record from hw.model and kern.osrelease -bump PKGREVISION @ text @d1 2 a2 1 $NetBSD$ d4 20 a23 3 --- mDNSPosix/mDNSPosix.c.orig 2006-02-20 22:40:36.000000000 +0100 +++ mDNSPosix/mDNSPosix.c @@@@ -852,7 +852,13 @@@@ mDNSlocal int SetupSocket(struct sockadd d38 1 a38 1 @@@@ -861,7 +867,13 @@@@ mDNSlocal int SetupSocket(struct sockadd d53 1 a53 1 @@@@ -1339,6 +1351,36 @@@@ mDNSlocal mDNSBool mDNSPlatformInit_CanR d90 1 a90 1 @@@@ -1360,6 +1402,10 @@@@ mDNSexport mStatus mDNSPlatformInit(mDNS @ 1.5.36.1 log @Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching error, and to sync with reality. @ text @d1 1 a1 2 $NetBSD: patch-ab,v 1.6 2010/07/01 15:05:06 tez Exp $ add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 d3 3 a5 20 --- mDNSPosix/mDNSPosix.c.orig 2006-02-20 15:40:36.000000000 -0600 +++ mDNSPosix/mDNSPosix.c 2010-06-30 17:57:01.575378400 -0500 @@@@ -633,7 +633,7 @@@@ { char line[256]; char nameserver[16]; - char keyword[10]; + char keyword[11]; int numOfServers = 0; FILE *fp = fopen(filePath, "r"); if (fp == NULL) return -1; @@@@ -652,6 +652,7 @@@@ numOfServers++; } } + fclose(fp); return (numOfServers > 0) ? 0 : -1; } @@@@ -852,7 +853,13 @@@@ d20 1 a20 1 @@@@ -861,7 +868,13 @@@@ d35 1 a35 1 @@@@ -1339,6 +1352,36 @@@@ d72 1 a72 1 @@@@ -1360,6 +1403,10 @@@@ @ 1.4 log @Update to 108: Changes unknown. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2006/02/04 21:02:31 markd Exp $ d3 35 a37 9 --- Clients/Makefile.orig 2006-02-03 23:36:07.253466000 +1300 +++ Clients/Makefile @@@@ -56,7 +56,7 @@@@ ifneq "$(wildcard /usr/lib/libSystem.dylib)" "" LIBS = else -LIBS = -L../mDNSPosix/build/prod/ -ldns_sd +LIBS = -L../mDNSPosix/build/prod/ -ldns_sd $(SYSTEMLIBS) endif d39 44 a82 1 targets: build/dns-sd @ 1.3 log @Fix build on Solaris. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to 107.5, changes unknown. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2006/01/06 17:39:17 wiz Exp $ d3 9 a11 17 --- mDNSPosix/PosixDaemon.c.orig 2005-02-04 00:39:59.000000000 +0000 +++ mDNSPosix/PosixDaemon.c @@@@ -143,14 +143,14 @@@@ extern const char mDNSResponderVersionSt static void Reconfigure(mDNS *m) { mDNSAddr DynDNSIP; - mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL); + mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL); mDNS_DeleteDNSServers(m); if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0) LogMsg("Unable to parse DNS server list. Unicast DNS-SD unavailable"); ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, &DynDNSHostname, &DynDNSZone, NULL); FindDefaultRouteIP(&DynDNSIP); if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, &DynDNSHostname, NULL, NULL); - if (DynDNSIP.type) mDNS_SetPrimaryInterfaceInfo(m, &DynDNSIP, NULL); + if (DynDNSIP.type) mDNS_SetPrimaryInterfaceInfo(m, &DynDNSIP, NULL, NULL); } d13 1 a13 1 // Do appropriate things at startup with command line arguments. Calls exit() if unhappy. @ 1.1 log @Update to 107.3. Changes unknown. @ text @d1 1 a1 1 $NetBSD$ @