dns/dnsmasq-devel: Update to new upstream release candidate #2.

Changelog (from Git):
* fc19399 2020-03-05 | Fix compiler warning. (HEAD -> master, tag: v2.81rc2, origin/master, origin/HEAD) [Simon Kelley]
* 980b14f 2020-03-05 | Compiler warning. [Simon Kelley]
* 1df73fe 2020-03-05 | Remove compiler warnings in IPv6 checksum code in dump.c [Simon Kelley]
* c125c1d 2020-03-05 | Update decline address handling in DHCPv6 for new multi-address world. [Simon Kelley]
* e39c484 2020-03-05 | Fix parameters to setsockopt() for TCP_FASTOPEN. [Matthias Andree]
* 977a5a2 2020-03-02 | Merge i18n messages. [Simon Kelley]
* 02df000 2020-03-02 | Trivial formatting fix. [Simon Kelley]

Drop previous patches, and add two new ones,
one to fix pkgconfig for lua,
one to fix the bitfield flag testing in rfc3315.c/DHCPv6 decline handling.

5 files changed, 27 insertions, 26 deletions

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index fd95c9b263c2..4cb173c20648 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.81rc1
-PORTREVISION=	0
+DISTVERSION=	2.81rc2
 PORTEPOCH=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
@@ -79,7 +78,7 @@ LDFLAGS+=	`pkg-config --libs dbus-1`
 CPPFLAGS+=	-I${LUA_INCDIR}
 CFLAGS+=	-DHAVE_LUASCRIPT
 LDFLAGS+=	-L${LUA_LIBDIR} -llua-${LUA_VER}
-USES+=		lua
+USES+=		lua pkgconfig
 .endif
 
 .if ${PORT_OPTIONS:MDNSSEC}
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index c42777193794..43b024be498d 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583357445
-SHA256 (dnsmasq-2.81rc1.tar.xz) = 47afc967fb3d673d1700ebfa2192ab1436197fa6e135e335f0d0ef17cdb2f0fc
-SIZE (dnsmasq-2.81rc1.tar.xz) = 526052
+TIMESTAMP = 1583457946
+SHA256 (dnsmasq-2.81rc2.tar.xz) = 218a5414836c0a553b57f5506d001f48b5eadc869d0fa21499ab1cdca75c1912
+SIZE (dnsmasq-2.81rc2.tar.xz) = 527860
diff --git a/dns/dnsmasq-devel/files/patch-Makefile b/dns/dnsmasq-devel/files/patch-Makefile
new file mode 100644
index 000000000000..ecbfbaa41d47
--- /dev/null
+++ b/dns/dnsmasq-devel/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2020-03-05 22:13:45 UTC
++++ Makefile
+@@ -60,8 +60,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrappe
+ idn2_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
+ ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
+ ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
+-lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` 
+-lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` 
++lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua-5.2` 
++lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua-5.2` 
+ nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
+ nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
+ gmp_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
diff --git a/dns/dnsmasq-devel/files/patch-src_network.c b/dns/dnsmasq-devel/files/patch-src_network.c
deleted file mode 100644
index 500c3ca8053f..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_network.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network.c.orig	2020-03-02 18:11:22 UTC
-+++ src/network.c
-@@ -728,7 +728,7 @@ static int make_sock(union mysockaddr *addr, int type,
-     {
- #ifdef TCP_FASTOPEN
-       int qlen = 5;                           
--      setsockopt(fd, SOL_TCP, TCP_FASTOPEN, &qlen, sizeof(qlen));
-+      setsockopt(fd, IPPROTO_TCP, TCP_FASTOPEN, &qlen, sizeof(qlen));
- #endif
-       
-       if (listen(fd, TCP_BACKLOG) == -1)
diff --git a/dns/dnsmasq-devel/files/patch-src_rfc3315.c b/dns/dnsmasq-devel/files/patch-src_rfc3315.c
index 00a8558f829c..654fee8278ae 100644
--- a/dns/dnsmasq-devel/files/patch-src_rfc3315.c
+++ b/dns/dnsmasq-devel/files/patch-src_rfc3315.c
@@ -1,11 +1,11 @@
---- src/rfc3315.c.orig	2020-03-02 18:11:22 UTC
+--- src/rfc3315.c.orig	2020-03-05 22:13:45 UTC
 +++ src/rfc3315.c
-@@ -1190,7 +1190,7 @@ static int dhcp6_no_relay(struct state *state, int msg
- 		/* align */
- 		memcpy(&addr, opt6_ptr(ia_option, 0), IN6ADDRSZ);
+@@ -1708,7 +1708,7 @@ static int config_valid(struct dhcp_config *config, st
+     return 0;
  
--		if (have_config(config, CONFIG_ADDR6) && IN6_ARE_ADDR_EQUAL(&config->addr6, &addr))
-+		if (have_config(config, CONFIG_ADDR6) && IN6_ARE_ADDR_EQUAL(&config->addr6->addr.addr6, &addr))
- 		  {
- 		    prettyprint_time(daemon->dhcp_buff3, DECLINE_BACKOFF);
- 		    inet_ntop(AF_INET6, &addr, daemon->addrbuff, ADDRSTRLEN);
+   for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
+-    if (!(addr_list->flags && ADDRLIST_DECLINED) ||
++    if (!(addr_list->flags & ADDRLIST_DECLINED) ||
+ 	difftime(now, addr_list->decline_time) >= (float)DECLINE_BACKOFF)
+       {
+ 	addrpart = addr6part(&addr_list->addr.addr6);