[src/trunk]: src/external/bsd/openresolv/dist Sync

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/23b3aaba298c
branches:  trunk
changeset: 744226:23b3aaba298c
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jan 27 21:13:05 2020 +0000

description:
Sync

diffstat:

 external/bsd/openresolv/dist/dnsmasq.in           |   2 +-
 external/bsd/openresolv/dist/libc.in              |   2 +-
 external/bsd/openresolv/dist/named.in             |   2 +-
 external/bsd/openresolv/dist/pdnsd.in             |   2 +-
 external/bsd/openresolv/dist/resolvconf.8.in      |   2 +-
 external/bsd/openresolv/dist/resolvconf.conf.5.in |  10 +++++--
 external/bsd/openresolv/dist/resolvconf.in        |  30 +++++++++++++++++++---
 external/bsd/openresolv/dist/unbound.in           |   2 +-
 8 files changed, 38 insertions(+), 14 deletions(-)

diffs (187 lines):

diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/dnsmasq.in
--- a/external/bsd/openresolv/dist/dnsmasq.in   Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/dnsmasq.in   Mon Jan 27 21:13:05 2020 +0000
@@ -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/libc.in
--- a/external/bsd/openresolv/dist/libc.in      Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/libc.in      Mon Jan 27 21:13:05 2020 +0000
@@ -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/named.in
--- a/external/bsd/openresolv/dist/named.in     Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/named.in     Mon Jan 27 21:13:05 2020 +0000
@@ -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/pdnsd.in
--- a/external/bsd/openresolv/dist/pdnsd.in     Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/pdnsd.in     Mon Jan 27 21:13:05 2020 +0000
@@ -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/resolvconf.8.in
--- a/external/bsd/openresolv/dist/resolvconf.8.in      Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.8.in      Mon Jan 27 21:13:05 2020 +0000
@@ -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/resolvconf.conf.5.in
--- a/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jan 27 21:13:05 2020 +0000
@@ -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 @@
 .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 @@
 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 @@
 .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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/resolvconf.in
--- a/external/bsd/openresolv/dist/resolvconf.in        Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.in        Mon Jan 27 21:13:05 2020 +0000
@@ -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 @@
 
 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 @@
 # 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 @@
                interface_order="$(cat "$SYSCONFDIR"/interface-order)"
        fi
 fi
+
 IFACEDIR="$VARDIR/interfaces"
 METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"
@@ -494,6 +495,23 @@
                        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 @@
        SEARCH=
        NAMESERVERS=
        LOCALNAMESERVERS=
-       
+
        if [ -n "${name_servers}${search_domains}" ]; then
                eval "$(echo_prepend | parse_resolv)"
        fi
@@ -700,9 +718,11 @@
 
 # -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
diff -r 5eebb4939fc1 -r 23b3aaba298c external/bsd/openresolv/dist/unbound.in
--- a/external/bsd/openresolv/dist/unbound.in   Mon Jan 27 21:11:12 2020 +0000
+++ b/external/bsd/openresolv/dist/unbound.in   Mon Jan 27 21:13:05 2020 +0000
@@ -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