Index: head/dns/dnsmasq-devel/Makefile =================================================================== --- head/dns/dnsmasq-devel/Makefile (revision 441495) +++ head/dns/dnsmasq-devel/Makefile (revision 441496) @@ -1,136 +1,137 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.77rc4 +DISTVERSION= 2.77rc5 PORTEPOCH= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ #MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/test-releases/ PKGNAMESUFFIX= -devel MAINTAINER= mandree@FreeBSD.org COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server LICENSE= GPLv2 #IGNORE= build stable version instead, it is newer than this release candidate CONFLICTS_INSTALL=dnsmasq-2* 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}" OPTIONS_DEFINE= IPSET IPV6 DBUS LUA DNSSEC DOCS OPTIONS_DEFAULT= DNSSEC IPSET OPTIONS_EXCLUDE+= EXAMPLES OPTIONS_RADIO= INTL OPTIONS_RADIO_INTL= IDN NLS INTL_DESC= Internationalization Support Level NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support IDN_DESC= IDN: Int'l Domain Names WITHOUT full NLS IPSET_DESC= Dynamic firewall managment of resolved names (require 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 CPE_VERSION= ${DISTVERSION:C/r.*//} CPE_UPDATE= ${DISTVERSION:C/.*rc/rc/} IPV6_CFLAGS_OFF=-DNO_IPV6 IPSET_CFLAGS_OFF=-DNO_IPSET .include .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 .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-1.so:devel/dbus USES+= pkgconfig CPPFLAGS+= `pkg-config --cflags dbus-1` CFLAGS+= -DHAVE_DBUS LDFLAGS+= `pkg-config --libs dbus-1` .endif .if ${PORT_OPTIONS:MLUA} CPPFLAGS+= -I${LUA_INCDIR} CFLAGS+= -DHAVE_LUASCRIPT LDFLAGS+= -L${LUA_LIBDIR} -llua-${LUA_VER} USES+= lua .endif .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC USES+= pkgconfig LIB_DEPENDS+= libnettle.so:security/nettle LIB_DEPENDS+= libgmp.so:math/gmp .endif USE_RC_SUBR= dnsmasq .include 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) - @if ${READELF} -d ${LOCALBASE}/lib/libidn.so \ + @if ${READELF} -d ${LOCALBASE}/lib/libidn2.so \ | ${EGREP} -q '\.*\[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.' .endif .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/trust-anchors.conf ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} .for i in de es fi fr id it no pl pt_BR ro ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/src/${i}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo .endfor .endif ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq ${STAGEDIR}${EXAMPLESDIR}/dnslist ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq/ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnslist/dnslist.pl ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dhcp.css ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dnslist.tt2 ${STAGEDIR}${EXAMPLESDIR}/dnslist/ .include Index: head/dns/dnsmasq-devel/distinfo =================================================================== --- head/dns/dnsmasq-devel/distinfo (revision 441495) +++ head/dns/dnsmasq-devel/distinfo (revision 441496) @@ -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 Index: head/dns/dnsmasq-devel/files/patch-src_forward.c =================================================================== --- head/dns/dnsmasq-devel/files/patch-src_forward.c (revision 441495) +++ head/dns/dnsmasq-devel/files/patch-src_forward.c (nonexistent) @@ -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; Property changes on: head/dns/dnsmasq-devel/files/patch-src_forward.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/dnsmasq-devel/files/patch-src_edns0.c =================================================================== --- head/dns/dnsmasq-devel/files/patch-src_edns0.c (revision 441495) +++ head/dns/dnsmasq-devel/files/patch-src_edns0.c (nonexistent) @@ -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; Property changes on: head/dns/dnsmasq-devel/files/patch-src_edns0.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property