[src/trunk]: src/external/bsd/openresolv/dist Import openresolv-3.9.2 with th...

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

details:   https://anonhg.NetBSD.org/src/rev/6d39d9ca8f2d
branches:  trunk
changeset: 454196:6d39d9ca8f2d
user:      roy <roy%NetBSD.org@localhost>
date:      Sun Sep 08 20:46:17 2019 +0000

description:
Import openresolv-3.9.2 with the following changes:
  *  dnsmasq: clear cache after updating servers via dbus
  *  pdns_recursor: Fix global forwards (thus now installed by default)
  *  man: layout and misc fixes

diffstat:

 external/bsd/openresolv/dist/.gitignore       |   3 +
 external/bsd/openresolv/dist/LICENSE          |   2 +-
 external/bsd/openresolv/dist/configure        |  88 ++++++++++++++------------
 external/bsd/openresolv/dist/pdns_recursor.in |  17 ++---
 4 files changed, 59 insertions(+), 51 deletions(-)

diffs (182 lines):

diff -r 78213c4258a3 -r 6d39d9ca8f2d external/bsd/openresolv/dist/.gitignore
--- a/external/bsd/openresolv/dist/.gitignore   Sun Sep 08 19:00:33 2019 +0000
+++ b/external/bsd/openresolv/dist/.gitignore   Sun Sep 08 20:46:17 2019 +0000
@@ -1,3 +1,5 @@
+config.mk
+
 resolvconf
 resolvconf.8
 resolvconf.conf.5
@@ -6,4 +8,5 @@
 libc
 named
 pdnsd
+pdns_recursor
 unbound
diff -r 78213c4258a3 -r 6d39d9ca8f2d external/bsd/openresolv/dist/LICENSE
--- a/external/bsd/openresolv/dist/LICENSE      Sun Sep 08 19:00:33 2019 +0000
+++ b/external/bsd/openresolv/dist/LICENSE      Sun Sep 08 20:46:17 2019 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2017 Roy Marples <roy%marples.name@localhost>
+Copyright (c) 2007-2019 Roy Marples <roy%marples.name@localhost>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -r 78213c4258a3 -r 6d39d9ca8f2d external/bsd/openresolv/dist/configure
--- a/external/bsd/openresolv/dist/configure    Sun Sep 08 19:00:33 2019 +0000
+++ b/external/bsd/openresolv/dist/configure    Sun Sep 08 20:46:17 2019 +0000
@@ -44,42 +44,8 @@
        esac
 done
 
-if [ -z "$LIBEXECDIR" ]; then
-       printf "Checking for directory /libexec ... "
-       if [ -d /libexec ]; then
-               echo "yes"
-               LIBEXECDIR=$PREFIX/libexec/resolvconf
-       else
-               echo "no"
-               LIBEXECDIR=$PREFIX/lib/resolvconf
-       fi
-fi
-if [ -z "$RUNDIR" ]; then
-       printf "Checking for directory /run ... "
-       if [ -d /run ]; then
-               echo "yes"
-               RUNDIR=/run
-       else
-               echo "no"
-               RUNDIR=/var/run
-       fi
-fi     
-
 : ${SED:=sed}
 
-: ${SYSCONFDIR:=$PREFIX/etc}
-: ${SBINDIR:=$PREFIX/sbin}
-: ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
-: ${STATEDIR:=/var}
-: ${RUNDIR:=$STATEDIR/run}
-: ${MANDIR:=${PREFIX:-/usr}/share/man}
-
-eval SYSCONFDIR="$SYSCONFDIR"
-eval SBINDIR="$SBINDIR"
-eval LIBEXECDIR="$LIBEXECDIR"
-eval VARDIR="$RUNDIR/resolvconf"
-eval MANDIR="$MANDIR"
-
 CONFIG_MK=config.mk
 
 if [ -z "$BUILD" ]; then
@@ -121,7 +87,19 @@
 echo "# $OS" >$CONFIG_MK
 
 case "$OS" in
