Here is an update to dnsmasq 2.85.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/Makefile,v retrieving revision 1.57 diff -u -p -u -p -r1.57 Makefile --- Makefile 4 Feb 2021 12:32:12 -0000 1.57 +++ Makefile 8 Apr 2021 03:09:26 -0000 @@ -2,7 +2,7 @@ COMMENT= lightweight caching DNS forwarder, DHCP and TFTP server -DISTNAME= dnsmasq-2.84 +DISTNAME= dnsmasq-2.85 CATEGORIES= net MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ EXTRACT_SUFX= .tar.xz Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/distinfo,v retrieving revision 1.39 diff -u -p -u -p -r1.39 distinfo --- distinfo 4 Feb 2021 12:32:12 -0000 1.39 +++ distinfo 8 Apr 2021 03:09:34 -0000 @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.84.tar.xz) = YDGVxktzE3YJsH4QJK4LN/ZSsvX+Rn3OZphbPRhQBQw= -SIZE (dnsmasq-2.84.tar.xz) = 514216 +SHA256 (dnsmasq-2.85.tar.xz) = rZjTgD32h+W5OAgPPSXGKP5ByHh1LQP7xhmXh/7jEvo= +SIZE (dnsmasq-2.85.tar.xz) = 518316 Index: patches/patch-bld_get-version =================================================================== RCS file: patches/patch-bld_get-version diff -N patches/patch-bld_get-version --- patches/patch-bld_get-version 4 Feb 2021 12:32:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -$OpenBSD: patch-bld_get-version,v 1.1 2021/02/04 12:32:13 sthen Exp $ - -- Tweak sort order of tags in get-version -- Tweak f1204a875e0f16fd645df965db346fc56d2ab1dd - -Index: bld/get-version ---- bld/get-version.orig -+++ bld/get-version -@@ -9,7 +9,9 @@ - # If we can find one which matches $v[0-9].* then we assume it's - # a version-number tag, else we just use the whole string. - # If there is more than one v[0-9].* tag, sort them and use the --# first. This favours, eg v2.63 over 2.63rc6. -+# first. The insane arguments to the sort command are to ensure -+# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1 -+# and v2.63rc1 comes before v2.63test1 - - # Change directory to the toplevel source directory. - if test -z "$1" || ! test -d "$1" || ! cd "$1"; then -@@ -28,7 +30,7 @@ else - vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]` - - if [ $? -eq 0 ]; then -- echo "${vers}" | sort -r | head -n 1 | sed 's/^v//' -+ echo "${vers}" | sort -k1.2,1.5Vr -k1.6,1.6 -k1.8,1.9Vr -k1.10,1.11Vr | head -n 1 | sed 's/^v//' - else - cat $1/VERSION - fi Index: patches/patch-man_dnsmasq_8 =================================================================== RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v retrieving revision 1.27 diff -u -p -u -p -r1.27 patch-man_dnsmasq_8 --- patches/patch-man_dnsmasq_8 20 Jan 2021 11:32:17 -0000 1.27 +++ patches/patch-man_dnsmasq_8 28 Mar 2021 00:52:31 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.27 202 Index: man/dnsmasq.8 --- man/dnsmasq.8.orig +++ man/dnsmasq.8 -@@ -151,13 +151,12 @@ Specify an alternate path for dnsmasq to record its pr +@@ -154,13 +154,12 @@ Specify an alternate path for dnsmasq to record its pr .TP .B \-u, --user=<username> Specify the userid to which dnsmasq will change after startup. Dnsmasq must normally be started as root, but it will drop root @@ -19,7 +19,7 @@ Index: man/dnsmasq.8 .TP .B \-v, --version Print the version number. -@@ -2022,7 +2021,7 @@ in the configuration file included. Secondly, the file +@@ -2044,7 +2043,7 @@ in the configuration file included. Secondly, the file therein is updated when dnsmasq receives SIGHUP. .SH CONFIG FILE At startup, dnsmasq reads @@ -28,7 +28,7 @@ Index: man/dnsmasq.8 if it exists. (On FreeBSD, the file is .I /usr/local/etc/dnsmasq.conf -@@ -2473,7 +2472,7 @@ dnsmasq has no direct way of determining the charset i +@@ -2497,7 +2496,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.24 diff -u -p -u -p -r1.24 patch-src_config_h --- patches/patch-src_config_h 20 Jan 2021 11:32:17 -0000 1.24 +++ patches/patch-src_config_h 28 Mar 2021 00:52:29 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-src_config_h,v 1.24 2021 Index: src/config.h --- src/config.h.orig +++ src/config.h -@@ -45,8 +45,8 @@ +@@ -44,8 +44,8 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */ #define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */ @@ -14,7 +14,7 @@ Index: src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -212,7 +212,7 @@ RESOLVFILE +@@ -211,7 +211,7 @@ RESOLVFILE # if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" # else
