Here is an update to dnsmasq 2.81.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/Makefile,v retrieving revision 1.53 diff -u -p -u -p -r1.53 Makefile --- Makefile 12 Jul 2019 20:48:25 -0000 1.53 +++ Makefile 12 Apr 2020 21:35:53 -0000 @@ -2,7 +2,7 @@ COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server -DISTNAME= dnsmasq-2.80 +DISTNAME= dnsmasq-2.81 CATEGORIES= net MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ EXTRACT_SUFX= .tar.xz Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/distinfo,v retrieving revision 1.35 diff -u -p -u -p -r1.35 distinfo --- distinfo 17 Jan 2019 10:14:33 -0000 1.35 +++ distinfo 12 Apr 2020 21:36:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.80.tar.xz) = zauieF6SZlzwkGRsum+UgSdgudfYyNDPsHrIGTd6Y7s= -SIZE (dnsmasq-2.80.tar.xz) = 501072 +SHA256 (dnsmasq-2.81.tar.xz) = dJypA1N8UZfCZESsJLDc4kLPQllf3+a5pbnkx60y+Ps= +SIZE (dnsmasq-2.81.tar.xz) = 510648 Index: patches/patch-dnsmasq_conf_example =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-dnsmasq_conf_example,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-dnsmasq_conf_example --- patches/patch-dnsmasq_conf_example 30 Apr 2012 06:02:51 -0000 1.2 +++ patches/patch-dnsmasq_conf_example 6 Mar 2020 01:53:30 -0000 @@ -1,6 +1,8 @@ $OpenBSD: patch-dnsmasq_conf_example,v 1.2 2012/04/30 06:02:51 ajacoutot Exp $ ---- dnsmasq.conf.example.orig Mon Apr 16 12:26:19 2012 -+++ dnsmasq.conf.example Mon Apr 16 20:42:36 2012 + +Index: dnsmasq.conf.example +--- dnsmasq.conf.example.orig ++++ dnsmasq.conf.example @@ -2,7 +2,7 @@ # # Format is one option per line, legal options are the same Index: patches/patch-man_dnsmasq_8 =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v retrieving revision 1.25 diff -u -p -u -p -r1.25 patch-man_dnsmasq_8 --- patches/patch-man_dnsmasq_8 17 Jan 2019 10:14:33 -0000 1.25 +++ patches/patch-man_dnsmasq_8 12 Apr 2020 21:36:12 -0000 @@ -1,4 +1,5 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.25 2019/01/17 10:14:33 jca Exp $ + Index: man/dnsmasq.8 --- man/dnsmasq.8.orig +++ man/dnsmasq.8 @@ -18,7 +19,7 @@ Index: man/dnsmasq.8 .TP .B \-v, --version Print the version number. -@@ -1944,7 +1943,7 @@ in the configuration file included. Secondly, the file +@@ -2006,7 +2005,7 @@ in the configuration file included. Secondly, the file therein is updated when dnsmasq receives SIGHUP. .SH CONFIG FILE At startup, dnsmasq reads @@ -27,7 +28,7 @@ Index: man/dnsmasq.8 if it exists. (On FreeBSD, the file is .I /usr/local/etc/dnsmasq.conf -@@ -2397,7 +2396,7 @@ dnsmasq has no direct way of determining the charset i +@@ -2457,7 +2456,7 @@ dnsmasq has no direct way of determining the charset i assume that it is the system default. .SH FILES Index: patches/patch-src_config_h =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_config_h,v retrieving revision 1.21 diff -u -p -u -p -r1.21 patch-src_config_h --- patches/patch-src_config_h 17 Jan 2019 10:14:33 -0000 1.21 +++ patches/patch-src_config_h 5 Apr 2020 04:34:33 -0000 @@ -1,4 +1,5 @@ $OpenBSD: patch-src_config_h,v 1.21 2019/01/17 10:14:33 jca Exp $ + Index: src/config.h --- src/config.h.orig +++ src/config.h Index: patches/patch-src_forward_c =================================================================== RCS file: patches/patch-src_forward_c diff -N patches/patch-src_forward_c --- patches/patch-src_forward_c 17 Jan 2019 10:14:33 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,52 +0,0 @@ -$OpenBSD: patch-src_forward_c,v 1.2 2019/01/17 10:14:33 jca Exp $ - -Don't mix up msg_controllen and cmsg_len. -Don't ignore EINVAL unless on Linux. - -Index: src/forward.c ---- src/forward.c.orig -+++ src/forward.c -@@ -68,12 +68,14 @@ int send_from(int fd, int nowild, char *packet, size_t - p.ipi_ifindex = 0; - p.ipi_spec_dst = source->addr.addr4; - memcpy(CMSG_DATA(cmptr), &p, sizeof(p)); -- msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); -+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo)); -+ cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); - cmptr->cmsg_level = IPPROTO_IP; - cmptr->cmsg_type = IP_PKTINFO; - #elif defined(IP_SENDSRCADDR) - memcpy(CMSG_DATA(cmptr), &(source->addr.addr4), sizeof(source->addr.addr4)); -- msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_addr)); -+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_addr)); -+ cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_addr)); - cmptr->cmsg_level = IPPROTO_IP; - cmptr->cmsg_type = IP_SENDSRCADDR; - #endif -@@ -85,7 +87,8 @@ int send_from(int fd, int nowild, char *packet, size_t - p.ipi6_ifindex = iface; /* Need iface for IPv6 to handle link-local addrs */ - p.ipi6_addr = source->addr.addr6; - memcpy(CMSG_DATA(cmptr), &p, sizeof(p)); -- msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo)); -+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo)); -+ cmptr->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo)); - cmptr->cmsg_type = daemon->v6pktinfo; - cmptr->cmsg_level = IPPROTO_IPV6; - } -@@ -96,10 +99,13 @@ int send_from(int fd, int nowild, char *packet, size_t - - while (retry_send(sendmsg(fd, &msg, 0))); - -- /* If interface is still in DAD, EINVAL results - ignore that. */ -- if (errno != 0 && errno != EINVAL) -+ if (errno != 0) - { -- my_syslog(LOG_ERR, _("failed to send packet: %s"), strerror(errno)); -+#ifdef __linux__ -+ /* If interface is still in DAD, EINVAL results - ignore that. */ -+ if (errno != EINVAL) -+#endif -+ my_syslog(LOG_ERR, _("failed to send packet: %s"), strerror(errno)); - return 0; - } - Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- pkg/PLIST 30 Apr 2012 06:02:51 -0000 1.5 +++ pkg/PLIST 8 Mar 2020 22:20:49 -0000 @@ -1,9 +1,9 @@ @comment $OpenBSD: PLIST,v 1.5 2012/04/30 06:02:51 ajacoutot Exp $ @newgroup _dnsmasq:631 @newuser _dnsmasq:631:_dnsmasq:daemon:dnsmasq Account:/nonexistent:/sbin/nologin +@rcscript ${RCDIR}/dnsmasq @man man/man8/dnsmasq.8 @bin sbin/dnsmasq share/examples/dnsmasq/ share/examples/dnsmasq/dnsmasq.conf.example @sample ${SYSCONFDIR}/dnsmasq.conf -@rcscript ${RCDIR}/dnsmasq
