From owner-p4-projects@FreeBSD.ORG  Thu Apr 20 21:49:55 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB10116A407; Thu, 20 Apr 2006 21:49:54 +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 9E94916A405
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 21:49:54 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F56543D49
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 21:49:54 +0000 (GMT)
	(envelope-from millert@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 k3KLnsU0018829
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 21:49:54 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLnrvM018826
	for perforce@freebsd.org; Thu, 20 Apr 2006 21:49:53 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 20 Apr 2006 21:49:53 GMT
Message-Id: <200604202149.k3KLnrvM018826@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95727 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 20 Apr 2006 21:49:55 -0000

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

Change 95727 by millert@millert_g5tower on 2006/04/20 21:49:11

	checkpolicy 1.30
	Obtained from: SELinux

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.8#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/genpolusers.c#2 delete
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.h#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dismod.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dispol.c#1 add

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 (text+ko) ====

@@ -1,20 +1,19 @@
-all:
-	cd sedarwin && gnumake
-	cd libsepol/src && gnumake
-	cd libselinux && gnumake
-	cd programs && gnumake
-	cd policy && gnumake
+SUBDIR= sedarwin \
+	libsecompat \
+	libsepol \
+	libselinux \
+	libsemanage \
+	programs \
+	policy
+
+.PHONY: $(SUBDIR) all install clean
+
+all: $(SUBDIR)
 
-clean:
-	cd sedarwin && gnumake clean
-	cd libsepol/src && gnumake clean
-	cd libselinux && gnumake clean
-	cd programs && gnumake clean
-	cd policy && gnumake clean
+$(SUBDIR):
+	$(MAKE) -w -C $@ 
 
-install:
-	cd sedarwin && gnumake install
-	cd libsepol/src && gnumake install
-	cd libselinux && gnumake install
-	cd programs && gnumake install
-	cd policy && gnumake install
+install clean:
+	for dir in $(SUBDIR); do \
+		$(MAKE) -w -C $$dir $@; \
+	done

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 (text+ko) ====

@@ -1,24 +1,24 @@
-include ../../Makeconfig
-
 SUBDIR= checkpolicy \
-	loadpolicy \
+	genhomedircon \
+	load_policy \
 	newrole \
-	relabel_gui
+	setfiles \
+	setsebool \
+	semodule \
+	semodule_expand \
+	semodule_link \
+	semodule_package \
+	relabel_gui \
+	restorecon
+
+.PHONY: $(SUBDIR) all install clean
 
-all:
-	cd checkpolicy ; gnumake
-	cd loadpolicy ; gnumake
-	cd newrole ; gnumake
-	cd relabel_gui ; gnumake
+all: $(SUBDIR)
 
-clean:
-	cd checkpolicy ; gnumake clean
-	cd loadpolicy ; gnumake clean
-	cd newrole ; gnumake clean
-	cd relabel_gui ; gnumake clean
+$(SUBDIR):
+	$(MAKE) -w -C $@
 
-install:
-	cd checkpolicy ; gnumake install
-	cd loadpolicy ; gnumake install
-	cd newrole ; gnumake install
-	cd relabel_gui ; gnumake install
+install clean:
+	for dir in $(SUBDIR); do \
+		$(MAKE) -w -C $$dir $@; \
+	done