From owner-p4-projects@FreeBSD.ORG  Tue Dec 21 17:32:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E605216A4D0; Tue, 21 Dec 2004 17:32:56 +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 9D10416A4CE
	for <perforce@freebsd.org>; Tue, 21 Dec 2004 17:32:56 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 85C9143D48
	for <perforce@freebsd.org>; Tue, 21 Dec 2004 17:32:56 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBLHWuPH067954
	for <perforce@freebsd.org>; Tue, 21 Dec 2004 17:32:56 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBLHWudn067951
	for perforce@freebsd.org; Tue, 21 Dec 2004 17:32:56 GMT
	(envelope-from areisse@nailabs.com)
Date: Tue, 21 Dec 2004 17:32:56 GMT
Message-Id: <200412211732.iBLHWudn067951@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 67473 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: Tue, 21 Dec 2004 17:32:57 -0000

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

Change 67473 by areisse@areisse_tislabs on 2004/12/21 17:32:00

	Changes to policy for it to build, and run (sort of).
	-initial sid for init is required on freebsd
	-new genhomedircon that does not use python or try to guess things
	 from passwd file

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#15 edit
.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genhomedircon#1 add
.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#6 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#15 (text+ko) ====

@@ -146,7 +146,7 @@
 	@echo "Building file_contexts ..."
 	@m4 $(ALL_TUNABLES) $(FCFILES) > $@.tmp
 	@grep -v "^/root" $@.tmp > $@.root
-	@/usr/sbin/genhomedircon . $@.root  > $@
+	./genhomedircon $@.root  > $@
 	@grep "^/root" $@.tmp >> $@
 	@-rm $@.tmp $@.root
 

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#6 (text+ko) ====

@@ -11,8 +11,7 @@
 sid file	system_u:object_r:file_t
 # Persistent label mapping is gone.  This initial SID can be removed.
 sid file_labels	system_u:object_r:unlabeled_t
-# init_t is still used, but an initial SID is no longer required.
-sid init	system_u:object_r:unlabeled_t
+sid init	system_u:system_r:init_t
 # any_socket is no longer used.
 sid any_socket 	system_u:object_r:unlabeled_t
 sid port	system_u:object_r:port_t