From owner-trustedbsd-cvs@FreeBSD.ORG Tue Oct 31 14:30:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84D4B16A416 for ; Tue, 31 Oct 2006 14:30:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B8AE43D73 for ; Tue, 31 Oct 2006 14:29:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5313E46C45 for ; Tue, 31 Oct 2006 09:29:12 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 144E972B99; Tue, 31 Oct 2006 14:28:52 +0000 (GMT) (envelope-from owner-perforce@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 ; 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 ; 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 ; 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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 108823 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2006 14:30:23 -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