-freebsd*)
+dragonfly*)
+       # This means /usr HAS to be mounted not via dhcpcd
+       : ${LIBEXECDIR:=${PREFIX:-/usr}/libexec/resolvconf}
+       ;;
+linux*)
+       # cksum does't support -a and netpgp is rare
+       echo "CKSUM=            sha256sum --tag" >>$CONFIG_MK
+       echo "PGP=              gpg2" >>$CONFIG_MK
+       ;;
+esac
+
+case "$OS" in
+dragonfly*|freebsd*)
        # On FreeBSD, /etc/init.d/foo status returns 0 if foo is not enabled
        # regardless of if it's not running.
        # So we force onestatus to work around this silly bug.
@@ -129,13 +107,43 @@
                STATUSARG="onestatus"
        fi
        ;;
-linux*)
-       # cksum does't support -a and netpgp is rare
-       echo "CKSUM=            sha256sum --tag" >>$CONFIG_MK
-       echo "PGP=              gpg2" >>$CONFIG_MK
-       ;;
 esac
 
+
+if [ -z "$LIBEXECDIR" ]; then
+       printf "Checking for directory /libexec ... "
+       if [ -d /libexec ]; then
+               echo "yes"
+               LIBEXECDIR=$PREFIX/libexec/resolvconf
+       else
+               echo "no"
+               LIBEXECDIR=$PREFIX/lib/resolvconf
+       fi
+fi
+if [ -z "$RUNDIR" ]; then
+       printf "Checking for directory /run ... "
+       if [ -d /run ]; then
+               echo "yes"
+               RUNDIR=/run
+       else
+               echo "no"
+               RUNDIR=/var/run
+       fi
+fi
+
+: ${SYSCONFDIR:=$PREFIX/etc}
+: ${SBINDIR:=$PREFIX/sbin}
+: ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
+: ${STATEDIR:=/var}
+: ${RUNDIR:=$STATEDIR/run}
+: ${MANDIR:=${PREFIX:-/usr}/share/man}
+
+eval SYSCONFDIR="$SYSCONFDIR"
+eval SBINDIR="$SBINDIR"
+eval LIBEXECDIR="$LIBEXECDIR"
+eval VARDIR="$RUNDIR/resolvconf"
+eval MANDIR="$MANDIR"
+
 for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR RESTARTCMD RCDIR STATUSARG
 do
        eval v=\$$x
diff -r 78213c4258a3 -r 6d39d9ca8f2d external/bsd/openresolv/dist/pdns_recursor.in
--- a/external/bsd/openresolv/dist/pdns_recursor.in     Sun Sep 08 19:00:33 2019 +0000
+++ b/external/bsd/openresolv/dist/pdns_recursor.in     Sun Sep 08 20:46:17 2019 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2009-2011 Roy Marples
+# Copyright (c) 2009-2019 Roy Marples
 # All rights reserved
 
 # PowerDNS Recursor subscriber for resolvconf
@@ -33,17 +33,14 @@
 NL="
 "
 
-: ${pdns_service:=pdns_recursor}
+: ${pdns_service:=pdns-recursor}
 
 newzones=
 
-# pds_recursor does not present support global forward servers, which
-# does limit it's usefulness somewhat.
-# If it did, the below code can be enabled, or something like it.
-#for n in $NAMESERVERS; do
-#      newzones="$newzones${newzones:+,}$n"
-#done
-#[ -n "$newzones" ] && newzones=".=$newzones$NL"
+for n in $NAMESERVERS; do
+       newzones="$newzones${newzones:+,}$n"
+done
+[ -n "$newzones" ] && newzones="+.=$newzones$NL"
 
 for d in $DOMAINS; do
        newns=
@@ -71,7 +68,7 @@
                eval $pdns_restart
        elif [ -n "$RESTARTCMD" ]; then
                set -- ${pdns_service}
-               eval $RESTARTCMD
+               eval "$RESTARTCMD"
        else
                @SBINDIR@/resolvconf -r ${pdns_service}
        fi