Module Name: src
Committed By: roy
Date: Mon Jan 27 21:13:05 UTC 2020
Modified Files:
src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in pdnsd.in
resolvconf.8.in resolvconf.conf.5.in resolvconf.in unbound.in
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/dist/dnsmasq.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/libc.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/named.in \
src/external/bsd/openresolv/dist/pdnsd.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openresolv/dist/resolvconf.8.in
cvs rdiff -u -r1.19 -r1.20 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openresolv/dist/resolvconf.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/unbound.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/dnsmasq.in
diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.5 src/external/bsd/openresolv/dist/dnsmasq.in:1.6
--- src/external/bsd/openresolv/dist/dnsmasq.in:1.5 Sun Sep 8 20:48:50 2019
+++ src/external/bsd/openresolv/dist/dnsmasq.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2019 Roy Marples
+# Copyright (c) 2007-2020 Roy Marples
# All rights reserved
# dnsmasq subscriber for resolvconf
Index: src/external/bsd/openresolv/dist/libc.in
diff -u src/external/bsd/openresolv/dist/libc.in:1.4 src/external/bsd/openresolv/dist/libc.in:1.5
--- src/external/bsd/openresolv/dist/libc.in:1.4 Wed Jul 17 18:31:43 2019
+++ src/external/bsd/openresolv/dist/libc.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2019 Roy Marples
+# Copyright (c) 2007-2020 Roy Marples
# All rights reserved
# libc subscriber for resolvconf
Index: src/external/bsd/openresolv/dist/named.in
diff -u src/external/bsd/openresolv/dist/named.in:1.3 src/external/bsd/openresolv/dist/named.in:1.4
--- src/external/bsd/openresolv/dist/named.in:1.3 Tue Oct 9 01:28:35 2018
+++ src/external/bsd/openresolv/dist/named.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2016 Roy Marples
+# Copyright (c) 2007-2020 Roy Marples
# All rights reserved
# named subscriber for resolvconf
Index: src/external/bsd/openresolv/dist/pdnsd.in
diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.3 src/external/bsd/openresolv/dist/pdnsd.in:1.4
--- src/external/bsd/openresolv/dist/pdnsd.in:1.3 Wed Jul 17 18:31:43 2019
+++ src/external/bsd/openresolv/dist/pdnsd.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2010-2018 Roy Marples
+# Copyright (c) 2010-2020 Roy Marples
# All rights reserved
# pdnsd subscriber for resolvconf
Index: src/external/bsd/openresolv/dist/resolvconf.8.in
diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 src/external/bsd/openresolv/dist/resolvconf.8.in:1.10
--- src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 Fri Dec 30 19:43:36 2016
+++ src/external/bsd/openresolv/dist/resolvconf.8.in Mon Jan 27 21:13:05 2020
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2007-2016 Roy Marples
+.\" Copyright (c) 2007-2020 Roy Marples
.\" All rights reserved
.\"
.\" Redistribution and use in source and binary forms, with or without
Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.20
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 Sun Sep 8 20:48:50 2019
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jan 27 21:13:05 2020
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009-2016 Roy Marples
+.\" Copyright (c) 2009-2020 Roy Marples
.\" All rights reserved
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,10 @@ Set to NO to disable
.Nm resolvconf
from running any subscribers.
Defaults to YES.
+.It Sy allow_interfaces
+If set, only these interfaces will be processed.
+.It Sy deny_interfaces
+If set, these interfaces will not be processed.
.It Sy interface_order
These interfaces will always be processed first.
If unset, defaults to the following:-
@@ -71,7 +75,7 @@ lo lo[0-9]*
These interfaces will be processed next, unless they have a metric.
If unset, defaults to the following:-
.Bd -compact -literal -offset indent
-tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*
+tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]*
.Ed
.It Sy inclusive_interfaces
Ignore any exclusive marking for these interfaces.
@@ -212,7 +216,7 @@ openresolv ships with subscribers for th
.Xr dnsmasq 8 ,
.Xr named 8 ,
.Xr pdnsd 8 ,
-.Xr pdns_recursor 8 ,
+.Xr pdns_recursor 1 ,
and
.Xr unbound 8 .
Each subscriber can create configuration files which should be included in
Index: src/external/bsd/openresolv/dist/resolvconf.in
diff -u src/external/bsd/openresolv/dist/resolvconf.in:1.6 src/external/bsd/openresolv/dist/resolvconf.in:1.7
--- src/external/bsd/openresolv/dist/resolvconf.in:1.6 Sun Sep 8 20:48:50 2019
+++ src/external/bsd/openresolv/dist/resolvconf.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2007-2019 Roy Marples
+# Copyright (c) 2007-2020 Roy Marples
# All rights reserved
# Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RESOLVCONF="$0"
-OPENRESOLV_VERSION="3.9.2"
+OPENRESOLV_VERSION="3.10.0"
SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@
@@ -34,7 +34,7 @@ RESTARTCMD=@RESTARTCMD@
if [ "$1" = "--version" ]; then
echo "openresolv $OPENRESOLV_VERSION"
- echo "Copyright (c) 2007-2016 Roy Marples"
+ echo "Copyright (c) 2007-2020 Roy Marples"
exit 0
fi
@@ -44,7 +44,7 @@ unset interface_order state_dir
# If you change this, change the test in VFLAG and libc.in as well
local_nameservers="127.* 0.0.0.0 255.255.255.255 ::1"
-dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*"
+dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]*"
interface_order="lo lo[0-9]*"
name_server_blacklist="0.0.0.0"
@@ -59,6 +59,7 @@ elif [ -d "$SYSCONFDIR/resolvconf" ]; th
interface_order="$(cat "$SYSCONFDIR"/interface-order)"
fi
fi
+
IFACEDIR="$VARDIR/interfaces"
METRICDIR="$VARDIR/metrics"
PRIVATEDIR="$VARDIR/private"
@@ -494,6 +495,23 @@ list_resolv()
fi
continue
fi
+
+ if ! $ALLIFACES; then
+ if [ -n "$allow_interfaces" ]; then
+ x=false
+ for j in $allow_interfaces; do
+ if [ "$i" = "$j" ]; then
+ x=true
+ fi
+ done
+ $x || continue
+ fi
+ for j in $deny_interfaces; do
+ if [ "$i" = "$j" ]; then
+ continue 2
+ fi
+ done
+ fi
if [ "$cmd" = i ] || [ "$cmd" = "-i" ]; then
printf %s "$i "
@@ -605,7 +623,7 @@ make_vars()
SEARCH=
NAMESERVERS=
LOCALNAMESERVERS=
-
+
if [ -n "${name_servers}${search_domains}" ]; then
eval "$(echo_prepend | parse_resolv)"
fi
@@ -700,9 +718,11 @@ fi
# -l lists our resolv files, optionally for a specific interface
if [ "$cmd" = l ] || [ "$cmd" = i ]; then
+ ALLIFACES=true
list_resolv "$cmd" "$args"
exit $?
fi
+ALLIFACES=false
# Restart a service or echo the command to restart a service
if [ "$cmd" = r ] || [ "$cmd" = R ]; then
Index: src/external/bsd/openresolv/dist/unbound.in
diff -u src/external/bsd/openresolv/dist/unbound.in:1.2 src/external/bsd/openresolv/dist/unbound.in:1.3
--- src/external/bsd/openresolv/dist/unbound.in:1.2 Tue Oct 9 01:28:35 2018
+++ src/external/bsd/openresolv/dist/unbound.in Mon Jan 27 21:13:05 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2009-2016 Roy Marples
+# Copyright (c) 2009-2020 Roy Marples
# All rights reserved
# unbound subscriber for resolvconf
