Update dnsmasq-devel to 2.81rc1.

This currently adds two portability fixes that have been reported upstream.

Changelog:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=31b395c987fe50174533065afe816dec3d4284a1;hb=b2ed691eb3ca6488a8878f5f3dd950a07b14a9db#l1>

5 files changed, 36 insertions, 11 deletions

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index d3afcaaa2918..fd95c9b263c2 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.80rc1
-PORTREVISION=	3
+DISTVERSION=	2.81rc1
+PORTREVISION=	0
 PORTEPOCH=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
@@ -15,9 +15,9 @@ COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=dnsmasq-2*
+USES=		cpe shebangfix tar:xz
 
-IGNORE=		use dns/dnsmasq, which is newer
+CONFLICTS_INSTALL=dnsmasq-2*
 
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 
@@ -38,7 +38,6 @@ IDN_DESC=	IDN: Int'l Domain Names WITHOUT full NLS
 IPSET_DESC=	Dynamic firewall management of resolved names (needs PF)
 LUA_DESC=	Support lease-change scripts written in Lua
 DNSSEC_DESC=	Enable DNSSEC caching and validation
-USES=		cpe shebangfix tar:xz
 SHEBANG_FILES=	contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \
 		contrib/dnslist/dnslist.pl
 CPE_VENDOR=	thekelleys
@@ -96,9 +95,6 @@ USE_RC_SUBR=	dnsmasq
 
 LDFLAGS+=	-L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB}
 
-post-patch:
-	${REINPLACE_CMD} -e "s/lua5\.1/lua-${LUA_VER}/" ${WRKSRC}/Makefile
-
 pre-configure: pretty-print-config
 .if ${PORT_OPTIONS:MIDN}
 .if empty(PORT_OPTIONS:MNLS)
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index 45c439521ffc..c42777193794 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539729255
-SHA256 (dnsmasq-2.80rc1.tar.xz) = d7cea3e452059c7d93862f1b6a906dba02d13b2f5a501437cce2ab826e76b63a
-SIZE (dnsmasq-2.80rc1.tar.xz) = 517852
+TIMESTAMP = 1583357445
+SHA256 (dnsmasq-2.81rc1.tar.xz) = 47afc967fb3d673d1700ebfa2192ab1436197fa6e135e335f0d0ef17cdb2f0fc
+SIZE (dnsmasq-2.81rc1.tar.xz) = 526052
diff --git a/dns/dnsmasq-devel/files/patch-src_network.c b/dns/dnsmasq-devel/files/patch-src_network.c
new file mode 100644
index 000000000000..500c3ca8053f
--- /dev/null
+++ b/dns/dnsmasq-devel/files/patch-src_network.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..00a8558f829c
--- /dev/null
+++ b/dns/dnsmasq-devel/files/patch-src_rfc3315.c
@@ -0,0 +1,11 @@
+--- src/rfc3315.c.orig	2020-03-02 18:11:22 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);
+ 
+-		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);
diff --git a/dns/dnsmasq-devel/files/pkg-message.in b/dns/dnsmasq-devel/files/pkg-message.in
index adcbeb5d5375..931dec5f38c0 100644
--- a/dns/dnsmasq-devel/files/pkg-message.in
+++ b/dns/dnsmasq-devel/files/pkg-message.in
@@ -6,6 +6,13 @@
 
  Further options and actions are documented inside
  %%PREFIX%%/etc/rc.d/dnsmasq
+
+ SECURITY RECOMMENDATION
+ ~~~~~~~~~~~~~~~~~~~~~~~
+ It is recommended to enable the wpad-related options
+ at the end of the configuration file (you may need to
+ copy them from the example file to yours) to fix
+ CERT Vulnerability VU#598349.
 EOM
 }
 ]