Pull up following revision(s) (requested by christos in ticket #457): netbsd-6
authormartin <martin@NetBSD.org>
Wed, 08 Aug 2012 14:31:33 +0000
branchnetbsd-6
changeset 256026 d03a04d4d22f
parent 256025 8f7987422ece
child 256027 6d9d4d5e3e84
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).
etc/daily
etc/defaults/daily.conf
--- 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
 
--- 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