svn commit: r255201 - in projects/camlock: . bin/sh contrib/binutils/gas/config contrib/binutils/opcodes contrib/gcc contrib/gcc/config/i386 contrib/gcc/doc contrib/libexecinfo etc/defaults etc/rc....

Alexander Motin mav at FreeBSD.org
Wed Sep 4 08:01:17 UTC 2013


Author: mav
Date: Wed Sep  4 08:01:11 2013
New Revision: 255201
URL: http://svnweb.freebsd.org/changeset/base/255201

Log:
  MFC @ r255200

Added:
  projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_aes.h
     - copied unchanged from r255200, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h
  projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h
     - copied unchanged from r255200, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h
  projects/camlock/sys/crypto/aesni/aesencdec.h
     - copied unchanged from r255200, head/sys/crypto/aesni/aesencdec.h
  projects/camlock/sys/dev/hwpmc/hwpmc_mpc7xxx.c
     - copied unchanged from r255200, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c
  projects/camlock/sys/dev/hwpmc/hwpmc_powerpc.h
     - copied unchanged from r255200, head/sys/dev/hwpmc/hwpmc_powerpc.h
Deleted:
  projects/camlock/gnu/usr.bin/patch/
  projects/camlock/sys/crypto/aesni/aesencdec_amd64.S
  projects/camlock/sys/crypto/aesni/aesencdec_i386.S
Modified:
  projects/camlock/ObsoleteFiles.inc
  projects/camlock/bin/sh/jobs.c
  projects/camlock/bin/sh/jobs.h
  projects/camlock/bin/sh/trap.c
  projects/camlock/bin/sh/trap.h
  projects/camlock/contrib/binutils/gas/config/tc-i386.c
  projects/camlock/contrib/binutils/opcodes/i386-dis.c
  projects/camlock/contrib/binutils/opcodes/i386-opc.tbl
  projects/camlock/contrib/binutils/opcodes/i386-tbl.h
  projects/camlock/contrib/gcc/config/i386/i386.c
  projects/camlock/contrib/gcc/config/i386/i386.h
  projects/camlock/contrib/gcc/config/i386/i386.opt
  projects/camlock/contrib/gcc/doc/invoke.texi
  projects/camlock/contrib/gcc/opth-gen.awk
  projects/camlock/contrib/libexecinfo/execinfo.h   (contents, props changed)
  projects/camlock/etc/defaults/periodic.conf
  projects/camlock/etc/rc.d/routing
  projects/camlock/gnu/usr.bin/Makefile
  projects/camlock/gnu/usr.bin/cc/include/Makefile
  projects/camlock/lib/Makefile
  projects/camlock/lib/libc/gen/signal.3
  projects/camlock/lib/libexecinfo/Makefile
  projects/camlock/share/man/man5/periodic.conf.5
  projects/camlock/share/mk/bsd.libnames.mk
  projects/camlock/sys/amd64/amd64/db_disasm.c
  projects/camlock/sys/arm/freescale/imx/imx51_machdep.c
  projects/camlock/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  projects/camlock/sys/conf/files.amd64
  projects/camlock/sys/conf/files.i386
  projects/camlock/sys/crypto/aesni/aeskeys_amd64.S
  projects/camlock/sys/crypto/aesni/aesni.c
  projects/camlock/sys/crypto/aesni/aesni.h
  projects/camlock/sys/crypto/aesni/aesni_wrap.c
  projects/camlock/sys/dev/atkbdc/psm.c
  projects/camlock/sys/dev/cxgbe/tom/t4_listen.c
  projects/camlock/sys/dev/hwpmc/hwpmc_mod.c
  projects/camlock/sys/dev/hwpmc/hwpmc_powerpc.c
  projects/camlock/sys/dev/virtio/network/if_vtnet.c
  projects/camlock/sys/dev/virtio/network/if_vtnetvar.h
  projects/camlock/sys/dev/virtio/virtqueue.c
  projects/camlock/sys/dev/xen/blkback/blkback.c
  projects/camlock/sys/fs/nfsclient/nfs_clvfsops.c
  projects/camlock/sys/geom/eli/g_eli.c
  projects/camlock/sys/i386/xen/mp_machdep.c
  projects/camlock/sys/kern/uipc_debug.c
  projects/camlock/sys/kern/uipc_sockbuf.c
  projects/camlock/sys/kern/uipc_socket.c
  projects/camlock/sys/kern/vfs_mount.c
  projects/camlock/sys/mips/conf/DIR-825
  projects/camlock/sys/mips/include/_stdint.h
  projects/camlock/sys/modules/aesni/Makefile
  projects/camlock/sys/modules/cam/Makefile
  projects/camlock/sys/modules/hwpmc/Makefile
  projects/camlock/sys/modules/send/Makefile
  projects/camlock/sys/netinet/sctp_auth.c
  projects/camlock/sys/netinet/sctp_auth.h
  projects/camlock/sys/netinet/sctp_indata.c
  projects/camlock/sys/netinet/sctp_os_bsd.h
  projects/camlock/sys/netinet/sctp_output.c
  projects/camlock/sys/netinet/sctp_structs.h
  projects/camlock/sys/netinet/sctp_timer.c
  projects/camlock/sys/netinet/sctp_uio.h
  projects/camlock/sys/netinet/sctputil.c
  projects/camlock/sys/netpfil/pf/pf_lb.c
  projects/camlock/sys/powerpc/aim/trap.c
  projects/camlock/sys/powerpc/include/_stdint.h
  projects/camlock/sys/powerpc/include/pmc_mdep.h
  projects/camlock/sys/sys/mount.h
  projects/camlock/sys/sys/mouse.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/sockbuf.h
  projects/camlock/sys/sys/time.h
  projects/camlock/sys/x86/xen/hvm.c
  projects/camlock/usr.sbin/periodic/periodic.sh
  projects/camlock/usr.sbin/rtadvd/if.c
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/contrib/binutils/   (props changed)
  projects/camlock/contrib/gcc/   (props changed)
  projects/camlock/contrib/libexecinfo/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/conf/   (props changed)
  projects/camlock/usr.sbin/rtadvd/   (props changed)

