From owner-p4-projects@FreeBSD.ORG  Tue May  3 22:02:17 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9589A16A4D0; Tue,  3 May 2005 22:02:16 +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 52BF416A4CE
	for <perforce@freebsd.org>; Tue,  3 May 2005 22:02:16 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 25F7F43D7C
	for <perforce@freebsd.org>; Tue,  3 May 2005 22:02:16 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j43M2Bht084761
	for <perforce@freebsd.org>; Tue, 3 May 2005 22:02:11 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j43M2AEq084758
	for perforce@freebsd.org; Tue, 3 May 2005 22:02:10 GMT
	(envelope-from scottl@freebsd.org)
Date: Tue, 3 May 2005 22:02:10 GMT
Message-Id: <200505032202.j43M2AEq084758@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76466 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, 03 May 2005 22:02:17 -0000

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

Change 76466 by scottl@scottl-x64 on 2005/05/03 22:02:01

	Add some plumbing to allow compatibility policy versions to be used.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#19 edit

Differences ...

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

@@ -14,13 +14,19 @@
 
 # Set to y if MLS is enabled in the module.
 MLS= n
+POLICYVERCOMPAT = 17
 
 FLASKDIR = flask/
 PREFIX = /usr
 LOADPOLICY  = $(DESTDIR)/sbin/sebsd_loadpolicy
 CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy
 SETFILES = $(DESTDIR)/sbin/sebsd_setfiles
-POLICYVERTMP = 17
+.if (POLICYVERCOMPAT)
+POLICYVERTMP = $(POLICYVERCOMPAT)
+POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT)
+.else
+POLICYVERTMP != ($(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ')
+.endif
 POLICYVER := policy.$(POLICYVERTMP)
 INSTALLDIR = $(DESTDIR)/etc/security/sebsd
 POLICYPATH = $(INSTALLDIR)/policy
@@ -97,14 +103,14 @@
 
 $(LOADPATH):  policy.conf $(CHECKPOLICY)
 	mkdir -p $(POLICYPATH)
-	$(CHECKPOLICY) -o $@ policy.conf
+	$(CHECKPOLICY) $(POLICYVERCOMPATARGS) -o $@ policy.conf
 # Note: Can't use install, so not sure how to deal with mode, user, and group
 #	other than by default.
 
 policy: $(POLICYVER)
 
 $(POLICYVER):  policy.conf $(CHECKPOLICY)
-	$(CHECKPOLICY) -o $@ policy.conf
+	$(CHECKPOLICY) $(POLICYVERCOMPATARGS) -o $@ policy.conf
 
 reload tmp/load: $(LOADPATH) $(FCPATH) 
 	$(LOADPOLICY) $(POLICYPATH)/$(POLICYVER)