svn commit: r350849 - head/dns/dnsmasq

[Matthias Andree]

Author: mandree
Date: Thu Apr 10 20:44:29 2014
New Revision: 350849
URL: http://svnweb.freebsd.org/changeset/ports/350849
QAT: https://qat.redports.org/buildarchive/r350849/

Log:
  Update to new upstream 2.69 release. Adds DNSSEC support.
  
  Full changelog: <http://www.thekelleys.org.uk/dnsmasq/CHANGELOG>

Modified:
  head/dns/dnsmasq/Makefile
  head/dns/dnsmasq/distinfo
  head/dns/dnsmasq/pkg-plist

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Thu Apr 10 20:43:50 2014	(r350848)
+++ head/dns/dnsmasq/Makefile	Thu Apr 10 20:44:29 2014	(r350849)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.68
+DISTVERSION=	2.69
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
@@ -19,21 +19,21 @@ PORTDOCS=	CHANGELOG CHANGELOG.archive FA
 
 SUB_FILES=	pkg-message
 
-USE_XZ=		yes
 CFLAGS+=	-Wall -Wno-unused-value
 CPPFLAGS+=	-I${LOCALBASE}/include
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
-OPTIONS_DEFINE=		IPV6 DBUS LUA
-OPTIONS_DEFAULT=	IPV6 NLS
+OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC
+OPTIONS_DEFAULT=	IPV6 NLS DNSSEC
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS
 INTL_DESC=	Internationalization Support Level
-NLS_DESC=	National Language and Int'l Domain Names support (IDN + NLS)
-IDN_DESC=	International Domain Names support WITHOUT full NLS (IDN)
-LUA_DESC=	Support lease-change scripts in LUA
-USES=		shebangfix
+NLS_DESC=	IDN+NLS: Int'l Domain Names & National Language support
+IDN_DESC=	IDN: Int'l Domain Names WITHOUT full NLS
+LUA_DESC=	Support lease-change scripts written in Lua
+DNSSEC_DESC=	Enable DNSSEC caching and validation
+USES=		shebangfix tar:xz
 SHEBANG_FILES=	contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \
 		contrib/dnslist/dnslist.pl
 
@@ -75,6 +75,12 @@ LDFLAGS+=	-L${LUA_LIBDIR} -llua
 USE_LUA=	5.1
 .endif
 
+.if ${PORT_OPTIONS:MDNSSEC}
+CFLAGS+=	-DHAVE_DNSSEC
+LIB_DEPENDS+=	libnettle.so:${PORTSDIR}/security/nettle
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+.endif
+
 USE_RC_SUBR=	dnsmasq
 
 .include <bsd.port.pre.mk>
@@ -101,7 +107,10 @@ pre-configure: pretty-print-config
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc
+	${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.example
 	${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}

Modified: head/dns/dnsmasq/distinfo
==============================================================================
--- head/dns/dnsmasq/distinfo	Thu Apr 10 20:43:50 2014	(r350848)
+++ head/dns/dnsmasq/distinfo	Thu Apr 10 20:44:29 2014	(r350849)
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.68.tar.xz) = 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0
-SIZE (dnsmasq-2.68.tar.xz) = 420968
+SHA256 (dnsmasq-2.69.tar.xz) = 80ce4293b2c0966ebe7997adf626269cafdcb98d7dbe51d8a312ff15244e69fc
+SIZE (dnsmasq-2.69.tar.xz) = 446724

Modified: head/dns/dnsmasq/pkg-plist
==============================================================================
--- head/dns/dnsmasq/pkg-plist	Thu Apr 10 20:43:50 2014	(r350848)
+++ head/dns/dnsmasq/pkg-plist	Thu Apr 10 20:44:29 2014	(r350849)
@@ -3,6 +3,7 @@ sbin/dnsmasq
 etc/dnsmasq.conf.example
 @exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi
 man/man8/dnsmasq.8.gz
+%%DATADIR%%/trust-anchors.conf
 %%EXAMPLESDIR%%/dnslist/dhcp.css
 %%EXAMPLESDIR%%/dnslist/dnslist.pl
 %%EXAMPLESDIR%%/dnslist/dnslist.tt2
@@ -10,6 +11,7 @@ man/man8/dnsmasq.8.gz
 @dirrm %%EXAMPLESDIR%%/dnslist
 @dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq
 @dirrm %%EXAMPLESDIR%%
+ at dirrmtry %%DATADIR%%
 %%NLS%%share/locale/de/LC_MESSAGES/dnsmasq.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dnsmasq.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/dnsmasq.mo