Modified: projects/camlock/ObsoleteFiles.inc
==============================================================================
--- projects/camlock/ObsoleteFiles.inc	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/ObsoleteFiles.inc	Wed Sep  4 08:01:11 2013	(r255201)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130903: gnupatch is no more
+OLD_FILES+=usr/bin/gnupatch
+OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz

Modified: projects/camlock/bin/sh/jobs.c
==============================================================================
--- projects/camlock/bin/sh/jobs.c	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/bin/sh/jobs.c	Wed Sep  4 08:01:11 2013	(r255201)
@@ -83,13 +83,12 @@ static struct job *bgjob = NULL; /* last
 static struct job *jobmru;	/* most recently used job list */
 static pid_t initialpgrp;	/* pgrp of shell on invocation */
 #endif
-int in_waitcmd = 0;		/* are we in waitcmd()? */
-volatile sig_atomic_t breakwaitcmd = 0;	/* should wait be terminated? */
 static int ttyfd = -1;
 
 /* mode flags for dowait */
 #define DOWAIT_BLOCK	0x1 /* wait until a child exits */
-#define DOWAIT_SIG	0x2 /* if DOWAIT_BLOCK, abort on signals */
+#define DOWAIT_SIG	0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */
+#define DOWAIT_SIG_ANY	0x4 /* if DOWAIT_SIG, abort on any signal */
 
 #if JOBS
 static void restartjob(struct job *);
@@ -484,7 +483,7 @@ waitcmd(int argc __unused, char **argv _
 static int
 waitcmdloop(struct job *job)
 {
-	int status, retval;
+	int status, retval, sig;
 	struct job *jp;
 
 	/*
@@ -492,7 +491,6 @@ waitcmdloop(struct job *job)
 	 * received.
 	 */
 
-	in_waitcmd++;
 	do {
 		if (job != NULL) {
 			if (job->state == JOBDONE) {
@@ -508,7 +506,6 @@ waitcmdloop(struct job *job)
 					if (job == bgjob)
 						bgjob = NULL;
 				}
-				in_waitcmd--;
 				return retval;
 			}
 		} else {
@@ -524,7 +521,6 @@ waitcmdloop(struct job *job)
 				}
 			for (jp = jobtab ; ; jp++) {
 				if (jp >= jobtab + njobs) {	/* no running procs */
-					in_waitcmd--;
 					return 0;
 				}
 				if (jp->used && jp->state == 0)
@@ -532,9 +528,10 @@ waitcmdloop(struct job *job)
 			}
 		}
 	} while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1);
-	in_waitcmd--;
 
-	return pendingsig + 128;
+	sig = pendingsig_waitcmd;
+	pendingsig_waitcmd = 0;
+	return sig + 128;
 }
 
 
@@ -990,7 +987,8 @@ waitforjob(struct job *jp, int *origstat
 	INTOFF;
 	TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1));
 	while (jp->state == 0)
-		if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG : 0), jp) == -1)
+		if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG |
+		    DOWAIT_SIG_ANY : 0), jp) == -1)
 			dotrap();
 #if JOBS
 	if (jp->jobctl) {
@@ -1081,12 +1079,17 @@ dowait(int mode, struct job *job)
 		pid = wait3(&status, wflags, (struct rusage *)NULL);
 		TRACE(("wait returns %d, status=%d\n", (int)pid, status));
 		if (pid == 0 && (mode & DOWAIT_SIG) != 0) {
-			sigsuspend(&omask);
 			pid = -1;
+			if (((mode & DOWAIT_SIG_ANY) != 0 ?
+			    pendingsig : pendingsig_waitcmd) != 0) {
+				errno = EINTR;
+				break;
+			}
+			sigsuspend(&omask);
 			if (int_pending())
 				break;
 		}
-	} while (pid == -1 && errno == EINTR && breakwaitcmd == 0);
+	} while (pid == -1 && errno == EINTR);
 	if (pid == -1 && errno == ECHILD && job != NULL)
 		job->state = JOBDONE;
 	if ((mode & DOWAIT_SIG) != 0) {
@@ -1095,11 +1098,6 @@ dowait(int mode, struct job *job)
 		sigprocmask(SIG_SETMASK, &omask, NULL);
 		INTON;
 	}
-	if (breakwaitcmd != 0) {
-		breakwaitcmd = 0;
-		if (pid <= 0)
-			return -1;
-	}
 	if (pid <= 0)
 		return pid;
 	INTOFF;

