CVS commit: pkgsrc/net/dnsmasq

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 12 10:06:45 UTC 2021

Modified Files:
        pkgsrc/net/dnsmasq: Makefile distinfo

Log Message:
dnsmasq: updated to 2.85

version 2.85

Fix problem with DNS retries in 2.83/2.84.
The new logic in 2.83/2.84 which merges distinct requests
for the same domain causes problems with clients which do
retries as distinct requests (differing IDs and/or source ports.)
The retries just get piggy-backed on the first, failed, request.
The logic is now changed so that distinct requests for repeated
queries still get merged into a single ID/source port, but
they now always trigger a re-try upstream.
Thanks to Nicholas Mu for his analysis.

Tweak sort order of tags in get-version. v2.84 sorts
before v2.83, but v2.83 sorts before v2.83rc1 and 2.83rc1
sorts before v2.83test1. This fixes the problem which lead
to 2.84 announcing itself as 2.84rc2.

Avoid treating a --dhcp-host which has an IPv6 address
as eligible for use with DHCPv4 on the grounds that it has
no address, and vice-versa. Thanks to Viktor Papp for
spotting the problem. (This bug was fixed was back in 2.67, and
then regressed in 2.81).

Add --dynamic-host option: A and AAAA records which take their
network part from the network of a local interface. Useful
for routers with dynamically prefixes. Thanks
to Fred F for the suggestion.

Teach --bogus-nxdomain and --ignore-address to take an IPv4 subnet.

Use random source ports where possible if source
addresses/interfaces in use.
CVE-2021-3448 applies. Thanks to Petr Menšík for spotting this.
It's possible to specify the source address or interface to be
used when contacting upstream name servers: server=8.8.8.8@1.2.3.4
or server=8.8.8.8@1.2.3.4#66 or server=8.8.8.8@eth0, and all of
these have, until now, used a single socket, bound to a fixed
port. This was originally done to allow an error (non-existent
interface, or non-local address) to be detected at start-up. This
means that any upstream servers specified in such a way don't use
random source ports, and are more susceptible to cache-poisoning
attacks.
We now use random ports where possible, even when the
source is specified, so server=8.8.8.8@1.2.3.4 or
server=8.8.8.8@eth0 will use random source
ports. server=8.8.8.8@1.2.3.4#66 or any use of --query-port will
use the explicitly configured port, and should only be done with
understanding of the security implications.
Note that this change changes non-existing interface, or non-local
source address errors from fatal to run-time. The error will be
logged and communication with the server not possible.

Change the method of allocation of random source ports for DNS.
Previously, without min-port or max-port configured, dnsmasq would
default to the compiled in defaults for those, which are 1024 and
65535. Now, when neither are configured, it defaults instead to
the kernel's ephemeral port range, which is typically
32768 to 60999 on Linux systems. This change eliminates the
possibility that dnsmasq may be using a registered port > 1024
when a long-running daemon starts up and wishes to claim it.
This change does likely slightly reduce the number of random ports
and therefore the protection from reply spoofing. The older
behaviour can be restored using the min-port and max-port config
switches should that be a concern.

Scale the size of the DNS random-port pool based on the
value of the --dns-forward-max configuration.

Tweak TFTP code to check sender of all received packets, as
specified in RFC 1350 para 4.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/dnsmasq/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/dnsmasq/distinfo

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.44 pkgsrc/net/dnsmasq/Makefile:1.45
--- pkgsrc/net/dnsmasq/Makefile:1.44    Fri Feb  5 20:04:43 2021
+++ pkgsrc/net/dnsmasq/Makefile Mon Apr 12 10:06:45 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2021/02/05 20:04:43 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/12 10:06:45 adam Exp $
 
-DISTNAME=      dnsmasq-2.84
+DISTNAME=      dnsmasq-2.85
 CATEGORIES=    net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  https://thekelleys.org.uk/dnsmasq/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.thekelleys.org.uk/dnsmasq/doc.html
+HOMEPAGE=      https://thekelleys.org.uk/dnsmasq/doc.html
 COMMENT=       Lightweight, easy to configure DNS forwarder
 LICENSE=       gnu-gpl-v3
 

Index: pkgsrc/net/dnsmasq/distinfo
diff -u pkgsrc/net/dnsmasq/distinfo:1.40 pkgsrc/net/dnsmasq/distinfo:1.41
--- pkgsrc/net/dnsmasq/distinfo:1.40    Fri Feb  5 20:04:43 2021
+++ pkgsrc/net/dnsmasq/distinfo Mon Apr 12 10:06:45 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2021/02/05 20:04:43 adam Exp $
+$NetBSD: distinfo,v 1.41 2021/04/12 10:06:45 adam Exp $
 
-SHA1 (dnsmasq-2.84.tar.xz) = 60f6b8a6a86987613247c8dc32f61e28599ae285
-RMD160 (dnsmasq-2.84.tar.xz) = 51342173c980d756a99a0d8fb6ba9ab0f786b939
-SHA512 (dnsmasq-2.84.tar.xz) = e84bdcdf3cf35f08e8492eb5aa89ee6543233bdb821d01f164783bd6d0913ec01c513e85e2109352c77e77142a1a94bedcd3361f37d7b2a9a5d35a02448e85c6
-Size (dnsmasq-2.84.tar.xz) = 514216 bytes
+SHA1 (dnsmasq-2.85.tar.xz) = 256ec628587ab2b20bba3fc2773046dab8f2874c
+RMD160 (dnsmasq-2.85.tar.xz) = eb65f0b70adbe8ce3404dc492c20fc209216f18e
+SHA512 (dnsmasq-2.85.tar.xz) = 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
+Size (dnsmasq-2.85.tar.xz) = 518316 bytes
 SHA1 (patch-src_bpf.c) = 4115a5391f57564663bbfc448fbb865c370318a6
 SHA1 (patch-src_dump.c) = 3e7553e8ed2444536ba94187f7a100a9abdbb353