CVS commit: pkgsrc/net/dnsmasq

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 26 13:23:31 UTC 2022

Modified Files:
        pkgsrc/net/dnsmasq: Makefile distinfo
        pkgsrc/net/dnsmasq/patches: patch-src_dump.c

Log Message:
dnsmasq: updated to 2.87

version 2.87

Allow arbitrary prefix lengths in --rev-server and
--domain=....,local

Replace --address=/#/..... functionality which got
missed in the 2.86 domain search rewrite.

Add --nftset option, like --ipset but for the newer nftables.
Thanks to Chen Zhenge for the patch.

Add --filter-A and --filter-AAAA options, to remove IPv4 or IPv6
addresses from DNS answers.

Fix crash doing netbooting when --port is set to zero
to disable the DNS server. Thanks to Drexl Johannes
for the bug report.

Generalise --dhcp-relay. Sending via broadcast/multicast is
now supported for both IPv4 and IPv6 and the configuration
syntax made easier (but backwards compatible).

Add snooping of IPv6 prefix-delegations to the DHCP-relay system.

Finesse parsing of --dhcp-remoteid and --dhcp-subscrid. To be treated
as hex, the pattern must consist of only hex digits AND contain
at least one ':'. Thanks to Bengt-Erik Sandstrom who tripped
over a pattern consisting of a decimal number which was interpreted
surprisingly.

Include client address in TFTP file-not-found error reports.
Thanks to Stefan Rink for the initial patch, which has been
re-worked by me (srk). All bugs mine.

Note in manpage the change in behaviour of -address. This behaviour
actually changed in v2.86, but was undocumented there. From 2.86 on,
(eg) --address=/example.com/1.2.3.4 ONLY applies to A queries. All other
types of query will be sent upstream. Pre 2.86, that would catch the
whole example.com domain and queries for other types would get
a local NODATA answer. The pre-2.86 behaviour is still available,
by configuring --address=/example.com/1.2.3.4 --local=/example.com/

Fix problem with binding DHCP sockets to an individual interface.
Despite the fact that the system call tales the interface _name_ as
a parameter, it actually, binds the socket to interface _index_.
Deleting the interface and creating a new one with the same name
leaves the socket bound to the old index. (Creating new sockets
always allocates a fresh index, they are not reused). We now
take this behaviour into account and keep up with changing indexes.

Add --conf-script configuration option.

Enhance --domain to accept, for instance,
--domain=net2.thekelleys.org.uk,eth2 so that hosts get a domain
which relects the interface they are attached to in a way which
doesn't require hard-coding addresses. Thanks to Sten Spans for
the idea.

Fix write-after-free error in DHCPv6 server code.
CVE-2022-0934 refers.

Add the ability to specify destination port in
DHCP-relay mode. This change also removes a previous bug
where --dhcp-alternate-port would affect the port used
to relay _to_ as well as the port being listened on.
The new feature allows configuration to provide bug-for-bug
compatibility, if required. Thanks to Damian Kaczkowski
for the feature suggestion.

Bound the value of UDP packet size in the EDNS0 header of
forwarded queries to the configured or default value of
edns-packet-max. There's no point letting a client set a larger
value if we're unable to return the answer. Thanks to Bertie
Taylor for pointing out the problem and supplying the patch.

Fix problem with the configuration

--server=/some.domain/# --address=/#/<ip> --server=<server_ip>

This would return <ip> for queries in some.domain, rather than
forwarding the query via the default server.

Tweak DHCPv6 relay code so that packets relayed towards a server
have source address on the server-facing network, not the
client facing network. Thanks to Luis Thomas for spotting this
and initial patch.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/dnsmasq/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/dnsmasq/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/dnsmasq/patches/patch-src_dump.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/dnsmasq/Makefile
diff -u pkgsrc/net/dnsmasq/Makefile:1.46 pkgsrc/net/dnsmasq/Makefile:1.47
--- pkgsrc/net/dnsmasq/Makefile:1.46    Fri Sep 17 21:04:39 2021
+++ pkgsrc/net/dnsmasq/Makefile Mon Sep 26 13:23:31 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2021/09/17 21:04:39 adam Exp $
+# $NetBSD: Makefile,v 1.47 2022/09/26 13:23:31 adam Exp $
 
