svn commit: r411142 - in head/dns/unbound: . files
Olli Hauer
ohauer at FreeBSD.org
Tue Mar 15 06:19:54 UTC 2016
Author: ohauer
Date: Tue Mar 15 06:19:52 2016
New Revision: 411142
URL: https://svnweb.freebsd.org/changeset/ports/411142
Log:
- Update unbound to version 1.5.8
- add OPTION for DNSTAP logging support
- rename OPTION s/MUNIN/MUNIN_PLUGIN/ so it is consistent with nsd
- use OPTIONS_SUB
- use ${opt}_target
- use @sample macro for unbound.conf
- sort pkg-plist
Features
- ip-transparent option for FreeBSD with IP_BINDANY socket option.
- insecure-lan-zones: yesno config option, patch from Dag-Erling Smørgrav.
- RR Type CSYNC support RFC 7477, in debug printout and config input.
- RR Type OPENPGPKEY support (draft-ietf-dane-openpgpkey-07).
- [bugzilla: 731 ] tcp-mss, outgoing-tcp-mss options for unbound.conf, patch
from Daisuke Higashi.
- Support RFC7686: handle ".onion" Special-Use Domain. It is blocked by
default, andcan be unblocked with "nodefault" localzone config.
- ub_ctx_set_stub() function for libunbound to config stub zones.
The release fixes line endings in the unbound-control-setup script, and
a potential gost-hash validation failure and handles the ".onion" domain
to avoid privacy leakage.
PR: 207948
Submitted by: jaap at NLnetLabs.nl (maintainer)
Deleted:
head/dns/unbound/files/patch-contrib-aaaa-filter-iterator.patch
Modified:
head/dns/unbound/Makefile
head/dns/unbound/distinfo
head/dns/unbound/pkg-plist
Modified: head/dns/unbound/Makefile
==============================================================================
--- head/dns/unbound/Makefile Tue Mar 15 06:08:56 2016 (r411141)
+++ head/dns/unbound/Makefile Tue Mar 15 06:19:52 2016 (r411142)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unbound
-PORTVERSION= 1.5.7
+PORTVERSION= 1.5.8
CATEGORIES= dns
MASTER_SITES= http://unbound.net/downloads/
@@ -27,16 +27,17 @@ USE_RC_SUBR= unbound
PORTDOCS= CREDITS Changelog FEATURES LICENSE README README.svn \
README.tests TODO control_proto_spec.txt ietf67-design-02.odp \
ietf67-design-02.pdf requirements.txt
-PLIST_SUB+= PYTHON=${PYTHON} MUNIN=${MUNIN}
-OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA
+OPTIONS_SUB= yes
+OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT FILTER_AAAA DNSTAP
OPTIONS_DEFAULT=THREADS ECDSA
LIBEVENT_DESC= Build against libevent
GOST_DESC= Enable GOST support (requires OpenSSL >= 1.0)
ECDSA_DESC= Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
-MUNIN_DESC= Install Munin plugin
+MUNIN_PLUGIN_DESC= Install Munin plugin
FILTER_AAAA_DESC= Build with AAAA filter functionality (contrib)
+DNSTAP_DESC= Enable dnstap logging support
.include <bsd.port.options.mk>
@@ -51,9 +52,6 @@ USES+= python:2
CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
STRIP_FILES+= .libs/_unbound.so
-PYTHON=
-.else
-PYTHON= "@comment "
.endif
.if ${PORT_OPTIONS:MGOST}
@@ -71,13 +69,16 @@ DEPENDS_ARGS+= WITH_ECDSA=yes
CONFIGURE_ARGS+=--disable-ecdsa
.endif
-.if ${PORT_OPTIONS:MMUNIN}
+.if ${PORT_OPTIONS:MDNSTAP}
+CONFIGURE_ARGS+=--enable-dnstap
+LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+LIB_DEPENDS+= libfstrm.so:${PORTSDIR}/devel/fstrm
+.endif
+
+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
SUB_FILES+= pkg-message
-MUNIN_ALL= hits queue memory by_type by_class by_opcode by_rcode \
+MUNIN_PLUGIN_ALL= hits queue memory by_type by_class by_opcode by_rcode \
by_flags histogram
-MUNIN=
-.else
-MUNIN= "@comment "
.endif
.if ${PORT_OPTIONS:MLIBEVENT}
@@ -99,37 +100,35 @@ post-patch:
@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
s|$$(configfile); fi|$$(configfile).sample|' \
${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MFILTER_AAAA}
+
+post-patch-FILTER_AAAA-on:
${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s
-.endif
post-build:
@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
-post-install:
-.if ${PORT_OPTIONS:MPYTHON}
+post-install-PYTHON-on:
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
-.endif
-.if ${PORT_OPTIONS:MMUNIN}
+
+post-install-MUNIN_PLUGIN-on:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
- @${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_\
+ @${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_ \
${STAGEDIR}${PREFIX}/share/munin/plugins/
- @for i in ${MUNIN_ALL}; do\
- ${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_\
- ${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
+ @for i in ${MUNIN_PLUGIN_ALL}; do \
+ ${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_ \
+ ${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i; \
done
@${ECHO_MSG}
@${ECHO_MSG} "============================================================="
@${CAT} ${WRKDIR}/pkg-message
@${ECHO_MSG} "============================================================="
-.endif
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
regression-test: build
- cd ${WRKSRC} && ${MAKE} test
+ (cd ${WRKSRC} && ${MAKE} test)
.include <bsd.port.mk>
Modified: head/dns/unbound/distinfo
==============================================================================
--- head/dns/unbound/distinfo Tue Mar 15 06:08:56 2016 (r411141)
+++ head/dns/unbound/distinfo Tue Mar 15 06:19:52 2016 (r411142)
@@ -1,2 +1,2 @@
-SHA256 (unbound-1.5.7.tar.gz) = 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8
-SIZE (unbound-1.5.7.tar.gz) = 4859573
+SHA256 (unbound-1.5.8.tar.gz) = 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be
+SIZE (unbound-1.5.8.tar.gz) = 4895649
Modified: head/dns/unbound/pkg-plist
==============================================================================
--- head/dns/unbound/pkg-plist Tue Mar 15 06:08:56 2016 (r411141)
+++ head/dns/unbound/pkg-plist Tue Mar 15 06:19:52 2016 (r411142)
@@ -1,9 +1,21 @@
-etc/unbound/unbound.conf.sample
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_class
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_flags
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_opcode
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_rcode
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_type
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_histogram
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_hits
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_memory
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_queue
+ at sample %%ETCDIR%%/unbound.conf.sample
include/unbound.h
-lib/libunbound.so.2.3.10
-lib/libunbound.so.2
-lib/libunbound.so
lib/libunbound.a
+lib/libunbound.so
+lib/libunbound.so.2
+lib/libunbound.so.2.4.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
man/man1/unbound-host.1.gz
man/man3/libunbound.3.gz
man/man3/ub_cancel.3.gz
@@ -48,17 +60,5 @@ sbin/unbound-checkconf
sbin/unbound-control
sbin/unbound-control-setup
sbin/unbound-host
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_class
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_flags
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_opcode
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_rcode
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_type
-%%MUNIN%%etc/munin/plugins/unbound_munin_histogram
-%%MUNIN%%etc/munin/plugins/unbound_munin_hits
-%%MUNIN%%etc/munin/plugins/unbound_munin_memory
-%%MUNIN%%etc/munin/plugins/unbound_munin_queue
-%%MUNIN%%share/munin/plugins/unbound_munin_
+%%MUNIN_PLUGIN%%share/munin/plugins/unbound_munin_
@dir(unbound,,) %%ETCDIR%%
More information about the svn-ports-all
mailing list