From owner-p4-projects@FreeBSD.ORG Mon Jun 19 01:22:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7CB416A47C; Mon, 19 Jun 2006 01:22:15 +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 8156016A47A for ; Mon, 19 Jun 2006 01:22:15 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 202F943D62 for ; Mon, 19 Jun 2006 01:22:15 +0000 (GMT) (envelope-from dongmei@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 k5J1MFQt089772 for ; Mon, 19 Jun 2006 01:22:15 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5J1MEHa089769 for perforce@freebsd.org; Mon, 19 Jun 2006 01:22:14 GMT (envelope-from dongmei@FreeBSD.org) Date: Mon, 19 Jun 2006 01:22:14 GMT Message-Id: <200606190122.k5J1MEHa089769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 99577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jun 2006 01:22:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=99577 Change 99577 by dongmei@soc-dongmei-sebsd on 2006/06/19 01:22:02 Modify the README file in accordance with the trustedbsd sebsd branch Affected files ... .. //depot/projects/soc2006/dongmei_sebsd/Makefile#2 integrate .. //depot/projects/soc2006/dongmei_sebsd/README#2 edit .. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/policy/Makefile#2 integrate Differences ... ==== //depot/projects/soc2006/dongmei_sebsd/Makefile#2 (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/soc2006/dongmei_sebsd/README#2 (text+ko) ==== @@ -1,1 +1,165 @@ -Just for test! +This is the top level of the FreeBSD source directory. This file +was last revised on: +$FreeBSD: src/README,v 1.21 2002/07/21 16:45:30 wosch Exp $ + +For copyright information, please see the file COPYRIGHT in this +directory (additional copyright information also exists for some +sources in this tree - please see the specific source directories for +more information). + +The Makefile in this directory supports a number of targets for +building components (or all) of the FreeBSD source tree, the most +commonly used one being ``world'', which rebuilds and installs +everything in the FreeBSD system from the source tree except the +kernel, the kernel-modules and the contents of /etc. The +``buildkernel'' and ``installkernel'' targets build and install +the kernel and the modules (see below). Please see the top of +the Makefile in this directory for more information on the +standard build targets and compile-time flags. + +Building a kernel is a somewhat more involved process, documentation +for which can be found at: + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +And in the config(8) man page. +Note: If you want to build and install the kernel with the +``buildkernel'' and ``installkernel'' targets, you might need to build +world before. More information is available in the handbook. + +The sample kernel configuration files reside in the sys//conf +sub-directory (assuming that you've installed the kernel sources), the +file named GENERIC being the one used to build your initial installation +kernel. The file NOTES contains entries and documentation for all possible +devices, not just those commonly used. It is the successor of the ancient +LINT file, but in contrast to LINT, it is not buildable as a kernel but a +pure reference and documentation file. + + +Source Roadmap: +--------------- +bin System/user commands. + +contrib Packages contributed by 3rd parties. + +crypto Cryptography stuff (see crypto/README). + +etc Template files for /etc. + +games Amusements. + +gnu Various commands and libraries under the GNU Public License. + Please see gnu/COPYING* for more information. + +include System include files. + +kerberos5 Kerberos5 (Heimdal) package. + +kerberosIV KerberosIV (eBones) package. + +lib System libraries. + +libexec System daemons. + +release Release building Makefile & associated tools. + +sbin System commands. + +secure Cryptographic libraries and commands. + +share Shared resources. + +sys Kernel sources. + +tools Utilities for regression testing and miscellaneous tasks. + +usr.bin User commands. + +usr.sbin System administration commands. + + +For information on synchronizing your source tree with one or more of +the FreeBSD Project's development branches, please see: + + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html +==== THEIRS README#4 +This is the top level of the FreeBSD source directory. This file +was last revised on: +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ + +For copyright information, please see the file COPYRIGHT in this +directory (additional copyright information also exists for some +sources in this tree - please see the specific source directories for +more information). + +The Makefile in this directory supports a number of targets for +building components (or all) of the FreeBSD source tree, the most +commonly used one being ``world'', which rebuilds and installs +everything in the FreeBSD system from the source tree except the +kernel, the kernel-modules and the contents of /etc. The +``buildkernel'' and ``installkernel'' targets build and install +the kernel and the modules (see below). Please see the top of +the Makefile in this directory for more information on the +standard build targets and compile-time flags. + +Building a kernel is a somewhat more involved process, documentation +for which can be found at: + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +And in the config(8) man page. +Note: If you want to build and install the kernel with the +``buildkernel'' and ``installkernel'' targets, you might need to build +world before. More information is available in the handbook. + +The sample kernel configuration files reside in the sys//conf +sub-directory (assuming that you've installed the kernel sources), the +file named GENERIC being the one used to build your initial installation +kernel. The file NOTES contains entries and documentation for all possible +devices, not just those commonly used. It is the successor of the ancient +LINT file, but in contrast to LINT, it is not buildable as a kernel but a +pure reference and documentation file. + + +Source Roadmap: +--------------- +bin System/user commands. + +contrib Packages contributed by 3rd parties. + +crypto Cryptography stuff (see crypto/README). + +etc Template files for /etc. + +games Amusements. + +gnu Various commands and libraries under the GNU Public License. + Please see gnu/COPYING* for more information. + +include System include files. + +kerberos5 Kerberos5 (Heimdal) package. + +lib System libraries. + +libexec System daemons. + +release Release building Makefile & associated tools. + +rescue Build system for statically linked /rescue utilities. + +sbin System commands. + +secure Cryptographic libraries and commands. + +share Shared resources. + +sys Kernel sources. + +tools Utilities for regression testing and miscellaneous tasks. + +usr.bin User commands. + +usr.sbin System administration commands. + + +For information on synchronizing your source tree with one or more of +the FreeBSD Project's development branches, please see: + + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html ==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/policy/Makefile#2 (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