From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 13 20:29:41 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 30A1C16A476 for ; Tue, 13 Jun 2006 20:29:41 +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 9D30E43D76 for ; Tue, 13 Jun 2006 20:29:32 +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 9EE0E46C32 for ; Tue, 13 Jun 2006 16:29:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5E14B55689; Tue, 13 Jun 2006 20:27:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5781016A476; Tue, 13 Jun 2006 20:27:07 +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 10F3616A41A for ; Tue, 13 Jun 2006 20:27:07 +0000 (UTC) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B512E43D46 for ; Tue, 13 Jun 2006 20:27:06 +0000 (GMT) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DKOkr8083105 for ; Tue, 13 Jun 2006 20:24:46 GMT (envelope-from Patrick.LeBlanc@sparta.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DKOjst083102 for perforce@freebsd.org; Tue, 13 Jun 2006 20:24:45 GMT (envelope-from Patrick.LeBlanc@sparta.com) Date: Tue, 13 Jun 2006 20:24:45 GMT Message-Id: <200606132024.k5DKOjst083102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Patrick.LeBlanc@sparta.com using -f From: pleblanc To: Perforce Change Reviews Cc: Subject: PERFORCE change 99162 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, 13 Jun 2006 20:29:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=99162 Change 99162 by pleblanc@pleblanc_p4 on 2006/06/13 20:24:38 - Re-automate the installation of the sebsd policy sources. - Make actual installation paths agree with the installation doc. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#18 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#18 (text+ko) ==== @@ -310,9 +310,19 @@ sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" + +.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy) + (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) +.else + @echo "Existing SEBSD targeted policy sources found." + @echo "Will not reinstall them. To reinstall them by hand" + @echo "do \"cd contrib/sebsd/refpolicy && gmake install-src\"." +.endif + .if exists(${DESTDIR}/usr/bin/checkpolicy) .if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20) + mkdir -p ${DESTDIR}/etc/security/sebsd/targeted/policy (${DESTDIR}/usr/bin/checkpolicy -o ${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20 ${.CURDIR}/contrib/sebsd/support/policy.conf) .else @echo "Binary policy file found. Not overwriting." ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 (text+ko) ==== @@ -33,7 +33,7 @@ .endif POLICYVER := policy.$(POLICYVERTMP) POLICYBIN = policy.bin -INSTALLDIR = $(DESTDIR)/etc/security/sebsd +INSTALLDIR = $(DESTDIR)/etc/security/sebsd/targeted POLICYPATH = $(INSTALLDIR)/policy SRCPATH = $(INSTALLDIR)/src CONTEXTPATH = $(INSTALLDIR)/contexts @@ -138,10 +138,10 @@ m4 $(M4PARAM) -Imacros -s $(POLICYFILES) > $@.tmp mv $@.tmp $@ -install-src: /etc/security/sebsd - rm -rf $(INSTALLDIR)/policy.old - -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old - cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) +install-src: $(SRCPATH) + rm -rf $(SRCPATH)/policy.old + -mv $(SRCPATH)/policy $(SRCPATH)/policy.old + cd ..; tar cf - policy | (cd $(SRCPATH); tar xf -) tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program mkdir -p tmp