On 2/2/16, Pedro F. Giffuni <p...@freebsd.org> wrote:
> Author: pfg
> Date: Tue Feb 2 21:10:43 2016
> New Revision: 295165
> URL: https://svnweb.freebsd.org/changeset/base/295165
>
> Log:
> MFV r295109:
> Update openresolve to version 3.7.2
This was not 3.7.1?
>
> Relnotes: yes
>
> Modified:
> head/contrib/openresolv/Makefile
> head/contrib/openresolv/resolvconf.8.in
> head/contrib/openresolv/resolvconf.conf.5.in
> head/contrib/openresolv/resolvconf.in
> head/contrib/openresolv/unbound.in
> Directory Properties:
> head/contrib/openresolv/ (props changed)
>
> Modified: head/contrib/openresolv/Makefile
> ==============================================================================
> --- head/contrib/openresolv/Makefile Tue Feb 2 21:06:09 2016
> (r295164)
> +++ head/contrib/openresolv/Makefile Tue Feb 2 21:10:43 2016
> (r295165)
> @@ -1,5 +1,5 @@
> PKG= openresolv
> -VERSION= 3.7.0
> +VERSION= 3.7.1
>
> # Nasty hack so that make clean works without configure being run
> _CONFIG_MK!= test -e config.mk && echo config.mk || echo config-null.mk
> @@ -37,7 +37,7 @@ SED_RESTARTCMD= -e 's:@RESTARTCMD \(.*\
>
> DISTPREFIX?= ${PKG}-${VERSION}
> DISTFILEGZ?= ${DISTPREFIX}.tar.gz
> -DISTFILE?= ${DISTPREFIX}.tar.bz2
> +DISTFILE?= ${DISTPREFIX}.tar.xz
> FOSSILID?= current
>
> .SUFFIXES: .in
> @@ -77,9 +77,9 @@ install: proginstall maninstall
> import:
> rm -rf /tmp/${DISTPREFIX}
> ${INSTALL} -d /tmp/${DISTPREFIX}
> - cp README ${SRCS} /tmp/${DISPREFIX}
> + cp README ${SRCS} /tmp/${DISTPREFIX}
>
> dist:
> fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ}
> - gunzip -c ${DISTFILEGZ} | bzip2 >${DISTFILE}
> + gunzip -c ${DISTFILEGZ} | xz >${DISTFILE}
> rm ${DISTFILEGZ}
>
> Modified: head/contrib/openresolv/resolvconf.8.in
> ==============================================================================
> --- head/contrib/openresolv/resolvconf.8.in Tue Feb 2 21:06:09
> 2016 (r295164)
> +++ head/contrib/openresolv/resolvconf.8.in Tue Feb 2 21:10:43
> 2016 (r295165)
> @@ -22,7 +22,7 @@
> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> .\" SUCH DAMAGE.
> .\"
> -.Dd April 27, 2014
> +.Dd April 27, 2015
> .Dt RESOLVCONF 8
> .Os
> .Sh NAME
>
> Modified: head/contrib/openresolv/resolvconf.conf.5.in
> ==============================================================================
> --- head/contrib/openresolv/resolvconf.conf.5.in Tue Feb 2 21:06:09
> 2016 (r295164)
> +++ head/contrib/openresolv/resolvconf.conf.5.in Tue Feb 2 21:10:43
> 2016 (r295165)
> @@ -22,7 +22,7 @@
> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> .\" SUCH DAMAGE.
> .\"
> -.Dd March 20, 2015
> +.Dd May 14, 2015
> .Dt RESOLVCONF.CONF 5
> .Os
> .Sh NAME
> @@ -91,6 +91,11 @@ To remove a block, you can use 192.168.*
> These interfaces name servers will only be queried for the domains listed
> in their resolv.conf.
> Useful for VPN domains.
> +Setting
> +.Sy private_interfaces Ns ="*"
> +will stop the forwarding of the root zone and allows the local resolver to
> +recursively query the root servers directly.
> +Requires a local nameserver other than libc.
> This is equivalent to the
> .Nm resolvconf -p
> option.
> @@ -149,7 +154,7 @@ When set to /dev/null or NULL,
> .Sy resolv_conf_local_only
> is defaulted to NO,
> .Sy local_nameservers
> -is unset unless overriden and only the information set in
> +is unset unless overridden and only the information set in
> .Nm
> is written to
> .Sy resolv_conf .
> @@ -271,7 +276,7 @@ Each subscriber attempts to automaticall
> distribution has been catered for.
> Also, users could equally want to use a different version from the one
> installed by default, such as bind8 and bind9.
> -To accomodate this, the subscribers have these files in configurable
> +To accommodate this, the subscribers have these files in configurable
> variables, documented below.
> .Pp
> .Bl -tag -width indent
>
> Modified: head/contrib/openresolv/resolvconf.in
> ==============================================================================
> --- head/contrib/openresolv/resolvconf.in Tue Feb 2 21:06:09
> 2016 (r295164)
> +++ head/contrib/openresolv/resolvconf.in Tue Feb 2 21:10:43
> 2016 (r295165)
> @@ -50,7 +50,6 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; th
> interface_order="$(cat "$SYSCONFDIR"/interface-order)"
> fi
> fi
> -TMPDIR="$VARDIR/tmp"
> IFACEDIR="$VARDIR/interfaces"
> METRICDIR="$VARDIR/metrics"
> PRIVATEDIR="$VARDIR/private"
>
> Modified: head/contrib/openresolv/unbound.in
> ==============================================================================
> --- head/contrib/openresolv/unbound.in Tue Feb 2 21:06:09 2016
> (r295164)
> +++ head/contrib/openresolv/unbound.in Tue Feb 2 21:10:43 2016
> (r295165)
> @@ -45,7 +45,8 @@ for d in $DOMAINS; do
> ns="${d#*:}"
> case "$unbound_insecure" in
> [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
> - newconf="$newconf${NL}domain-insecure: \"$dn\""
> + newconf="$newconf${NL}server:$NL"
> + newconf="$newconf domain-insecure: \"$dn\"$NL"
> ;;
> esac
> newconf="$newconf${NL}forward-zone:$NL name: \"$dn\"$NL"
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
