From owner-p4-projects@FreeBSD.ORG  Sun May  8 20:42:10 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8651116A4E8; Sun,  8 May 2005 20:42:10 +0000 (GMT)
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 2B68916A4E6
	for <perforce@freebsd.org>; Sun,  8 May 2005 20:42:10 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1480343D39
	for <perforce@freebsd.org>; Sun,  8 May 2005 20:42:10 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j48Kg9Uv094555
	for <perforce@freebsd.org>; Sun, 8 May 2005 20:42:09 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j48Kg9N2094549
	for perforce@freebsd.org; Sun, 8 May 2005 20:42:09 GMT
	(envelope-from csjp@freebsd.org)
Date: Sun, 8 May 2005 20:42:09 GMT
Message-Id: <200505082042.j48Kg9N2094549@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76709 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 08 May 2005 20:42:11 -0000

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

Change 76709 by csjp@csjp_xor on 2005/05/08 20:41:49

	
	-unbreak the MACALL kernel build by adding options KDB which is now required
	 by options DDB
	-add MAC_CHKEXEC to the MACALL kernel config
	-fix handling of sha1.h header file and adjust the Makefile to so that is
	 does'nt have the sha1.h header hack. (I am not sure real sure why is was
	 hooked into the build like this in the first place).

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#5 edit
.. //depot/projects/trustedbsd/mac/sys/modules/mac_chkexec/Makefile#2 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#5 (text+ko) ====

@@ -46,6 +46,7 @@
 options 	MAC_SEEOTHERUIDS
 options 	MAC_STUB
 options 	MAC_TEST
+options		MAC_CHKEXEC
 #options 	SEBSD
 
 options 	SCHED_4BSD		#4BSD scheduler
@@ -79,7 +80,8 @@
 # Debugging for use in -current
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
-options 	DDB			#Enable the kernel debugger
+options		KDB			# Enable the kernel debugger
+options 	DDB			# Support DDB.
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			#Enable checks to detect deadlocks and cycles

==== //depot/projects/trustedbsd/mac/sys/modules/mac_chkexec/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 .PATH: ${.CURDIR}/../../crypto
 .PATH: ${.CURDIR}/../../security/mac_chkexec
-CFLAGS+=	-I${.CURDIR}/../../crypto -g
+CFLAGS+=	-g
 # 
 # Un comment the following line to enable debugging
 CFLAGS+=	-DDEBUG

==== //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#7 (text+ko) ====

@@ -60,7 +60,7 @@
 #include <sys/mac_policy.h>
 #include <security/mac_chkexec/mac_chkexec.h>
 
-#include "sha1.h"
+#include <crypto/sha1.h>
 
 /*
  * Prototypes