MFH: r562461 r562980

dns/dnsmasq: regression fixes from upstream Git

Apparently there are situations where dnsmasq 2.83 can confuse
its peers or sockets, and the upstream Git contains fixes for them.

These four fixes essentially take dnsmasq to 2.84test3.

Obtained from:	Simon Kelley <simon@thekelleys.org.uk>'s Git repository

dns/dnsmasq: upgrade to v2.84 (regression fixes)

Upstream blessed v2.84 rc2 (which 2.83_1 effectively already was)
into v2.84 release, so take it (and patch the upstream bug of
leaving "rc2" in the version out).
This commit is contained in:
Matthias Andree 2021-01-26 19:20:52 +00:00
parent cfe0393d14
commit 7797704bf2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2021Q1/; revision=562981
3 changed files with 13 additions and 5 deletions

View File

@ -2,13 +2,14 @@
# $FreeBSD$
PORTNAME= dnsmasq
DISTVERSION= 2.83
DISTVERSION= 2.84
# Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= dns
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \
MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \
LOCAL/mandree/
PATCH_STRIP= -p1
MAINTAINER= mandree@FreeBSD.org
COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server
@ -103,6 +104,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB}
post-patch:
${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's/2\.84rc2/2.84/' ${WRKSRC}/VERSION
pre-configure: pretty-print-config
.if ${PORT_OPTIONS:MIDN}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1611169927
SHA256 (dnsmasq-2.83.tar.xz) = ffc1f7e8b05e22d910b9a71d09f1128197292766dc7c54cb7018a1b2c3af4aea
SIZE (dnsmasq-2.83.tar.xz) = 513880
TIMESTAMP = 1611563398
SHA256 (dnsmasq-2.84.tar.xz) = 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c
SIZE (dnsmasq-2.84.tar.xz) = 514216

View File

@ -1,3 +1,6 @@
[
{
message: <<EOM
To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
set dnsmasq_enable="YES" in /etc/rc.conf[.local]
@ -10,3 +13,6 @@ 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
}
]