diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index c5fc08a0b731..32f7aab536b8 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -1,119 +1,120 @@ # Created by: Sergey Matveychuk PORTNAME= unbound -DISTVERSION= 1.14.0 +DISTVERSION= 1.15.0 CATEGORIES= dns MASTER_SITES= https://www.nlnetlabs.nl/downloads/unbound/ \ https://distfiles.crux.guru/ MAINTAINER= jaap@NLnetLabs.nl COMMENT= Validating, recursive, and caching DNS resolver LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 USES= autoreconf cpe libtool pkgconfig ssl - CPE_VENDOR= nlnetlabs -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE} USE_LDCONFIG= yes +USE_RC_SUBR= unbound + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-libexpat=${LOCALBASE} \ + --with-ssl=${OPENSSLBASE} TEST_TARGET= test USERS= ${PORTNAME} GROUPS= ${PORTNAME} -USE_RC_SUBR= unbound +PORTDOCS= CNAME-basedRedirectionDesignNotes.pdf CREDITS Changelog \ + FEATURES IP-BasedActions.pdf LICENSE README README.DNS64 \ + README.ipset.md README.svn README.tests TODO \ + control_proto_spec.txt example.conf ietf67-design-02.odp \ + ietf67-design-02.pdf requirements.txt + +OPTIONS_DEFINE= DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH ECDSA EVAPI \ + FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN PYTHON \ + SUBNET TFOCL TFOSE THREADS +OPTIONS_DEFAULT= DOH ECDSA GOST LIBEVENT THREADS +OPTIONS_SUB= yes -PORTDOCS= CREDITS Changelog FEATURES LICENSE README \ - README.DNS64 README.ipset.md README.svn README.tests \ - TODO control_proto_spec.txt ietf67-design-02.odp \ - ietf67-design-02.pdf requirements.txt example.conf \ - CNAME-basedRedirectionDesignNotes.pdf IP-BasedActions.pdf - -OPTIONS_SUB= yes -OPTIONS_DEFINE= THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT \ - FILTER_AAAA DNSTAP DNSCRYPT SUBNET EVAPI TFOCL TFOSE \ - HIREDIS DOH DEP-RSA1024 -OPTIONS_DEFAULT=THREADS ECDSA LIBEVENT GOST DOH - -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_PLUGIN_DESC= Install Munin plugin -FILTER_AAAA_DESC= Build with AAAA filter functionality (contrib) -DNSTAP_DESC= Enable dnstap logging support -DNSCRYPT_DESC= Enable dnscrypt support -SUBNET_DESC= Enable client subnet support -EVAPI_DESC= (Experimental) pluggable event based libunbound API support -TFOCL_DESC= Enable TCP Fast Open for client mode -TFOSE_DESC= Enable TCP Fast Open for server mode -HIREDIS_DESC= Enable hiredis support for the cachedb module -DOH_DESC= Enable DNS-over-HTTPS support DEP-RSA1024_DESC= Deprecate the use of RSA 1024 keys +DNSCRYPT_DESC= Enable dnscrypt support +DNSTAP_DESC= Enable dnstap logging support +DOH_DESC= Enable DNS-over-HTTPS support +ECDSA_DESC= Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0) +EVAPI_DESC= (Experimental) pluggable event based libunbound API support +FILTER_AAAA_DESC= Build with AAAA filter functionality (contrib) +GOST_DESC= Enable GOST support (requires OpenSSL >= 1.0) +HIREDIS_DESC= Enable hiredis support for the cachedb module +LIBEVENT_DESC= Build against libevent +MUNIN_PLUGIN_DESC= Install Munin plugin +SUBNET_DESC= Enable client subnet support +TFOCL_DESC= Enable TCP Fast Open for client mode +TFOSE_DESC= Enable TCP Fast Open for server mode -STRIP_FILES= .libs/libunbound.so unbound-checkconf unbound \ - unbound-control .libs/unbound-host .libs/unbound-anchor +STRIP_FILES= .libs/libunbound.so unbound-checkconf unbound unbound-control \ + .libs/unbound-host .libs/unbound-anchor -DNSTAP_CONFIGURE_ENABLE=dnstap -DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ - libprotobuf-c.so:devel/protobuf-c +DEP-RSA1024_CONFIGURE_ON= --with-deprecate-rsa-1024 +DNSCRYPT_LIB_DEPENDS= libsodium.so:security/libsodium DNSCRYPT_CONFIGURE_ENABLE= dnscrypt -DNSCRYPT_LIB_DEPENDS= libsodium.so:security/libsodium +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c +DNSTAP_CONFIGURE_ENABLE= dnstap +DOH_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 +ECDSA_CONFIGURE_ENABLE= ecdsa +ECDSA_VARS= DEPENDS_ARGS+=WITH_ECDSA=yes +EVAPI_CONFIGURE_ENABLE= event-api +GOST_CONFIGURE_ENABLE= gost +GOST_VARS= DEPENDS_ARGS+=WITH_GOST=yes +HIREDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +HIREDIS_CONFIGURE_ON= --enable-cachedb \ + --with-libhiredis +LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent +LIBEVENT_CONFIGURE_WITH= libevent +LIBEVENT_CPPFLAGS+= $$(pkg-config libevent --cflags-only-I) +LIBEVENT_LDFLAGS+= $$(pkg-config libevent --libs-only-L) +MUNIN_PLUGIN_SUB_FILES= pkg-message +PYTHON_BUILD_DEPENDS= swig:devel/swig +PYTHON_USES= python +PYTHON_CONFIGURE_ON= --with-pythonmodule=yes \ + --with-pyunbound=yes \ + ac_cv_path_SWIG=${LOCALBASE}/bin/swig \ + LDFLAGS="-L${LOCALBASE}/lib" +PYTHON_VARS= STRIP_FILES+=.libs/_unbound.so SUBNET_CONFIGURE_ENABLE= subnet -EVAPI_CONFIGURE_ENABLE= event-api -TFOCL_CONFIGURE_ENABLE= tfo-client -TFOSE_CONFIGURE_ENABLE= tfo-server -ECDSA_CONFIGURE_ENABLE= ecdsa -ECDSA_VARS= DEPENDS_ARGS+=WITH_ECDSA=yes -GOST_CONFIGURE_ENABLE= gost -GOST_VARS= DEPENDS_ARGS+=WITH_GOST=yes -LIBEVENT_CONFIGURE_WITH=libevent -LIBEVENT_CPPFLAGS+= $$(pkg-config libevent --cflags-only-I) -LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent -LIBEVENT_LDFLAGS+= $$(pkg-config libevent --libs-only-L) -MUNIN_PLUGIN_SUB_FILES= pkg-message -PYTHON_BUILD_DEPENDS= swig:devel/swig -PYTHON_CONFIGURE_ON= --with-pyunbound=yes --with-pythonmodule=yes \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ac_cv_path_SWIG=${LOCALBASE}/bin/swig -PYTHON_USES= python -PYTHON_VARS= STRIP_FILES+=.libs/_unbound.so -THREADS_CONFIGURE_WITH= pthreads -HIREDIS_CONFIGURE_ON= --enable-cachedb --with-libhiredis -HIREDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis -DOH_CONFIGURE_ON= --with-libnghttp2 -DOH_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -DEP-RSA1024_CONFIGURE_ON= --with-deprecate-rsa-1024 +TFOCL_CONFIGURE_ENABLE= tfo-client +TFOSE_CONFIGURE_ENABLE= tfo-server +THREADS_CONFIGURE_WITH= pthreads post-patch: @${RM} ${WRKSRC}/util/configlexer.c @${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \ s|$$(configfile); fi|$$(configfile).sample|' \ ${WRKSRC}/Makefile.in post-patch-FILTER_AAAA-on: ${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s post-build: @for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done -post-install-PYTHON-on: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} post-install-MUNIN_PLUGIN-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins ${INSTALL_SCRIPT} ${WRKDIR}/unbound-${DISTVERSION}/contrib/unbound_munin_ \ ${STAGEDIR}${PREFIX}/share/munin/plugins/ @${ECHO_MSG} @${ECHO_MSG} "=============================================================" @${CAT} ${WRKDIR}/pkg-message @${ECHO_MSG} "=============================================================" -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} +post-install-PYTHON-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so .include diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo index 4d4f8c97286d..1d08d512c280 100644 --- a/dns/unbound/distinfo +++ b/dns/unbound/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639041796 -SHA256 (unbound-1.14.0.tar.gz) = 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 -SIZE (unbound-1.14.0.tar.gz) = 6152326 +TIMESTAMP = 1644483707 +SHA256 (unbound-1.15.0.tar.gz) = a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f +SIZE (unbound-1.15.0.tar.gz) = 6163470 diff --git a/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch b/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch deleted file mode 100644 index c3e5fa607c2b..000000000000 --- a/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- contrib/aaaa-filter-iterator.patch.orig 2021-12-20 17:00:58 UTC -+++ contrib/aaaa-filter-iterator.patch -@@ -109,9 +109,9 @@ index 7bc67da6..e10f547a 100644 - iter_env->supports_ipv6 = cfg->do_ip6; - iter_env->supports_ipv4 = cfg->do_ip4; - + iter_env->aaaa_filter = cfg->aaaa_filter; -+ iter_env->outbound_msg_retry = cfg->outbound_msg_retry; - return 1; - } -- - diff --git a/iterator/iterator.c b/iterator/iterator.c - index 23b07ea9..ca29b48c 100644 - --- a/iterator/iterator.c -@@ -387,15 +387,15 @@ index 1d0e8658..f284dd43 100644 - %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE - %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE - %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE --@@ -233,6 +234,7 @@ content_server: server_num_threads | server_verbosity | server_port | -+@@ -244,6 +244,7 @@ content_server: server_num_threads | server_verbosity | server_port | - server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size | - server_harden_referral_path | server_private_address | -- server_private_domain | server_extended_statistics | -+ server_private_domain | server_extended_statistics | - + server_aaaa_filter | -- server_local_data_ptr | server_jostle_timeout | -- server_unwanted_reply_threshold | server_log_time_ascii | -- server_domain_insecure | server_val_sig_skew_min | --@@ -1563,6 +1565,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG -+ server_local_data_ptr | server_jostle_timeout | -+ server_unwanted_reply_threshold | server_log_time_ascii | -+ -+@@ -1742,6 +1744,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG - yyerror("out of memory"); - } - ; diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist index a154daac7086..51a13b64bc5f 100644 --- a/dns/unbound/pkg-plist +++ b/dns/unbound/pkg-plist @@ -1,57 +1,57 @@ @sample %%ETCDIR%%/unbound.conf.sample include/unbound.h %%EVAPI%%include/unbound-event.h libdata/pkgconfig/libunbound.pc lib/libunbound.a lib/libunbound.so lib/libunbound.so.8 -lib/libunbound.so.8.1.14 +lib/libunbound.so.8.1.15 %%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 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 %%MUNIN_PLUGIN%%share/munin/plugins/unbound_munin_ @dir(unbound,,) %%ETCDIR%%