-DISTNAME=      dnsmasq-2.86
+DISTNAME=      dnsmasq-2.87
 CATEGORIES=    net
 MASTER_SITES=  https://thekelleys.org.uk/dnsmasq/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/dnsmasq/distinfo
diff -u pkgsrc/net/dnsmasq/distinfo:1.44 pkgsrc/net/dnsmasq/distinfo:1.45
--- pkgsrc/net/dnsmasq/distinfo:1.44    Tue Oct 26 11:05:32 2021
+++ pkgsrc/net/dnsmasq/distinfo Mon Sep 26 13:23:31 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.44 2021/10/26 11:05:32 nia Exp $
+$NetBSD: distinfo,v 1.45 2022/09/26 13:23:31 adam Exp $
 
-BLAKE2s (dnsmasq-2.86.tar.xz) = 4e52808921e5c32f62e4403284ffc819a41ae4680c98ae7332906ed82e1a5729
-SHA512 (dnsmasq-2.86.tar.xz) = 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf
-Size (dnsmasq-2.86.tar.xz) = 531404 bytes
+BLAKE2s (dnsmasq-2.87.tar.xz) = 20a1849169855222e1da8b140f9002cb5b67973d5cc0fa8d99589f649190b817
+SHA512 (dnsmasq-2.87.tar.xz) = 965071ff35aed558a661e7f57ff82de170f4ad7fcdd6a4070ce7915c9f5e41450d8d86b2a0c2c30bf52ddc3aaeb22af18bb6da71a1cccb3c409429ef0ef308f3
+Size (dnsmasq-2.87.tar.xz) = 540528 bytes
 SHA1 (patch-src_bpf.c) = 4115a5391f57564663bbfc448fbb865c370318a6
-SHA1 (patch-src_dump.c) = 3e7553e8ed2444536ba94187f7a100a9abdbb353
+SHA1 (patch-src_dump.c) = e5788d9e3112b1e5b2ef7ce500b0262b95c375c6

Index: pkgsrc/net/dnsmasq/patches/patch-src_dump.c
diff -u pkgsrc/net/dnsmasq/patches/patch-src_dump.c:1.1 pkgsrc/net/dnsmasq/patches/patch-src_dump.c:1.2
--- pkgsrc/net/dnsmasq/patches/patch-src_dump.c:1.1     Tue Oct 30 11:16:06 2018
+++ pkgsrc/net/dnsmasq/patches/patch-src_dump.c Mon Sep 26 13:23:31 2022
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_dump.c,v 1.1 2018/10/30 11:16:06 jperkin Exp $
+$NetBSD: patch-src_dump.c,v 1.2 2022/09/26 13:23:31 adam Exp $
 
 Add IPDEFTTL compat.
 
---- src/dump.c.orig    2018-10-18 18:21:55.000000000 +0000
+--- src/dump.c.orig    2022-09-09 11:53:49.000000000 +0000
 +++ src/dump.c
-@@ -148,6 +148,9 @@ void dump_packet(int mask, void *packet,
+@@ -195,6 +195,9 @@ static void do_dump_packet(int mask, voi
+       
        ip.ip_v = IPVERSION;
        ip.ip_hl = sizeof(struct ip) / 4;
-       ip.ip_len = htons(sizeof(struct ip) + sizeof(struct udphdr) + len); 
 +#ifndef IPDEFTTL
-+#define IPDEFTTL      64
++#define IPDEFTTL 64
 +#endif
        ip.ip_ttl = IPDEFTTL;
-       ip.ip_p = IPPROTO_UDP;
-       
+ 
+       if ((ip.ip_p = proto) == IPPROTO_UDP)