From b079803a46b21fa20a04cbf83b39134b2a45cf02 Mon Sep 17 00:00:00 2001
From: jilles <jilles@FreeBSD.org>
Date: Mon, 28 Dec 2015 21:35:06 +0000
Subject: MFC r290515: periodic: Fix backwards compatibility for
 daily_status_security_* vars.

Most daily_status_security_* variables in periodic.conf were changed to
security_status_* in SVN r254974. The compatibility code for the old names
did not work.

PR:		204331
Submitted by:	martin at lispworks.com
---
 etc/defaults/periodic.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 14f1a08..d97bd93 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -319,8 +319,8 @@ if [ -z "${source_periodic_confs_defined}" ]; then
 		    "use \$$var instead." >&2
 		case "$value" in
 		[Yy][Ee][Ss])
-			$var=YES
-			$periodvar=daily
+			eval $var=YES
+			eval $periodvar=daily
 			;;
 		*)
 			eval $var=\"$value\"
-- 
cgit v1.1


From 938f5957c28188809a40dded6925c8b75c06f30f Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Mon, 28 Dec 2015 23:05:13 +0000
Subject: MFC r292317,r292318,r292323,r292324,r292665:

r292317:

Integrate tools/regression/lib/libc/resolv into the FreeBSD test suite as
lib/libc/tests/resolv

Convert the testcases to ATF

Sponsored by: EMC / Isilon Storage Division

r292318:

Add Makefile accidentally missed in r292317

Sponsored by: EMC / Isilon Storage Division

r292323:

Integrate tools/regression/lib/libc/nss into the FreeBSD test suite as
lib/libc/tests/nss

- Convert the testcases to ATF
- Do some style(9) cleanups:
-- Sort headers
-- Apply indentation fixes
-- Remove superfluous parentheses
- Explicitly print out debug printfs for use with `kyua {debug,report}`; for
  items that were overly noisy, they've been put behind #ifdef DEBUG
  conditionals
- Fix some format strings

Sponsored by: EMC / Isilon Storage Division

r292324:

Iterate down lib/libc/tests/nss...

Sponsored by: EMC / Isilon Storage Division

r292665:

Increase the timeout for resolv_test from the default (300 seconds) to
450 seconds

This is required on slower network connections, and on older releases
(stable/10 seems to be slower as far as name resolution goes.. not sure
why yet).

Remove an outdated comment in the Makefile from when I was working on
this code over a year ago on github

Sponsored by: EMC / Isilon Storage Division
---
 etc/mtree/BSD.tests.dist | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'etc')

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index c6b1486..e49b6bb 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -109,10 +109,14 @@
                     ..
                 ..
             ..
+            nss
+            ..
             regex
                 data
                 ..
             ..
+            resolv
+            ..
             rpc
             ..
             ssp
-- 
cgit v1.1