Modified: projects/camlock/bin/sh/jobs.h
==============================================================================
--- projects/camlock/bin/sh/jobs.h	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/bin/sh/jobs.h	Wed Sep  4 08:01:11 2013	(r255201)
@@ -83,8 +83,6 @@ enum {
 };
 
 extern int job_warning;		/* user was warned about stopped jobs */
-extern int in_waitcmd;		/* are we in waitcmd()? */
-extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */
 
 void setjobctl(int);
 void showjobs(int, int);

Modified: projects/camlock/bin/sh/trap.c
==============================================================================
--- projects/camlock/bin/sh/trap.c	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/bin/sh/trap.c	Wed Sep  4 08:01:11 2013	(r255201)
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 
 static char sigmode[NSIG];	/* current value of signal */
 volatile sig_atomic_t pendingsig;	/* indicates some signal received */
+volatile sig_atomic_t pendingsig_waitcmd;	/* indicates SIGINT/SIGQUIT received */
 int in_dotrap;			/* do we execute in a trap handler? */
 static char *volatile trap[NSIG];	/* trap handler commands */
 static volatile sig_atomic_t gotsig[NSIG];
@@ -389,23 +390,13 @@ onsig(int signo)
 	}
 
 	/* If we are currently in a wait builtin, prepare to break it */
-	if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) {
-		breakwaitcmd = 1;
-		pendingsig = signo;
-	}
+	if (signo == SIGINT || signo == SIGQUIT)
+		pendingsig_waitcmd = signo;
 
 	if (trap[signo] != NULL && trap[signo][0] != '\0' &&
 	    (signo != SIGCHLD || !ignore_sigchld)) {
 		gotsig[signo] = 1;
 		pendingsig = signo;
-
-		/*
-		 * If a trap is set, not ignored and not the null command, we
-		 * need to make sure traps are executed even when a child
-		 * blocks signals.
-		 */
-		if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0'))
-			breakwaitcmd = 1;
 	}
 
 #ifndef NO_HISTORY
@@ -428,6 +419,7 @@ dotrap(void)
 	in_dotrap++;
 	for (;;) {
 		pendingsig = 0;
+		pendingsig_waitcmd = 0;
 		for (i = 1; i < NSIG; i++) {
 			if (gotsig[i]) {
 				gotsig[i] = 0;

Modified: projects/camlock/bin/sh/trap.h
==============================================================================
--- projects/camlock/bin/sh/trap.h	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/bin/sh/trap.h	Wed Sep  4 08:01:11 2013	(r255201)
@@ -34,6 +34,7 @@
  */
 
 extern volatile sig_atomic_t pendingsig;
+extern volatile sig_atomic_t pendingsig_waitcmd;
 extern int in_dotrap;
 extern volatile sig_atomic_t gotwinch;
 

Modified: projects/camlock/contrib/binutils/gas/config/tc-i386.c
==============================================================================
--- projects/camlock/contrib/binutils/gas/config/tc-i386.c	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/binutils/gas/config/tc-i386.c	Wed Sep  4 08:01:11 2013	(r255201)
@@ -3990,7 +3990,8 @@ output_insn (void)
 	      goto check_prefix;
 	    }
 	}
-      else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881)
+      else if (i.tm.base_opcode == 0x660f3880 || i.tm.base_opcode == 0x660f3881
+	  || i.tm.base_opcode == 0x660f3882)
 	{
 	  /* invept and invvpid are 3 byte instructions with a
 	     mandatory prefix. */
@@ -4040,7 +4041,8 @@ output_insn (void)
 	      *p++ = (i.tm.base_opcode >> 16) & 0xff;
 	    }
 	  else if (i.tm.base_opcode == 0x660f3880 ||
-		   i.tm.base_opcode == 0x660f3881)
+		   i.tm.base_opcode == 0x660f3881 ||
+		   i.tm.base_opcode == 0x660f3882)
 	    {
 	      p = frag_more (3);
 	      *p++ = (i.tm.base_opcode >> 16) & 0xff;

Modified: projects/camlock/contrib/binutils/opcodes/i386-dis.c
==============================================================================
--- projects/camlock/contrib/binutils/opcodes/i386-dis.c	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/binutils/opcodes/i386-dis.c	Wed Sep  4 08:01:11 2013	(r255201)
@@ -550,6 +550,7 @@ fetch_data (struct disassemble_info *inf
 #define PREGRP104 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 104 } }
 #define PREGRP105 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 105 } }
 #define PREGRP106 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 106 } }
+#define PREGRP107 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 107 } }
 
 
 #define X86_64_0  NULL, { { NULL, X86_64_SPECIAL }, { NULL, 0 } }
@@ -2668,6 +2669,14 @@ static const struct dis386 prefix_user_t
     { "pclmulqdq", { XM, EXx, Ib } },
     { "(bad)",	{ XX } },
   },
+
+  /* PREGRP107 */
+  {
+    { "(bad)",	{ XX } },
+    { "(bad)",	{ XX } },
+    { "invpcid",{ Gm, Mo } },
+    { "(bad)",	{ XX } },
+  },
 };
 
 static const struct dis386 x86_64_table[][2] = {
@@ -2839,7 +2848,7 @@ static const struct dis386 three_byte_ta
     /* 80 */
     { PREGRP98 },
     { PREGRP99 },
-    { "(bad)", { XX } },
+    { PREGRP107 },
     { "(bad)", { XX } },
     { "(bad)", { XX } },
     { "(bad)", { XX } },

Modified: projects/camlock/contrib/binutils/opcodes/i386-opc.tbl
==============================================================================
--- projects/camlock/contrib/binutils/opcodes/i386-opc.tbl	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/binutils/opcodes/i386-opc.tbl	Wed Sep  4 08:01:11 2013	(r255201)
@@ -1498,3 +1498,7 @@ xsetbv, 0, 0xf01, 0xd1, CpuXSAVE, No_bSu
 xsave, 1, 0xfae, 0x4, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 xsaveopt, 1, 0xfae, 0x6, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf, { BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+
+// INVPCID
+invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 }
+invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 }

