diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index fb1bc1324b1c..06b1ea56ebd6 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unbound -PORTVERSION= 1.10.1 +PORTVERSION= 1.11.0 CATEGORIES= dns MASTER_SITES= https://www.nlnetlabs.nl/downloads/unbound/ \ https://distfiles.crux.guru/ @@ -89,9 +89,7 @@ post-patch: ${WRKSRC}/Makefile.in post-patch-FILTER_AAAA-on: - ${SED} 's/INIT_REQUEST_STATE, FINISHED_STATE, &subq, 1/&, 0/' \ - ${WRKSRC}/contrib/aaaa-filter-iterator.patch | \ - ${PATCH} -d ${WRKSRC} -p1 -s + ${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 diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo index a2e51846d01c..c56228cce0b4 100644 --- a/dns/unbound/distinfo +++ b/dns/unbound/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589875287 -SHA256 (unbound-1.10.1.tar.gz) = b73677c21a71cf92f15cc8cfe76a3d875e40f65b6150081c39620b286582d536 -SIZE (unbound-1.10.1.tar.gz) = 5729334 +TIMESTAMP = 1595844570 +SHA256 (unbound-1.11.0.tar.gz) = 9f2f0798f76eb8f30feaeda7e442ceed479bc54db0e3ac19c052d68685e51ef7 +SIZE (unbound-1.11.0.tar.gz) = 5900967 diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in index 42b1d5b3bdb6..ec9e475639d7 100644 --- a/dns/unbound/files/unbound.in +++ b/dns/unbound/files/unbound.in @@ -12,7 +12,8 @@ # root.hints (-r). Useful for when /etc/resolv.conf only contains 127.0.0.1 # # PROVIDE: unbound -# REQUIRE: SERVERS cleanvar +# REQUIRE: FILESYSTEMS defaultroute netwait resolv +# BEFORE: NETWORKING # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable unbound: @@ -22,7 +23,6 @@ # You could set alternative config with # unbound_config="/path/to/config" # -# # Multiple profiles are supported with # # unbound_profiles="name1 name2" @@ -66,7 +66,7 @@ start_precmd() su -m unbound -c "%%PREFIX%%/sbin/unbound-anchor ${unbound_anchorflags}" fi echo . - %%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} > /dev/null + %%PREFIX%%/sbin/unbound-checkconf ${unbound_config} > /dev/null return $? } @@ -76,7 +76,7 @@ load_rc_config "${name}" : ${unbound_config:=%%PREFIX%%/etc/unbound/unbound.conf} # Set PID file -pidfile=$(%%PREFIX%%/sbin/unbound-checkconf -o pidfile %%PREFIX%%/etc/unbound/unbound.conf) +pidfile=$(%%PREFIX%%/sbin/unbound-checkconf -o pidfile ${unbound_config}) required_files=${unbound_config} command="%%PREFIX%%/sbin/${name}" @@ -84,7 +84,7 @@ command_args="-c ${unbound_config}" unbound_anchorflags=${unbound_anchorflags:-""} extra_commands="reload" start_precmd="start_precmd" -reload_precmd="%%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} >/dev/null" +reload_precmd="%%PREFIX%%/sbin/unbound-checkconf ${unbound_config} >/dev/null" load_rc_config "${name}" diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist index e61414b95797..2fc74fce677e 100644 --- a/dns/unbound/pkg-plist +++ b/dns/unbound/pkg-plist @@ -5,7 +5,7 @@ libdata/pkgconfig/libunbound.pc lib/libunbound.a lib/libunbound.so lib/libunbound.so.8 -lib/libunbound.so.8.1.8 +lib/libunbound.so.8.1.9 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py