[src/ROY]: src/external/bsd/openresolv/dist Import openresolv-3.5.5 with the ...

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

details:   https://anonhg.NetBSD.org/src/rev/64e4db5838f0
branches:  ROY
changeset: 454311:64e4db5838f0
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Jun 04 09:37:21 2013 +0000

description:
Import openresolv-3.5.5 with the following changes from 3.5.3
 * Fix setting IPv6 namservers over DBus to dnsmasq
 * Fix pdnsd config file generation
 * Man page fixes

diffstat:

 external/bsd/openresolv/dist/dnsmasq.in           |  28 ++++++---------
 external/bsd/openresolv/dist/pdnsd.in             |   8 ++--
 external/bsd/openresolv/dist/resolvconf.conf.5.in |  40 ++++++++++++----------
 external/bsd/openresolv/dist/resolvconf.in        |   4 ++
 4 files changed, 40 insertions(+), 40 deletions(-)

diffs (216 lines):

diff -r ed3f6bb6687b -r 64e4db5838f0 external/bsd/openresolv/dist/dnsmasq.in
--- a/external/bsd/openresolv/dist/dnsmasq.in   Thu Dec 06 11:38:17 2012 +0000
+++ b/external/bsd/openresolv/dist/dnsmasq.in   Tue Jun 04 09:37:21 2013 +0000
@@ -47,23 +47,17 @@
 # Check for DBus support in the binary
 dbus=false
 dbus_ex=false
-: ${dbus_pid:=/var/run/dbus/dbus.pid}
-[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus.pid
-[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus/pid
-if [ -s "$dbus_pid" -a -s "$dnsmasq_pid" ]; then
-       if dnsmasq --version 2>/dev/null | \
-               grep -q "^Compile time options.*[[:space:]]DBus[[:space:]]"
+dbus_introspect=$(dbus-send --print-reply --system \
+       --dest=uk.org.thekelleys.dnsmasq \
+       /uk/org/thekelleys/dnsmasq \
+       org.freedesktop.DBus.Introspectable.Introspect \
+       2>/dev/null)
+if [ $? = 0 ]; then
+       dbus=true
+       if printf %s "$dbus_introspect" | \
+           grep -q '<method name="SetDomainServers">'
        then
-               # Sanity - check that dnsmasq and dbus are running
-               if kill -0 $(cat "$dbus_pid") 2>/dev/null && \
-                       kill -0 $(cat "$dnsmasq_pid") 2>/dev/null
-               then
-                       dbus=true
-                       if dbus-send --print-reply --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq org.freedesktop.DBus.Introspectable.Introspect | grep -q '<method 
name="SetDomainServers">'
-                       then
-                               dbus_ex=true
-                       fi
-               fi
+               dbus_ex=true
        fi
 fi
 
@@ -151,7 +145,7 @@
 
 if $dbus; then
        newconf="$newconf$NL# Domain specific servers will"
-       newconf="$newconf be sent over dbus${NL}enable-dbus$NL"
+       newconf="$newconf be sent over dbus${NL}"
 else
        newconf="$newconf$conf"
 fi
diff -r ed3f6bb6687b -r 64e4db5838f0 external/bsd/openresolv/dist/pdnsd.in
--- a/external/bsd/openresolv/dist/pdnsd.in     Thu Dec 06 11:38:17 2012 +0000
+++ b/external/bsd/openresolv/dist/pdnsd.in     Tue Jun 04 09:37:21 2013 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2010-2011 Roy Marples
+# Copyright (c) 2010-2013 Roy Marples
 # All rights reserved
 
 # pdnsd subscriber for resolvconf
@@ -82,7 +82,7 @@
        return 0
 }
 
-newresolv="# Generated by resolvconf\n"
+newresolv="# Generated by resolvconf$NL"
 changed=false
 
 # Try to ensure that config dirs exist
@@ -94,7 +94,7 @@
 
 if [ -n "$pdnsd_resolv" ]; then
        for n in $NAMESERVERS; do
-               newresolv="${newresolv}nameserver $n\n"
+               newresolv="${newresolv}nameserver $n$NL"
        done
 fi
 
@@ -146,7 +146,7 @@
        fi
        if change_file "$pdnsd_conf" "$cf"; then
                changed=true
-       fi      
+       fi
 fi
 
 if [ -n "$pdnsd_resolv" ]; then
diff -r ed3f6bb6687b -r 64e4db5838f0 external/bsd/openresolv/dist/resolvconf.conf.5.in
--- a/external/bsd/openresolv/dist/resolvconf.conf.5.in Thu Dec 06 11:38:17 2012 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.conf.5.in Tue Jun 04 09:37:21 2013 +0000
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009-2012 Roy Marples
+.\" Copyright (c) 2009-2013 Roy Marples
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 2, 2012
+.Dd April 27, 2013
 .Dt RESOLVCONF.CONF 5 SMM
 .Os
 .Sh NAME
@@ -108,11 +108,12 @@
 A libc resolver sortlist, as specified in
 .Xr resolv.conf 5 .
 .It Sy resolv_conf_local_only
-If a local nameserver is configured then the default is just to specify that
+If a local name server is configured then the default is just to specify that
 and ignore all other entries as they will be configured for the local
-nameserver.
-Set this to YES to list them instead, if you need working DNS and the local
-nameserver stops functioning at the expense of duplicated server queries.
+name server.
+Set this to NO to also list non-local nameservers.
+This will give you working DNS even if the local nameserver stops functioning
+at the expense of duplicated server queries.
 .El
 .Sh SUBSCRIBER OPTIONS
 openresolv ships with subscribers for the name servers
@@ -125,28 +126,31 @@
 in the subscribers main configuration file.
 .Bl -tag -width indent
 .It Sy dnsmasq_conf
-This file tells dnsmasq which nameservers to use for specific domains.
+This file tells dnsmasq which name servers to use for specific domains.
 .It Sy dnsmasq_resolv
-This file tells dnsmasq which nameservers to use for global lookups.
+This file tells dnsmasq which name servers to use for global lookups.
 .Pp
 Example resolvconf.conf for dnsmasq:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 dnsmasq_conf=/etc/dnsmasq-conf.conf
 .D1 dnsmasq_resolv=/etc/dnsmasq-resolv.conf
 .Pp
 Example dnsmasq.conf:
 .D1 listen-address=127.0.0.1
+.D1 # If dnsmasq is compiled for DBus then we can take
+.D1 # advantage of not having to restart dnsmasq.
+.D1 enable-dbus
 .D1 conf-file=/etc/dnsmasq-conf.conf
 .D1 resolv-file=/etc/dnsmasq-resolv.conf
 .It Sy named_options
 Include this file in the named options block.
-This file tells named which nameservers to use for global lookups.
+This file tells named which name servers to use for global lookups.
 .It Sy named_zones
 Include this file in the named global scope, after the options block.
-This file tells named which nameservers to use for specific domains.
+This file tells named which name servers to use for specific domains.
 .Pp
 Example resolvconf.conf for named:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 named_options=/etc/named-options.conf
 .D1 named_zones=/etc/named-zones.conf
 .Pp
@@ -164,12 +168,12 @@
 .Pa pdnsd_resolv
 as documented below.
 .It Sy pdnsd_resolv
-This file tells pdnsd about global nameservers.
+This file tells pdnsd about global name servers.
 If this variable is not set then it's written to
 .Pa pdnsd_conf .
 .Pp
 Example resolvconf.conf for pdnsd:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 pdnsd_conf=/etc/pdnsd.conf
 .D1 # pdnsd_resolv=/etc/pdnsd-resolv.conf
 .Pp
@@ -185,10 +189,10 @@
 .D1    # file="/etc/pdnsd-resolv.conf";
 .D1 }
 .It Sy unbound_conf
