From owner-p4-projects  Tue Jun 25 11:38:10 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBD6C37B40B; Tue, 25 Jun 2002 11:38:02 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 5792E37B409
	for <perforce@freebsd.org>; Tue, 25 Jun 2002 11:37:55 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5PIbtl70845
	for perforce@freebsd.org; Tue, 25 Jun 2002 11:37:55 -0700 (PDT)
	(envelope-from cvance@tislabs.com)
Date: Tue, 25 Jun 2002 11:37:55 -0700 (PDT)
Message-Id: <200206251837.g5PIbtl70845@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
Subject: PERFORCE change 13423 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13423

Change 13423 by cvance@cvance_korben on 2002/06/25 11:37:01

	Update makefiles (remove duplicate) to install SEBSD default 
	policy into /usr/share/security/sebsd

Affected files ...

... //depot/projects/trustedbsd/mac/etc/Makefile#14 edit
... //depot/projects/trustedbsd/mac/share/sebsd/Makefile#2 delete
... //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/Makefile#14 (text+ko) ====

@@ -100,8 +100,8 @@
 	    ${DESTDIR}/etc/ssl )
 .endif
 .if exists(${.CURDIR}/../contrib/sebsd)
-	(cd ${.CURDIR}/../contrib/sebsd/policy; \
-	    /sbin/sebsd_checkpolicy -o ${DESTDIR}/etc/security/sebsd/ss_policy)
+	(cd ${.CURDIR}/../contrib/sebsd/policy; cpio -p -R${BINOWN}:${BINGRP} ${DESTDIR}/etc/security/sebsd/policy < files.lst)
+	(cd ${DESTDIR}/etc/security/sebsd/policy; ${MAKE} install)
 .endif
 .if !defined(NO_MAKEDEV_INSTALL)
 	( cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \

==== //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#3 (text+ko) ====

@@ -1,10 +1,17 @@
 # $FreeBSD$
 # Install SEBSD example policy files.
 
-FILES=	policy/policy.conf policy/README
-NOOBJ=	noobj
-FILESDIR=	/usr/share/security/sebsd
+NOMAN = noman
+NOOBJ = noobj
+
+SRCDIR = ${.CURDIR}/../../../contrib/sebsd/policy
+DSTDIR = ${DESTDIR}/usr/share/security/sebsd/policy
+
+all:
+	echo ${DSTDIR}
+
+install:
+	cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst
 
-.PATH: ${.CURDIR}/../../../contrib/sebsd
 
 .include <bsd.prog.mk>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message