[src/netbsd-6]: src/etc Pull up following revision(s) (requested by christos ...

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

details:   https://anonhg.NetBSD.org/src/rev/48be80b23d77
branches:  netbsd-6
changeset: 774383:48be80b23d77
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 08 14:31:33 2012 +0000

description:
Pull up following revision(s) (requested by christos in ticket #457):
        etc/daily: revision 1.83
        etc/defaults/daily.conf: revision 1.18
PR/46757: Edgar Fu?: Change default to pkg_vulnerabilities from NO to unset,
and make unset insted of NO to produce warnings, so that setting it to NO does
produce warnings (if it is inappropriate for the machine to warn about this).

diffstat:

 etc/daily               |  9 +++++----
 etc/defaults/daily.conf |  4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r f92a97d3a1fe -r 48be80b23d77 etc/daily
--- a/etc/daily Wed Aug 08 14:26:49 2012 +0000
+++ b/etc/daily Wed Aug 08 14:31:33 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: daily,v 1.80.2.2 2012/08/08 14:26:49 martin Exp $
+#      $NetBSD: daily,v 1.80.2.3 2012/08/08 14:31:33 martin Exp $
 #      @(#)daily       8.2 (Berkeley) 1/25/94
 #
 
@@ -263,9 +263,10 @@
        if checkyesno fetch_pkg_vulnerabilities; then
                ( umask 022 && pkg_admin ${_compat_K_flag} \
                    fetch-pkg-vulnerabilities -u )
-       else
-               echo "fetch_pkg_vulnerabilities is set to NO in daily.conf(5)."
-               echo "You should set it to YES to enable vulnerability checks."
+       elif [ -z "$fetch_pkg_vulnerabilities" ]; then
+               echo "fetch_pkg_vulnerabilities is not set in daily.conf(5)."
+               echo "You should set it to YES to enable vulnerability checks"
+               echo "or set it to NO to get rid of this warning."
        fi
 fi
 
diff -r f92a97d3a1fe -r 48be80b23d77 etc/defaults/daily.conf
--- a/etc/defaults/daily.conf   Wed Aug 08 14:26:49 2012 +0000
+++ b/etc/defaults/daily.conf   Wed Aug 08 14:31:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: daily.conf,v 1.16.2.1 2012/08/08 14:26:49 martin Exp $
+#      $NetBSD: daily.conf,v 1.16.2.2 2012/08/08 14:31:33 martin Exp $
 #
 # /etc/defaults/daily.conf --
 #      default configuration of /etc/daily.conf
@@ -31,6 +31,6 @@
 run_security=YES
 separate_security_email=YES
 run_skeyaudit=YES
-fetch_pkg_vulnerabilities=NO
+fetch_pkg_vulnerabilities="" # set to NO to disable and not be warned about
 
 send_empty_security=NO