Index: head/dns/unbound/Makefile =================================================================== --- head/dns/unbound/Makefile (revision 374076) +++ head/dns/unbound/Makefile (revision 374077) @@ -1,129 +1,126 @@ # Created by: Sergey Matveychuk # $FreeBSD$ PORTNAME= unbound -PORTVERSION= 1.4.22 -PORTREVISION= 5 +PORTVERSION= 1.5.0 CATEGORIES= dns MASTER_SITES= http://unbound.net/downloads/ MAINTAINER= sem@FreeBSD.org COMMENT= Validating, recursive, and caching DNS resolver LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES+= gmake libtool USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE} USE_LDCONFIG= yes USERS= ${PORTNAME} GROUPS= ${PORTNAME} 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 OPTIONS_DEFAULT=THREADS ECDSA -LIBEVENT_DESC= Build against libevent (BROKEN on =10.0-RELEASE) +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 .include LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \ libldns.so:${PORTSDIR}/dns/ldns STRIP_FILES= .libs/libunbound.so unbound-checkconf unbound \ unbound-control .libs/unbound-host .libs/unbound-anchor .if ${PORT_OPTIONS:MPYTHON} USES+= python CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 PYTHON= .else PYTHON= "@comment " .endif .if ${PORT_OPTIONS:MGOST} . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes . endif DEPENDS_ARGS+= WITH_GOST=yes .else CONFIGURE_ARGS+=--disable-gost .endif .if ${PORT_OPTIONS:MECDSA} DEPENDS_ARGS+= WITH_ECDSA=yes .else CONFIGURE_ARGS+=--disable-ecdsa .endif .if ${PORT_OPTIONS:MMUNIN} SUB_FILES+= pkg-message MUNIN_ALL= hits queue memory by_type by_class by_opcode by_rcode \ by_flags histogram MUNIN= .else MUNIN= "@comment " .endif .if ${PORT_OPTIONS:MLIBEVENT} -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000015 -SUB_LIST+= BROKEN="WARNING: Unbound with LIBEVENT crashes if run on FreeBSD 10.0-RELEASE. Update to 10.1-RELEASE or stable/10 after r273137." -.else -SUB_LIST+= BROKEN="" -.endif LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 USES+= pkgconfig CONFIGURE_ARGS+=--with-libevent CPPFLAGS+= $$(pkg-config libevent --cflags-only-I) LDFLAGS+= $$(pkg-config libevent --libs-only-L) .else CONFIGURE_ARGS+=--with-libevent=no .endif .if empty(PORT_OPTIONS:MTHREADS) CONFIGURE_ARGS+=--without-pthreads .endif post-patch: @${MKDIR} ${WRKSRC}/balancer @${RM} ${WRKSRC}/util/configlexer.c + @${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \ + s|$$(configfile); fi|$$(configfile).sample|' \ + ${WRKSRC}/Makefile.in post-build: @for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done post-install: .if ${PORT_OPTIONS:MMUNIN} @${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins @${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins @${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 ;\ done @${ECHO_MSG} @${ECHO_MSG} "=============================================================" @${CAT} ${WRKDIR}/pkg-message @${ECHO_MSG} "=============================================================" .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}; \ for f in ${PORTDOCS}; do \ cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${STAGEDIR}${DOCSDIR}/; \ done .endif .include Index: head/dns/unbound/distinfo =================================================================== --- head/dns/unbound/distinfo (revision 374076) +++ head/dns/unbound/distinfo (revision 374077) @@ -1,2 +1,2 @@ -SHA256 (unbound-1.4.22.tar.gz) = 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f -SIZE (unbound-1.4.22.tar.gz) = 4735801 +SHA256 (unbound-1.5.0.tar.gz) = 9fde4aeb8258bc864cd5e5d6d9b8bcf8fa12a57059424fece1c6adcc6387b876 +SIZE (unbound-1.5.0.tar.gz) = 4811349 Index: head/dns/unbound/files/patch-Makefile.in =================================================================== --- head/dns/unbound/files/patch-Makefile.in (revision 374076) +++ head/dns/unbound/files/patch-Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2014-01-31 14:19:01.000000000 +0400 -+++ Makefile.in 2014-03-13 14:27:03.613703943 +0400 -@@ -497,7 +497,7 @@ - $(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5 - $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup -- if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi -+ $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile).sample - - pythonmod-uninstall: - rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py Property changes on: head/dns/unbound/files/patch-Makefile.in ___________________________________________________________________ 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/unbound/files/pkg-message.in =================================================================== --- head/dns/unbound/files/pkg-message.in (revision 374076) +++ head/dns/unbound/files/pkg-message.in (revision 374077) @@ -1,12 +1,10 @@ Munin support requires additional configuration in the plugin config file: %%PREFIX%%/etc/munin/plugin-conf.d/plugins.conf [unbound*] user root env.statefile %%PREFIX%%/var/munin/plugin-state/unbound-state env.unbound_conf %%PREFIX%%/etc/unbound/unbound.conf env.unbound_control %%PREFIX%%/sbin/unbound-control env.spoof_warn 1000 env.spoof_crit 100000 - -%%BROKEN%% Index: head/dns/unbound/pkg-plist =================================================================== --- head/dns/unbound/pkg-plist (revision 374076) +++ head/dns/unbound/pkg-plist (revision 374077) @@ -1,68 +1,68 @@ etc/unbound/unbound.conf.sample include/unbound.h -lib/libunbound.so.2.2.1 +lib/libunbound.so.2.3.3 lib/libunbound.so.2 lib/libunbound.so lib/libunbound.a man/man1/unbound-host.1.gz man/man3/libunbound.3.gz man/man3/ub_cancel.3.gz man/man3/ub_ctx.3.gz man/man3/ub_ctx_add_ta.3.gz man/man3/ub_ctx_add_ta_file.3.gz man/man3/ub_ctx_async.3.gz man/man3/ub_ctx_config.3.gz man/man3/ub_ctx_create.3.gz man/man3/ub_ctx_data_add.3.gz man/man3/ub_ctx_data_remove.3.gz man/man3/ub_ctx_debuglevel.3.gz man/man3/ub_ctx_debugout.3.gz man/man3/ub_ctx_delete.3.gz man/man3/ub_ctx_get_option.3.gz man/man3/ub_ctx_hosts.3.gz man/man3/ub_ctx_print_local_zones.3.gz man/man3/ub_ctx_resolvconf.3.gz man/man3/ub_ctx_set_fwd.3.gz man/man3/ub_ctx_set_option.3.gz man/man3/ub_ctx_trustedkeys.3.gz man/man3/ub_ctx_zone_add.3.gz man/man3/ub_ctx_zone_remove.3.gz man/man3/ub_fd.3.gz man/man3/ub_poll.3.gz man/man3/ub_process.3.gz man/man3/ub_resolve.3.gz man/man3/ub_resolve_async.3.gz man/man3/ub_resolve_free.3.gz man/man3/ub_result.3.gz man/man3/ub_strerror.3.gz man/man3/ub_wait.3.gz man/man5/unbound.conf.5.gz man/man8/unbound-anchor.8.gz man/man8/unbound-checkconf.8.gz man/man8/unbound-control-setup.8.gz man/man8/unbound-control.8.gz man/man8/unbound.8.gz sbin/unbound sbin/unbound-anchor sbin/unbound-checkconf sbin/unbound-control sbin/unbound-control-setup sbin/unbound-host %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2.2.1 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.2.3.3 %%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_ @unexec rm -fr /var/run/unbound @exec chown unbound %D/etc/unbound