From owner-p4-projects@FreeBSD.ORG  Tue Jan 31 15:56:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF30516A425; Tue, 31 Jan 2006 15:56:04 +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 99E5816A424
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:56:04 +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 C9F9943D69
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:55:59 +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 k0VFtxcQ047177
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 15:55:59 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 k0VFtwjQ047171
	for perforce@freebsd.org; Tue, 31 Jan 2006 15:55:58 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 31 Jan 2006 15:55:58 GMT
Message-Id: <200601311555.k0VFtwjQ047171@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90798 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2006 15:56:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=90798

Change 90798 by rwatson@rwatson_zoo on 2006/01/31 15:55:25

	Build audit(8) and auditd(8) from OpenBSM, not contrib/audit_supt.

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 edit
.. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 (text+ko) ====

@@ -2,10 +2,13 @@
 # $FreeBSD$
 #
 
-SRCDIR=${.CURDIR}/../../contrib/audit_supt/audit
-.PATH: ${SRCDIR}
+OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+.PATH: ${OPENBSMDIR}/bin/audit
 
 PROG=	audit
-MAN=	audit.1
+MAN=	audit.8
+
+DPADD=	${LIBBSM}
+LDADD=	-lbsm
 
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 (text+ko) ====

@@ -2,12 +2,12 @@
 # $FreeBSD$
 #
 
-SRCDIR=${.CURDIR}/../../contrib/audit_supt/auditd
-.PATH: ${SRCDIR}
+OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+.PATH: ${OPENBSMDIR}/bin/auditd
 
 PROG=	auditd
+SRCS=	auditd.c audit_warn.c
 MAN=	auditd.8
-SRCS=	auditd.c audit_warn.c
 
 DPADD=	${LIBBSM}
 LDADD=	-lbsm