From owner-p4-projects@FreeBSD.ORG Sun Mar 12 13:00:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 734B516A403; Sun, 12 Mar 2006 13:00:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 347B116A400 for ; Sun, 12 Mar 2006 13:00:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6F8343D45 for ; Sun, 12 Mar 2006 13:00:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2CD0Es2002133 for ; Sun, 12 Mar 2006 13:00:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2CD0DXF002130 for perforce@freebsd.org; Sun, 12 Mar 2006 13:00:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 13:00:13 GMT Message-Id: <200603121300.k2CD0DXF002130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 13:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=93190 Change 93190 by rwatson@rwatson_zoo on 2006/03/12 13:00:05 Integrate trustedbsd_audit3 branch from trustedbsd_base, bringing in updates from @92749: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 (text+ko) ==== @@ -124,4 +124,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#1 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 $ # SUBDIRS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 $ # libtoolize --copy --force ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 $ # SUBDIRS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 $ # openbsmdir = $(includedir)/bsm ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 * * Derived from FreeBSD src/sys/sys/queue.h:1.63. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 $ */ #ifndef _COMPAT_QUEUE_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#2 (xtext) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#1 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 $ # man2_MANS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#8 (text+ko) ====