aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-02-01 00:55:15 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-02-01 00:55:15 +0000
commit4ad8676058916450a892eb247dcd43250a9c94fd (patch)
treef2163e11b4e907cc68b209710b6e61282fc16795
parente995a96df6632aab983c0fb138f1db55a90d5bf6 (diff)
downloadsrc-4ad8676058916450a892eb247dcd43250a9c94fd.tar.gz
src-4ad8676058916450a892eb247dcd43250a9c94fd.zip
Import openresolv 3.7.2vendor/openresolv/3.7.2
Notes
Notes: svn path=/vendor/openresolv/dist/; revision=295109 svn path=/vendor/openresolv/3.7.2/; revision=295111; tag=vendor/openresolv/3.7.2
-rw-r--r--Makefile8
-rw-r--r--resolvconf.8.in2
-rw-r--r--resolvconf.conf.5.in11
-rw-r--r--resolvconf.in1
-rw-r--r--unbound.in3
5 files changed, 15 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index aca2cb531769..a898b95e6b51 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \(.*\)@:${RESTARTCMD}:g'
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}
diff --git a/resolvconf.8.in b/resolvconf.8.in
index 10dcf5dd7399..bfbfc7f4726a 100644
--- a/resolvconf.8.in
+++ b/resolvconf.8.in
@@ -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
diff --git a/resolvconf.conf.5.in b/resolvconf.conf.5.in
index d4f654308e9e..7aa14507f4e8 100644
--- a/resolvconf.conf.5.in
+++ b/resolvconf.conf.5.in
@@ -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 automatically configure itself, but not every
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
diff --git a/resolvconf.in b/resolvconf.in
index 3b2b0f53fd83..a946ed8c44b5 100644
--- a/resolvconf.in
+++ b/resolvconf.in
@@ -50,7 +50,6 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; then
interface_order="$(cat "$SYSCONFDIR"/interface-order)"
fi
fi
-TMPDIR="$VARDIR/tmp"
IFACEDIR="$VARDIR/interfaces"
METRICDIR="$VARDIR/metrics"
PRIVATEDIR="$VARDIR/private"
diff --git a/unbound.in b/unbound.in
index 5752e6f2c412..a803615783fc 100644
--- a/unbound.in
+++ b/unbound.in
@@ -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"