Module Name: src
Committed By: martin
Date: Wed Aug 8 14:31:33 UTC 2012
Modified Files:
src/etc [netbsd-6]: daily
src/etc/defaults [netbsd-6]: daily.conf
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/etc/daily
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/etc/defaults/daily.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.80.2.2 src/etc/daily:1.80.2.3
--- src/etc/daily:1.80.2.2 Wed Aug 8 14:26:49 2012
+++ src/etc/daily Wed Aug 8 14:31:33 2012
@@ -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 pkg_info ${_compat_K_flag} -q -E '*';
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
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.16.2.1 src/etc/defaults/daily.conf:1.16.2.2
--- src/etc/defaults/daily.conf:1.16.2.1 Wed Aug 8 14:26:49 2012
+++ src/etc/defaults/daily.conf Wed Aug 8 14:31:33 2012
@@ -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_rdist=YES
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
