PERFORCE change 108823 for review

[Todd Miller]

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

Change 108823 by millert at 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