Modified: projects/camlock/contrib/binutils/opcodes/i386-tbl.h
==============================================================================
--- projects/camlock/contrib/binutils/opcodes/i386-tbl.h	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/binutils/opcodes/i386-tbl.h	Wed Sep  4 08:01:11 2013	(r255201)
@@ -3641,6 +3641,14 @@ const template i386_optab[] =
     Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64,
     { BaseIndex|Disp8|Disp16|Disp32|Disp32S,
       Reg64 } },
+  { "invpcid", 2, 0x660f3882, None, CpuNo64,
+    Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64,
+    { BaseIndex|Disp8|Disp16|Disp32|Disp32S,
+      Reg32 } },
+  { "invpcid", 2, 0x660f3882, None, Cpu64,
+    Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64,
+    { BaseIndex|Disp8|Disp16|Disp32|Disp32S,
+      Reg64 } },
   { "vmcall", 0, 0xf01, 0xc1, CpuVMX,
     No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt,
     { 0 } },

Modified: projects/camlock/contrib/gcc/config/i386/i386.c
==============================================================================
--- projects/camlock/contrib/gcc/config/i386/i386.c	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/gcc/config/i386/i386.c	Wed Sep  4 08:01:11 2013	(r255201)
@@ -1684,6 +1684,14 @@ ix86_handle_option (size_t code, const c
 	}
       return true;
 
+    case OPT_maes:
+      if (!value)
+	{
+	  target_flags &= ~MASK_AES;
+	  target_flags_explicit |= MASK_AES;
+	}
+      return true;
+
     default:
       return true;
     }
@@ -2187,6 +2195,10 @@ override_options (void)
   if (TARGET_SSE3)
     target_flags |= MASK_SSE2;
 
+  /* Turn on SSE2 builtins for -maes.  */
+  if (TARGET_AES)
+    target_flags |= MASK_SSE2;
+
   /* Turn on SSE builtins for -msse2.  */
   if (TARGET_SSE2)
     target_flags |= MASK_SSE;

Modified: projects/camlock/contrib/gcc/config/i386/i386.h
==============================================================================
--- projects/camlock/contrib/gcc/config/i386/i386.h	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/gcc/config/i386/i386.h	Wed Sep  4 08:01:11 2013	(r255201)
@@ -428,6 +428,8 @@ extern const char *host_detect_local_cpu
 	builtin_define ("__SSSE3__");				\
       if (TARGET_SSE4A)					\
  	builtin_define ("__SSE4A__");		                \
+      if (TARGET_AES)						\
+	builtin_define ("__AES__");				\
       if (TARGET_SSE_MATH && TARGET_SSE)			\
 	builtin_define ("__SSE_MATH__");			\
       if (TARGET_SSE_MATH && TARGET_SSE2)			\

Modified: projects/camlock/contrib/gcc/config/i386/i386.opt
==============================================================================
--- projects/camlock/contrib/gcc/config/i386/i386.opt	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/gcc/config/i386/i386.opt	Wed Sep  4 08:01:11 2013	(r255201)
@@ -205,6 +205,10 @@ msse4a
 Target Report Mask(SSE4A)
 Support MMX, SSE, SSE2, SSE3 and SSE4A built-in functions and code generation
 
+maes
+Target Report Mask(AES)
+Support AES built-in functions and code generation.
+
 mpopcnt
 Target Report Mask(POPCNT)
 Support code generation of popcount instruction for popcount built-ins 

Modified: projects/camlock/contrib/gcc/doc/invoke.texi
==============================================================================
--- projects/camlock/contrib/gcc/doc/invoke.texi	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/gcc/doc/invoke.texi	Wed Sep  4 08:01:11 2013	(r255201)
@@ -513,7 +513,7 @@ in the following sections.
 -mno-fp-ret-in-387  -msoft-float  -msvr3-shlib @gol
 -mno-wide-multiply  -mrtd  -malign-double @gol
 -mpreferred-stack-boundary=@var{num} @gol
--mmmx  -msse  -msse2 -msse3 -mssse3 -msse4a -m3dnow -mpopcnt -mabm @gol
+-mmmx  -msse  -msse2 -msse3 -mssse3 -msse4a -m3dnow -mpopcnt -mabm -maes @gol
 -mthreads  -mno-align-stringops  -minline-all-stringops @gol
 -mpush-args  -maccumulate-outgoing-args  -m128bit-long-double @gol
 -m96bit-long-double  -mregparm=@var{num}  -msseregparm @gol
