From owner-p4-projects@FreeBSD.ORG  Tue May 16 19:37:23 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 43C4D16A51A; Tue, 16 May 2006 19:37:23 +0000 (UTC)
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 063D916A518
	for <perforce@freebsd.org>; Tue, 16 May 2006 19:37:23 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BEC1143D49
	for <perforce@freebsd.org>; Tue, 16 May 2006 19:37:22 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJb5Ki081303
	for <perforce@freebsd.org>; Tue, 16 May 2006 19:37:05 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJb5nk081300
	for perforce@freebsd.org; Tue, 16 May 2006 19:37:05 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 16 May 2006 19:37:05 GMT
Message-Id: <200605161937.k4GJb5nk081300@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97289 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, 16 May 2006 19:37:23 -0000

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

Change 97289 by millert@millert_p4 on 2006/05/16 19:36:05

	Build SEBSD userland components from the contrib dir.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sbin/Makefile#16 edit
.. //depot/projects/trustedbsd/sebsd/sbin/restorecon/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#14 edit
.. //depot/projects/trustedbsd/sebsd/usr.bin/checkmodule/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#2 edit
.. //depot/projects/trustedbsd/sebsd/usr.bin/chkcon/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#16 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/avcstat/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/genhomedircon/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/load_policy/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/newrole/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/Makefile#2 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/sebsd_loadpolicy.8#3 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/sebsd_loadpolicy.c#3 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/Makefile#3 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.1#2 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#5 delete
.. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_expand/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_link/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_package/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/setfiles/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/usr.sbin/setsebool/Makefile#1 add

Differences ...

==== //depot/projects/trustedbsd/sebsd/sbin/Makefile#16 (text+ko) ====

@@ -78,6 +78,7 @@
 	rcorder \
 	reboot \
 	restore \
+	${_restorecon} \
 	route \
 	routed \
 	rtsol \
@@ -117,6 +118,10 @@
 _ping6=		ping6
 .endif
 
+.if !defined(NO_SEBSD)
+_restorecon=	restorecon
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MACHINE} == "i386"
 _fdisk=		fdisk

==== //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#14 (text+ko) ====

@@ -32,7 +32,9 @@
 	${_catman} \
 	chat \
 	checknr \
+	${_checkmodule} \
 	${_checkpolicy} \
+	${_chkcon} \
 	${_chkey} \
 	chpass \
 	cksum \
@@ -328,7 +330,9 @@
 .endif
 
 .if !defined(NO_SEBSD)
-_checkpolicy=	checkpolicy
-.endif
+_checkmodule=   checkmodule
+_checkpolicy=   checkpolicy
+_chkcon=        chkcon
+.endif    
 
 .include <bsd.subdir.mk>

==== //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#2 (text+ko) ====


==== //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#16 (text+ko) ====

@@ -155,8 +155,16 @@
 	rwhod \
 	sa \
 	${_sendmail} \
-	${_sebsd_loadpolicy} \
-	${_sebsd_newrole} \
+	${_avcstat}\
+	${_genhomedircon}\
+	${_load_policy} \
+	${_newrole} \
+	${_setfiles} \
+	${_setsebool} \
+	${_semodule} \
+	${_semodule_expand} \
+	${_semodule_link} \
+	${_semodule_package} \
 	setpmac \
 	${_sicontrol} \
 	sliplogin \
@@ -263,8 +271,16 @@
 .endif
 
 .if !defined(NO_SEBSD)
-_sebsd_loadpolicy=	sebsd_loadpolicy
-.sebsd_newrole=		sebsd_newrole
+_avcstat=	   avcstat
+_genhomedircon=	   genhomedircon
+_load_policy=	   load_policy
+_newrole=	   newrole
+_setfiles=         setfiles
+_setsebool=        setsebool
+_semodule=         semodule
+_semodule_expand=  semodule_expand
+_semodule_link=    semodule_link
+_semodule_package= semodule_package
 .endif
 
 .if ${MK_SENDMAIL} != "no"