[src/trunk]: src/etc PR/46757: Edgar Fu?: Change default to pkg_vulnerabiliti...

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

details:   https://anonhg.NetBSD.org/src/rev/7569b068af22
branches:  trunk
changeset: 780584:7569b068af22
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jul 30 17:09:33 2012 +0000

description:
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 fe442f096745 -r 7569b068af22 etc/daily
--- a/etc/daily Mon Jul 30 17:06:51 2012 +0000
+++ b/etc/daily Mon Jul 30 17:09:33 2012 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: daily,v 1.82 2012/07/30 17:06:51 christos Exp $
+#      $NetBSD: daily,v 1.83 2012/07/30 17:09:33 christos 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 fe442f096745 -r 7569b068af22 etc/defaults/daily.conf
--- a/etc/defaults/daily.conf   Mon Jul 30 17:06:51 2012 +0000
+++ b/etc/defaults/daily.conf   Mon Jul 30 17:09:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: daily.conf,v 1.17 2012/07/30 17:06:51 christos Exp $
+#      $NetBSD: daily.conf,v 1.18 2012/07/30 17:09:34 christos 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