Received: by mail.netbsd.org (Postfix, from userid 605) id 1EAF784D57; Wed, 29 Apr 2020 12:38:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9BDF684D22 for ; Wed, 29 Apr 2020 12:38:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id qGzwdvLZFeQt for ; Wed, 29 Apr 2020 12:38:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C92C984CD8 for ; Wed, 29 Apr 2020 12:38:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C18E2FB27; Wed, 29 Apr 2020 12:38:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158816393283770" MIME-Version: 1.0 Date: Wed, 29 Apr 2020 12:38:52 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/dnsmasq To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200429123852.C18E2FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158816393283770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Wed Apr 29 12:38:52 UTC 2020 Modified Files: pkgsrc/net/dnsmasq: Makefile distinfo pkgsrc/net/dnsmasq/patches: patch-src_bpf.c Log Message: dnsmasq: updated to 2.81 version 2.81 Improve cache behaviour for TCP connections. For ease of implementaion, dnsmasq has always forked a new process to handle each incoming TCP connection. A side-effect of this is that any DNS queries answered from TCP connections are not cached: when TCP connections were rare, this was not a problem. With the coming of DNSSEC, it is now the case that some DNSSEC queries have answers which spill to TCP, and if, for instance, this applies to the keys for the root, then those never get cached, and performance is very bad. This fix passes cache entries back from the TCP child process to the main server process, and fixes the problem. Remove the NO_FORK compile-time option, and support for uclinux. In an era where everything has an MMU, this looks like an anachronism, and it adds to (Ok, multiplies!) the combinatorial explosion of compile-time options. Thanks to Kevin Darbyshire-Bryant for the patch. Fix line-counting when reading /etc/hosts and friends; for correct error messages. Thanks to Christian Rosentreter for reporting this. Fix bug in DNS non-terminal code, added in 2.80, which could sometimes cause a NODATA rather than an NXDOMAIN reply. Thanks to Norman Rasmussen, Sven Mueller and Maciej Żenczykowski for spotting and diagnosing the bug and providing patches. Support TCP-fastopen (RFC-7413) on both incoming and outgoing TCP connections, if supported and enabled in the OS. Improve kernel-capability manipulation code under Linux. Dnsmasq now fails early if a required capability is not available, and tries not to request capabilities not required by its configuration. Add --shared-network config. This enables allocation of addresses by the DHCP server in subnets where the server (or relay) does not have an interface on the network in that subnet. Many thanks to kamp.de for sponsoring this feature. Fix broken contrib/lease_tools/dhcp_lease_time.c. A packet validation check got borked in commit 2b38e382 and release 2.80. Thanks to Tomasz Szajner for spotting this. Fix compilation against nettle version 3.5 and later. Fix spurious DNSSEC validation failures when the auth section of a reply contains unsigned RRs from a signed zone, with the exception that NSEC and NSEC3 RRs must always be signed. Thanks to Tore Anderson for spotting and diagnosing the bug. Add --dhcp-ignore-clid. This disables reading of DHCP client identifier option (option 61), so clients are only identified by MAC addresses. Fix a bug which stopped --dhcp-name-match from working when a hostname is supplied in --dhcp-host. Thanks to James Feeney for spotting this. Fix bug which caused very rarely caused zero-length DHCPv6 packets. Thanks to Dereck Higgins for spotting this. Add --tftp-single-port option. Enhance --conf-dir to load files in a deterministic order. Thanks to Evgenii Seliavka for the suggestion and initial patch. In the router advert code, handle case where we have two different interfaces on the same IPv6 net, and we are doing RA/DHCP service on only one of them. Thanks to NIIBE Yutaka for spotting this case and making the initial patch. Support prefixed ranges of ipv6 addresses in dhcp-host. This eases problems chain-netbooting, where each link in the chain requests an address using a different UID. With a single address, only one gets the "static" address, but with this fix, enough addresses can be reserved for all the stages of the boot. Many thanks to Harald Jensås for his work on this idea and earlier patches. Add filtering by tag of --dhcp-host directives. Based on a patch by Harald Jensås. Allow empty server spec in --rev-server, to match --server. Remove DSA signature verification from DNSSEC, as specified in RFC 8624. Thanks to Loganaden Velvindron for the original patch. Add --script-on-renewal option. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/dnsmasq/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/dnsmasq/distinfo cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/dnsmasq/patches/patch-src_bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158816393283770 Content-Disposition: inline Content-Length: 3259 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/dnsmasq/Makefile diff -u pkgsrc/net/dnsmasq/Makefile:1.40 pkgsrc/net/dnsmasq/Makefile:1.41 --- pkgsrc/net/dnsmasq/Makefile:1.40 Sun Nov 3 11:45:34 2019 +++ pkgsrc/net/dnsmasq/Makefile Wed Apr 29 12:38:52 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2019/11/03 11:45:34 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2020/04/29 12:38:52 adam Exp $ -DISTNAME= dnsmasq-2.80 -PKGREVISION= 1 +DISTNAME= dnsmasq-2.81 CATEGORIES= net MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ EXTRACT_SUFX= .tar.xz @@ -11,9 +10,9 @@ HOMEPAGE= http://www.thekelleys.org.uk/d COMMENT= Lightweight, easy to configure DNS forwarder LICENSE= gnu-gpl-v3 -RCD_SCRIPTS= dnsmasq -EGDIR= ${PREFIX}/share/examples/dnsmasq -CONF_FILES= ${EGDIR}/dnsmasq.conf.example ${PKG_SYSCONFDIR}/dnsmasq.conf +RCD_SCRIPTS= dnsmasq +EGDIR= ${PREFIX}/share/examples/dnsmasq +CONF_FILES= ${EGDIR}/dnsmasq.conf.example ${PKG_SYSCONFDIR}/dnsmasq.conf .include "../../mk/bsd.prefs.mk" Index: pkgsrc/net/dnsmasq/distinfo diff -u pkgsrc/net/dnsmasq/distinfo:1.37 pkgsrc/net/dnsmasq/distinfo:1.38 --- pkgsrc/net/dnsmasq/distinfo:1.37 Tue Oct 30 11:16:06 2018 +++ pkgsrc/net/dnsmasq/distinfo Wed Apr 29 12:38:52 2020 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.37 2018/10/30 11:16:06 jperkin Exp $ +$NetBSD: distinfo,v 1.38 2020/04/29 12:38:52 adam Exp $ -SHA1 (dnsmasq-2.80.tar.xz) = 45317f3ce129c670c812428f97b92273b5286df0 -RMD160 (dnsmasq-2.80.tar.xz) = 5a26def1ae9a47a2debe08845dfc41d14f3bfa2e -SHA512 (dnsmasq-2.80.tar.xz) = 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068 -Size (dnsmasq-2.80.tar.xz) = 501072 bytes -SHA1 (patch-src_bpf.c) = 05dc64c016c608e6b963ce9ee80c28e872a88f9e +SHA1 (dnsmasq-2.81.tar.xz) = 7724b5f4a2249e42902e2d1a3c2d4a1a12a02b53 +RMD160 (dnsmasq-2.81.tar.xz) = 0a731a8746a34df1d0e1411fbc07b45f94458c22 +SHA512 (dnsmasq-2.81.tar.xz) = 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e +Size (dnsmasq-2.81.tar.xz) = 510648 bytes +SHA1 (patch-src_bpf.c) = 4115a5391f57564663bbfc448fbb865c370318a6 SHA1 (patch-src_dump.c) = 3e7553e8ed2444536ba94187f7a100a9abdbb353 Index: pkgsrc/net/dnsmasq/patches/patch-src_bpf.c diff -u pkgsrc/net/dnsmasq/patches/patch-src_bpf.c:1.8 pkgsrc/net/dnsmasq/patches/patch-src_bpf.c:1.9 --- pkgsrc/net/dnsmasq/patches/patch-src_bpf.c:1.8 Tue Mar 21 09:18:15 2017 +++ pkgsrc/net/dnsmasq/patches/patch-src_bpf.c Wed Apr 29 12:38:52 2020 @@ -1,15 +1,16 @@ -$NetBSD: patch-src_bpf.c,v 1.8 2017/03/21 09:18:15 fhajny Exp $ +$NetBSD: patch-src_bpf.c,v 1.9 2020/04/29 12:38:52 adam Exp $ SunOS doesn't have netinet6/in6_var.h. ---- src/bpf.c.orig 2016-05-18 14:51:54.000000000 +0000 +--- src/bpf.c.orig 2020-04-08 16:32:53.000000000 +0000 +++ src/bpf.c -@@ -31,7 +31,7 @@ +@@ -31,7 +31,9 @@ # include #endif #include --#ifdef HAVE_IPV6 -+#if defined(HAVE_IPV6) && defined(HAVE_BSD_NETWORK) - # include - #endif ++#if defined(HAVE_BSD_NETWORK) + #include ++#endif + #ifndef SA_SIZE + #define SA_SIZE(sa) \ --_----------=_158816393283770--