-This file tells unbound about specific and global nameservers.
+This file tells unbound about specific and global name servers.
 .Pp
 Example resolvconf.conf for unbound:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 unbound_conf=/etc/unbound-resolvconf.conf
 .Pp
 Example unbound.conf:
@@ -208,8 +212,6 @@
 variables, documented below.
 .Pp
 .Bl -tag -width indent
-.It Sy dbus_pid
-Locaiton of the dbus pidfile.
 .It Sy dnsmasq_service
 Location of the dnsmasq service.
 .It Sy dnsmasq_restart
@@ -240,7 +242,7 @@
 .An Roy Marples Aq roy%marples.name@localhost
 .Sh BUGS
 Each distribution is a special snowflake and likes to name the same thing
-differently, namely the named service script and the dbus pidfile location.
+differently, namely the named service script.
 .Pp
 Please report them to
 .Lk http://roy.marples.name/projects/openresolv
diff -r ed3f6bb6687b -r 64e4db5838f0 external/bsd/openresolv/dist/resolvconf.in
--- a/external/bsd/openresolv/dist/resolvconf.in        Thu Dec 06 11:38:17 2012 +0000
+++ b/external/bsd/openresolv/dist/resolvconf.in        Tue Jun 04 09:37:21 2013 +0000
@@ -28,6 +28,10 @@
 SYSCONFDIR=@SYSCONFDIR@
 LIBEXECDIR=@LIBEXECDIR@
 VARDIR=@VARDIR@
+
+# Disregard dhcpcd setting
+unset interface_order
+
 # Support original resolvconf configuration layout
 # as well as the openresolv config file
 if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then