From owner-p4-projects@FreeBSD.ORG  Tue Oct 31 14:28:45 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 22D3B16A521; Tue, 31 Oct 2006 14:28:45 +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 D7C8016A505
	for <perforce@freebsd.org>; Tue, 31 Oct 2006 14:28:44 +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 E768B43D5A
	for <perforce@freebsd.org>; Tue, 31 Oct 2006 14:28:41 +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 k9VESfVu016245
	for <perforce@freebsd.org>; Tue, 31 Oct 2006 14:28:41 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9VESfCB016242
	for perforce@freebsd.org; Tue, 31 Oct 2006 14:28:41 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 31 Oct 2006 14:28:41 GMT
Message-Id: <200610311428.k9VESfCB016242@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 108823 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 Oct 2006 14:28:45 -0000

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

Change 108823 by millert@millert_macbook on 2006/10/31 14:28:09

	Remove hacks that kept the binary policy version at 20.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#6 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#7 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#6 (text+ko) ====

@@ -29,10 +29,6 @@
 	SEDARWIN_BUILD=1
 endif
 
-
-# XXX - SEDarwin is not up to binary policy version 21 yet so force 20
-OUTPUT_POLICY = 20
-
 # Include the local build.conf if it exists, otherwise
 # include the configuration of the root directory.
 include build.conf

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#7 (text+ko) ====

@@ -4,8 +4,7 @@
 #
 
 # determine the policy version and current kernel version if possible
-#pv := $(shell $(CHECKPOLICY) -V |cut -f 1 -d ' ')
-pv := 20
+pv := $(shell $(CHECKPOLICY) -V |cut -f 1 -d ' ')
 kv := $(shell sysctl security.mac.sebsd.policyvers | cut -d" " -f2 )
 
 # dont print version warnings if we are unable to determine