git: 64736881ef05 - main - dns/dnsmasq-devel: update to rc1 release candidate

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=64736881ef05a7e44878848bac0622be7504bad8

commit 64736881ef05a7e44878848bac0622be7504bad8
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-08-25 15:59:44 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-08-25 15:59:44 +0000

    dns/dnsmasq-devel: update to rc1 release candidate
    
    Changes:
    * a42ee39 2021-08-16 | Man page BNF error fix. [Geert Stappers]
    * e58f8bb 2021-08-25 | Merge message changes into I18N files. [Simon Kelley]
    * 58cf958 2021-08-20 | Fix empty domain in server option parsing when more than one domain is given [Dominik DL6ER]
    * 06d01f7 2021-07-22 | Make comment style consistent. [Etan Kissling]
    * 1a33eec 2021-07-22 | Adjust logging levels for connmark patterns. [Etan Kissling]
    * 82de7a1 2021-07-22 | Re-order UBus teardown logic. [Etan Kissling]
    * 8e9bde5 2021-07-22 | Eliminate redundant UBus `notify` variable. [Etan Kissling]
    * 1bb70e0 2021-07-22 | Handle UBus serialization errors. [Etan Kissling]
    * 9afcb7a 2021-08-12 | Revert "There was a `notify` variable to keep track whether a subscriber is" [Simon Kelley]
    * 545c495 2021-08-12 | Revert "Re-order UBus teardown logic." [Simon Kelley]
    * 2f2d59b 2021-08-12 | Define order of reading files when --addn-hosts given a directory. [Simon Kelley]
    
    CHANGELOG addition:
    
    +       When --dhcp-hostsfile --dhcp-optsfile and --addn-hosts are
    +       given a directory as argument, define the order in which
    +       files within that directory are read (alphabetical order
    +       of filename). Thanks to Ed Wildgoose for the initial patch
    +       and motivation for this.
---
 dns/dnsmasq-devel/Makefile | 10 +++++-----
 dns/dnsmasq-devel/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 4d936b2ba4f7..a566eeff8854 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -1,15 +1,15 @@
 # Created by: Steven Honson
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.86test7
+DISTVERSION=	2.86rc1
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
 PORTREVISION=	0
-PORTEPOCH=	3 # attn - different between -devel and dnsmasq ports!
+PORTEPOCH=	4 # attn - different between -devel and dnsmasq ports!
 CATEGORIES=	dns
-#MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \
-		LOCAL/mandree/
-MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/test-releases/ \
+MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \
 		LOCAL/mandree/
+#MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/test-releases/ \
+#		LOCAL/mandree/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	mandree at FreeBSD.org
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index 34f65a4da732..ef2d8a3fbdd8 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629381620
-SHA256 (dnsmasq-2.86test7.tar.xz) = 98fccdf0ccc38a4c439fd8580be011471ed432548c53e362788e5959a77b69a5
-SIZE (dnsmasq-2.86test7.tar.xz) = 550904
+TIMESTAMP = 1629906959
+SHA256 (dnsmasq-2.86rc1.tar.xz) = 116d5fbb70c423c12fab02cec5380abbf8e85455dda22d4feda0853c0f9f9326
+SIZE (dnsmasq-2.86rc1.tar.xz) = 551428