Update to new upstream release candidate #5.

Switch IDN support from libidn to libidn2.
Drop patches integrated upstream.

4 files changed, 14 insertions, 44 deletions

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 16b560893bfe..3670dd4f1f31 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.77rc4
+DISTVERSION=	2.77rc5
 PORTEPOCH=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
@@ -21,7 +21,7 @@ PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 
 SUB_FILES=	pkg-message
 
-CFLAGS+=	-Wall -Wno-unused-value -Wno-unused-parameter
+CFLAGS+=	-Wall -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
@@ -50,18 +50,19 @@ IPSET_CFLAGS_OFF=-DNO_IPSET
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig
-LIB_DEPENDS+=	libidn.so:dns/libidn
+CFLAGS+=	-DHAVE_LIBIDN2
+LIB_DEPENDS+=	libidn2.so:dns/libidn2
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
-_intllibs=	-lintl
+_intllibs=	-lidn2 -lintl
 .else
 _intllibs=
 PLIST_SUB+=	NLS="@comment "
 .if ${PORT_OPTIONS:MIDN}
 USES+=		iconv
-CFLAGS+=	-DHAVE_IDN
-LIB_DEPENDS+=	libidn.so:dns/libidn
-_intllibs+=	-lidn
+CFLAGS+=	-DHAVE_LIBIDN2
+LIB_DEPENDS+=	libidn2.so:dns/libidn2
+_intllibs+=	-lidn2
 .endif
 .endif
 
@@ -99,10 +100,10 @@ post-patch:
 pre-configure: pretty-print-config
 .if ${PORT_OPTIONS:MIDN}
 .if empty(PORT_OPTIONS:MNLS)
-	@if ${READELF} -d ${LOCALBASE}/lib/libidn.so \
+	@if ${READELF} -d ${LOCALBASE}/lib/libidn2.so \
 		| ${EGREP} -q '\<NEEDED\>.*\[libintl\.so' ; \
-	then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn was compiled with NLS support!' ; \
-	${ECHO} 'Recompile libidn WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \
+	then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn2 was compiled with NLS support!' ; \
+	${ECHO} 'Recompile libidn2 WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \
 	fi
 .else
 	@${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.'
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index f9bb4196c548..cbbe25bfa490 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495362006
-SHA256 (dnsmasq-2.77rc4.tar.xz) = e357de7faa5fb34098635b7f6000a16cc7aa703a9c41de9d392b4ef594eb1abb
-SIZE (dnsmasq-2.77rc4.tar.xz) = 503480
+TIMESTAMP = 1495487478
+SHA256 (dnsmasq-2.77rc5.tar.xz) = d9447e9307234c4818ca0e0d9818e1d62da65eaf32ee37ea9bdc47c82068f560
+SIZE (dnsmasq-2.77rc5.tar.xz) = 503548
diff --git a/dns/dnsmasq-devel/files/patch-src_edns0.c b/dns/dnsmasq-devel/files/patch-src_edns0.c
deleted file mode 100644
index aba513dacc61..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_edns0.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/edns0.c.orig	2017-05-12 14:16:02 UTC
-+++ src/edns0.c
-@@ -304,7 +304,7 @@ static size_t calc_subnet_opt(struct sub
-   /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */
-   
-   int len;
--  void *addrp;
-+  void *addrp = NULL;
-   int sa_family = source->sa.sa_family;
- 
-   opt->source_netmask = 0;
diff --git a/dns/dnsmasq-devel/files/patch-src_forward.c b/dns/dnsmasq-devel/files/patch-src_forward.c
deleted file mode 100644
index 07d050da8de9..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_forward.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/forward.c.orig	2017-05-12 14:16:02 UTC
-+++ src/forward.c
-@@ -899,7 +899,7 @@ void reply_query(int fd, int family, tim
- 		    status = dnssec_validate_ds(now, header, n, daemon->namebuff, daemon->keyname, forward->class);
- 		  else
- 		    status = dnssec_validate_reply(now, header, n, daemon->namebuff, daemon->keyname, &forward->class, 
--						   option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags && SERV_DO_DNSSEC), NULL, NULL);
-+						   option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags & SERV_DO_DNSSEC), NULL, NULL);
- 		}
- 	      
- 	      /* Can't validate, as we're missing key data. Put this
-@@ -1477,7 +1477,7 @@ static int tcp_key_recurse(time_t now, i
- 	new_status = dnssec_validate_ds(now, header, n, name, keyname, class);
-       else 
- 	new_status = dnssec_validate_reply(now, header, n, name, keyname, &class,
--					   option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags && SERV_DO_DNSSEC), NULL, NULL);
-+					   option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags & SERV_DO_DNSSEC), NULL, NULL);
-       
-       if (new_status != STAT_NEED_DS && new_status != STAT_NEED_KEY)
- 	break;