@@ -9367,6 +9367,8 @@ preferred alignment to @option{-mpreferr
 @itemx -mno-popcnt
 @item -mabm
 @itemx -mno-abm
+ at item -maes
+ at itemx -mno-aes
 @opindex mmmx
 @opindex mno-mmx
 @opindex msse
@@ -9374,10 +9376,10 @@ preferred alignment to @option{-mpreferr
 @opindex m3dnow
 @opindex mno-3dnow
 These switches enable or disable the use of instructions in the MMX,
-SSE, SSE2, SSE3, SSSE3, SSE4A, ABM or 3DNow! extended instruction sets.
-These extensions are also available as built-in functions: see
- at ref{X86 Built-in Functions}, for details of the functions enabled and
-disabled by these switches.
+SSE, SSE2, SSE3, SSSE3, SSE4A, ABM, AES or 3DNow! extended
+instruction sets.  These extensions are also available as built-in
+functions: see @ref{X86 Built-in Functions}, for details of the functions
+enabled and disabled by these switches.
 
 To have SSE/SSE2 instructions generated automatically from floating-point
 code (as opposed to 387 instructions), see @option{-mfpmath=sse}.

Modified: projects/camlock/contrib/gcc/opth-gen.awk
==============================================================================
--- projects/camlock/contrib/gcc/opth-gen.awk	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/gcc/opth-gen.awk	Wed Sep  4 08:01:11 2013	(r255201)
@@ -87,7 +87,7 @@ for (i = 0; i < n_extra_masks; i++) {
 }
 
 for (var in masknum) {
-	if (masknum[var] > 31) {
+	if (masknum[var] > 32) {
 		if (var == "")
 			print "#error too many target masks"
 		else

Modified: projects/camlock/contrib/libexecinfo/execinfo.h
==============================================================================
--- projects/camlock/contrib/libexecinfo/execinfo.h	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/contrib/libexecinfo/execinfo.h	Wed Sep  4 08:01:11 2013	(r255201)
@@ -1,4 +1,5 @@
 /*	$NetBSD: execinfo.h,v 1.2 2012/06/09 21:22:17 christos Exp $	*/
+/*	$FreeBSD$ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.

Modified: projects/camlock/etc/defaults/periodic.conf
==============================================================================
--- projects/camlock/etc/defaults/periodic.conf	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/etc/defaults/periodic.conf	Wed Sep  4 08:01:11 2013	(r255201)
@@ -162,6 +162,71 @@ daily_scrub_zfs_default_threshold="35"		
 daily_local="/etc/daily.local"				# Local scripts
 
 
+# Weekly options
+
+# These options are used by periodic(8) itself to determine what to do
+# with the output of the sub-programs that are run, and where to send
+# that output.  $weekly_output might be set to /var/log/weekly.log if you
+# wish to log the weekly output and have the files rotated by newsyslog(8)
+#
+weekly_output="root"					# user or /file
+weekly_show_success="YES"				# scripts returning 0
+weekly_show_info="YES"					# scripts returning 1
+weekly_show_badconfig="NO"				# scripts returning 2
+
+# 310.locate
+weekly_locate_enable="YES"				# Update locate weekly
+
+# 320.whatis
+weekly_whatis_enable="YES"				# Update whatis weekly
+
+# 330.catman
+weekly_catman_enable="NO"				# Preformat man pages
+
+# 340.noid
+weekly_noid_enable="NO"					# Find unowned files
+weekly_noid_dirs="/"					# Look here
+
+# 400.status-pkg
+weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
+pkg_version=pkg_version					# Use this program
+pkg_version_index=/usr/ports/INDEX-10			# Use this index file
+
+# 450.status-security
+weekly_status_security_enable="YES"			# Security check
+# See also "Security options" above for more options
+weekly_status_security_inline="NO"			# Run inline ?
+weekly_status_security_output="root"			# user or /file
+
+# 999.local
+weekly_local="/etc/weekly.local"			# Local scripts
+
+
+# Monthly options
+
+# These options are used by periodic(8) itself to determine what to do
+# with the output of the sub-programs that are run, and where to send
+# that output.  $monthly_output might be set to /var/log/monthly.log if you
+# wish to log the monthly output and have the files rotated by newsyslog(8)
+#
+monthly_output="root"					# user or /file
+monthly_show_success="YES"				# scripts returning 0
+monthly_show_info="YES"					# scripts returning 1
+monthly_show_badconfig="NO"				# scripts returning 2
+
+# 200.accounting
+monthly_accounting_enable="YES"				# Login accounting
+
+# 450.status-security
+monthly_status_security_enable="YES"			# Security check
+# See also "Security options" above for more options
+monthly_status_security_inline="NO"			# Run inline ?
+monthly_status_security_output="root"			# user or /file
+
+# 999.local
+monthly_local="/etc/monthly.local"			# Local scripts
+
+
 # Security options
 
 # These options are used by the security periodic(8) scripts spawned in
@@ -169,11 +234,14 @@ daily_local="/etc/daily.local"				# Loca
 security_status_logdir="/var/log"			# Directory for logs
 security_status_diff_flags="-b -u"			# flags for diff output
 
-# Each of the security_status_*_enable options below can have one of the
+# Each of the security_status_*_period options below can have one of the
 # following values:
-# - NO
+# - NO: do not run at all
 # - daily: only run during the daily security status
 # - weekly: only run during the weekly security status
+# - monthly: only run during the monthly security status
+# Note that if periodic security scripts are run from crontab(5) directly,
+# they will be run unless _enable or _period is set to "NO".
 
 # 100.chksetuid
 security_status_chksetuid_enable="YES"
@@ -239,70 +307,6 @@ security_status_tcpwrap_enable="YES"
 security_status_tcpwrap_period="daily"
 
 
-# Weekly options
-
-# These options are used by periodic(8) itself to determine what to do
-# with the output of the sub-programs that are run, and where to send
-# that output.  $weekly_output might be set to /var/log/weekly.log if you
-# wish to log the weekly output and have the files rotated by newsyslog(8)
-#
-weekly_output="root"					# user or /file
-weekly_show_success="YES"				# scripts returning 0
-weekly_show_info="YES"					# scripts returning 1
-weekly_show_badconfig="NO"				# scripts returning 2
-
-# 310.locate
-weekly_locate_enable="YES"				# Update locate weekly
-
-# 320.whatis
-weekly_whatis_enable="YES"				# Update whatis weekly
-
-# 330.catman
-weekly_catman_enable="NO"				# Preformat man pages
-
-# 340.noid
-weekly_noid_enable="NO"					# Find unowned files
-weekly_noid_dirs="/"					# Look here
-
-# 400.status-pkg
-weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
-pkg_version=pkg_version					# Use this program
-pkg_version_index=/usr/ports/INDEX-10			# Use this index file
-
-# 450.status-security
-weekly_status_security_enable="YES"			# Security check
-# See also "Security options" above for more options
-weekly_status_security_inline="NO"			# Run inline ?
-weekly_status_security_output="root"			# user or /file
-
-# 999.local
-weekly_local="/etc/weekly.local"			# Local scripts
-
-
-# Monthly options
-
-# These options are used by periodic(8) itself to determine what to do
-# with the output of the sub-programs that are run, and where to send
-# that output.  $monthly_output might be set to /var/log/monthly.log if you
-# wish to log the monthly output and have the files rotated by newsyslog(8)
-#
-monthly_output="root"					# user or /file
-monthly_show_success="YES"				# scripts returning 0
-monthly_show_info="YES"					# scripts returning 1
-monthly_show_badconfig="NO"				# scripts returning 2
-
-# 200.accounting
-monthly_accounting_enable="YES"				# Login accounting
-
-# 450.status-security
-monthly_status_security_enable="YES"			# Security check
-# See also "Security options" above for more options
-monthly_status_security_inline="NO"			# Run inline ?
-monthly_status_security_output="root"			# user or /file
-
-# 999.local
-monthly_local="/etc/monthly.local"			# Local scripts
-
 
 # Define source_periodic_confs, the mechanism used by /etc/periodic/*/*
 # scripts to source defaults/periodic.conf overrides safely.

Modified: projects/camlock/etc/rc.d/routing
==============================================================================
--- projects/camlock/etc/rc.d/routing	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/etc/rc.d/routing	Wed Sep  4 08:01:11 2013	(r255201)
@@ -143,7 +143,7 @@ static_inet()
 	[Nn][Oo] | '')
 		;;
 	*)
-		static_routes="_default ${static_routes}"
+		static_routes="${static_routes} _default"
 		route__default="default ${defaultrouter}"
 		;;
 	esac
@@ -205,7 +205,7 @@ static_inet6()
 	[Nn][Oo] | '')
 		;;
 	*)
-		ipv6_static_routes="_default ${ipv6_static_routes}"
+		ipv6_static_routes="${ipv6_static_routes} _default"
 		ipv6_route__default="default ${ipv6_defaultrouter}"
 		;;
 	esac

Modified: projects/camlock/gnu/usr.bin/Makefile
==============================================================================
--- projects/camlock/gnu/usr.bin/Makefile	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/gnu/usr.bin/Makefile	Wed Sep  4 08:01:11 2013	(r255201)
@@ -12,7 +12,6 @@ SUBDIR= ${_binutils} \
 	${_gperf} \
 	grep \
 	${_groff} \
-	patch \
 	${_rcs} \
 	sdiff \
 	send-pr \

Modified: projects/camlock/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- projects/camlock/gnu/usr.bin/cc/include/Makefile	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/gnu/usr.bin/cc/include/Makefile	Wed Sep  4 08:01:11 2013	(r255201)
@@ -6,11 +6,12 @@
 
 INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 
-.PATH: ${GCCDIR}/config/${GCC_CPU}
+.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../contrib/llvm/tools/clang/lib/Headers
 
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
 	tmmintrin.h xmmintrin.h mm_malloc.h
+INCS+=	wmmintrin.h __wmmintrin_aes.h __wmmintrin_pclmul.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"

Copied: projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_aes.h (from r255200, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_aes.h	Wed Sep  4 08:01:11 2013	(r255201, copy of r255200, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h)
@@ -0,0 +1,54 @@
+/*-
+ * Copyright 2013 John-Mark Gurney
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef _WMMINTRIN_AES_H_
+#define _WMMINTRIN_AES_H_
+
+#include <emmintrin.h>
+
+#define MAKE_AES(name) \
+static __inline__ __m128i __attribute__((__always_inline__, __nodebug__)) \
+_mm_## name ##_si128(__m128i __V, __m128i __R) \
+{ \
+  __m128i v = __V; \
+ \
+  __asm__ (#name " %2, %0": "=x" (v): "0" (v), "xm" (__R)); \
+ \
+  return v; \
+}
+
+MAKE_AES(aesimc)
+MAKE_AES(aesenc)
+MAKE_AES(aesenclast)
+MAKE_AES(aesdec)
+MAKE_AES(aesdeclast)
+
+#undef MAKE_AES
+
+#endif  /* _WMMINTRIN_AES_H_ */

Copied: projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h (from r255200, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h	Wed Sep  4 08:01:11 2013	(r255201, copy of r255200, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h)
@@ -0,0 +1,53 @@
+/*-
+ * Copyright 2013 John-Mark Gurney
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef _WMMINTRIN_PCLMUL_H_
+#define _WMMINTRIN_PCLMUL_H_
+
+#include <emmintrin.h>
+
+/*
+ * c selects which parts of a and b to multiple:
+ *  0x00:	a[ 63: 0] * b[ 63: 0]
+ *  0x01:	a[127:64] * b[ 63: 0]
+ *  0x10:	a[ 63: 0] * b[127:64]
+ *  0x11:	a[127:64] * b[127:64]
+ */
+#define _mm_clmulepi64_si128(a, b, c) 					\
+({									\
+	__m128i _a = (a);						\
+	__m128i _b = (b);						\
+									\
+	__asm__("pclmulqdq %3, %2, %0": "=x" (_a): "0" (_a), "xm" (_b),	\
+	    "i" (c));							\
+									\
+	_a;								\
+})
+
+#endif  /* _WMMINTRIN_PCLMUL_H_ */

Modified: projects/camlock/lib/Makefile
==============================================================================
--- projects/camlock/lib/Makefile	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/lib/Makefile	Wed Sep  4 08:01:11 2013	(r255201)
@@ -72,6 +72,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdwarf \
 	libedit \
 	${_libefi} \
+	libexecinfo \
 	libexpat \
 	libfetch \
 	libgeom \

Modified: projects/camlock/lib/libc/gen/signal.3
==============================================================================
--- projects/camlock/lib/libc/gen/signal.3	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/lib/libc/gen/signal.3	Wed Sep  4 08:01:11 2013	(r255201)
@@ -132,6 +132,7 @@ is possible on a descriptor (see
 .It 30 Ta Dv SIGUSR1 Ta "terminate process" Ta "User defined signal 1"
 .It 31 Ta Dv SIGUSR2 Ta "terminate process" Ta "User defined signal 2"
 .It 32 Ta Dv SIGTHR Ta "terminate process" Ta "thread interrupt"
+.It 33 Ta Dv SIGLIBRT Ta "terminate process" Ta "real-time library interrupt"
 .El
 .Pp
 The

Modified: projects/camlock/lib/libexecinfo/Makefile
==============================================================================
--- projects/camlock/lib/libexecinfo/Makefile	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/lib/libexecinfo/Makefile	Wed Sep  4 08:01:11 2013	(r255201)
@@ -3,12 +3,16 @@
 LIBEXECINFO=	${.CURDIR}/../../contrib/libexecinfo
 
 LIB=		execinfo
+SHLIB_MAJOR=	1
 
 .PATH:		${LIBEXECINFO}
 
-INCS=		execinfo.h symtab.h unwind.h
+INCS=		execinfo.h
 SRCS=		backtrace.c symtab.c unwind.c
 
+DPADD=		${LIBELF}
+LDADD=		-lelf
+
 MAN=		backtrace.3
 
 MLINKS+=	backtrace.3 backtrace_symbols.3

Modified: projects/camlock/share/man/man5/periodic.conf.5
==============================================================================
--- projects/camlock/share/man/man5/periodic.conf.5	Wed Sep  4 07:09:56 2013	(r255200)
+++ projects/camlock/share/man/man5/periodic.conf.5	Wed Sep  4 08:01:11 2013	(r255201)
@@ -482,6 +482,242 @@ This variable behaves in the same way as
 .Va *_output
 variables above, namely it can be set either to one or more email addresses
 or to an absolute file name.
+.It Va daily_status_mail_rejects_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to summarise mail rejections logged to
+.Pa /var/log/maillog
+for the previous day.
+.It Va daily_status_mail_rejects_logs
+.Pq Vt num
+Set to the number of maillog files that should be checked
+for yesterday's mail rejects.
+.It Va daily_status_named_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to summarise denied zone transfers (AXFR and IXFR)
+for the previous day.
+.It Va daily_status_named_usedns
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to enable reverse DNS lookups.
+.It Va daily_status_ntpd
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to enable NTP status check.
+.It Va daily_queuerun_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to manually run the mail queue at least once a day.
+.It Va daily_submit_queuerun
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you also want to manually run the submit mail queue at least once a day
+when
+.Va daily_queuerun_enable
+is set to
+.Dq Li YES .
+.It Va daily_scrub_zfs_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run a zfs scrub periodically.
+.It Va daily_scrub_zfs_pools
+.Pq Vt str
+A space separated list of names of zfs pools to scrub.
+If the list is empty or not set, all zfs pools are scrubbed.
+.It Va daily_scrub_zfs_default_threshold
+.Pq Vt int
+Number of days between a scrub if no pool-specific threshold is set.
+If not set, the default value is 35, corresponding to 5 weeks.
+.It Va daily_scrub_zfs_ Ns Ao Ar poolname Ac Ns Va _threshold
+.Pq Vt int
+The same as
+.Va daily_scrub_zfs_default_threshold
+but specific to the pool
+.Ao Ar poolname Ac Ns .
+.It Va daily_local
+.Pq Vt str
+Set to a list of extra scripts that should be run after all other
+daily scripts.
+All scripts must be absolute path names.
+.El
+.Pp
+The following variables are used by the standard scripts that reside in
+.Pa /etc/periodic/weekly :
+.Bl -tag -offset 4n -width 2n
+.It Va weekly_locate_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Pa /usr/libexec/locate.updatedb .
+This script is run using
+.Nm nice Fl 5
+as user
+.Dq Li nobody ,
+and generates the table used by the
+.Xr locate 1
+command.
+.It Va weekly_whatis_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Pa /usr/libexec/makewhatis.local .
+This script regenerates the database used by the
+.Xr apropos 1
+command.
+.It Va weekly_catman_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to run
+.Pa /usr/libexec/catman.local .
+This script processes all out of date manual pages, speeding up the
+.Xr man 1
+command at the expense of disk space.
+.It Va weekly_noid_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to locate orphaned files on the system.
+An orphaned file is one with an invalid owner or group.
+.It Va weekly_noid_dirs
+.Pq Vt str
+A list of directories under which orphaned files are searched for.
+This would usually be set to
+.Pa / .
+.It Va weekly_status_security_enable
+.Pq Vt bool
+Weekly counterpart of
+.Va daily_status_securiy_enable .
+.It Va weekly_status_security_inline
+.Pq Vt bool
+Weekly counterpart of
+.Va daily_status_securiy_inline .
+.It Va weekly_status_security_output
+.Pq Vt str
+Weekly counterpart of
+.Va daily_status_securiy_output .
+.It Va weekly_status_pkg_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to use
+.Xr pkg_version 1
+to list installed packages which are out of date.
+.It Va pkg_version
+.Pq Vt str
+When
+.Va weekly_status_pkg_enable
+is set to
+.Dq Li YES ,
+this variable specifies the program that is used to determine the out of
+date packages.
+If unset, the
+.Xr pkg_version 1
+program is used.
+As an example, this variable might be set to
+.Dq Li portversion
+if the
+.Pa ports/sysutils/portupgrade
+port has been installed.
+.It Va pkg_version_index
+.Pq Vt str
+This variable specifies the
+.Pa INDEX
+file from
+.Pa /usr/ports
+that should be used by
+.Xr pkg_version 1 .
+Because the dependency tree may be substantially different between versions of
+.Fx ,
+there may be more than one
+.Pa INDEX
+file in
+.Pa /usr/ports .
+.Pp
+Note, if the
+.Va pkg_version
+variable is set to
+.Dq Li portversion ,
+it will also be necessary to arrange that the correct
+.Pa INDEX
+file is specified
+using environment variables and that
+.Va pkg_version_index
+is cleared in
+.Pa /etc/periodic.conf
+.Pq Dq Li pkg_version_index= .
+.It Va weekly_local
+.Pq Vt str
+Set to a list of extra scripts that should be run after all other
+weekly scripts.
+All scripts must be absolute path names.
+.El
+.Pp
+The following variables are used by the standard scripts that reside in
+.Pa /etc/periodic/monthly :
+.Bl -tag -offset 4n -width 2n
+.It Va monthly_accounting_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to do login accounting using the
+.Xr ac 8
+command.
+.It Va monthly_status_security_enable
+.Pq Vt bool
+Monthly counterpart of
+.Va daily_status_securiy_enable .
+.It Va monthly_status_security_inline
+.Pq Vt bool
+Monthly counterpart of
+.Va daily_status_securiy_inline .
+.It Va monthly_status_security_output
+.Pq Vt str
+Monthly counterpart of
+.Va daily_status_securiy_output .
+.It Va monthly_local
+.Pq Vt str
+Set to a list of extra scripts that should be run after all other
+monthly scripts.
+All scripts must be absolute path names.
+.El
+.Pp
+The following variables are used by the standard scripts that reside in
+.Pa /etc/periodic/security .
+Those scripts are usually run from daily
+.Pq Va daily_status_security_enable ,
+weekly
+.Pq Va weekly_status_security_enable ,
+and monthly
+.Pq Va monthly_status_security_enable
+periodic hooks.
+The
+.Va ..._period
+of each script can be configured as
+.Dq daily ,
+.Dq weekly ,
+.Dq monthly
+or
+.Dq NO .
+Note that when periodic security scripts are run from
+.Xr crontab 5 ,
+they will be always run unless their
+.Va ..._enable
+or
+.Va ..._period
+variable is set to
+.Dq No .
+.Bl -tag -offset 4n -width 2n
 .It Va security_status_diff_flags
 .Pq Vt str
 Set to the arguments to pass to the
@@ -709,214 +945,6 @@ Set to either
 .Dq Li monthly
 or
 .Dq Li NO .
-.It Va daily_status_mail_rejects_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-if you want to summarise mail rejections logged to
-.Pa /var/log/maillog
-for the previous day.
-.It Va daily_status_mail_rejects_logs
-.Pq Vt num
-Set to the number of maillog files that should be checked
-for yesterday's mail rejects.
-.It Va daily_status_named_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-if you want to summarise denied zone transfers (AXFR and IXFR)
-for the previous day.
-.It Va daily_status_named_usedns

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list