From owner-p4-projects@FreeBSD.ORG  Wed Jun  1 15:25:41 2005
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 5B30D16A420; Wed,  1 Jun 2005 15:25:41 +0000 (GMT)
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 33F4916A41C
	for <perforce@freebsd.org>; Wed,  1 Jun 2005 15:25:41 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1343343D4C
	for <perforce@freebsd.org>; Wed,  1 Jun 2005 15:25:41 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j51FPeqr045473
	for <perforce@freebsd.org>; Wed, 1 Jun 2005 15:25:40 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j51FPeNA045470
	for perforce@freebsd.org; Wed, 1 Jun 2005 15:25:40 GMT
	(envelope-from areisse@nailabs.com)
Date: Wed, 1 Jun 2005 15:25:40 GMT
Message-Id: <200506011525.j51FPeNA045470@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77828 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: Wed, 01 Jun 2005 15:25:42 -0000

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

Change 77828 by areisse@areisse_ibook on 2005/06/01 15:25:38

	Checkpolicy changes for building on Darwin:
	-Use our makefile infrastructure
	-ipv6 structure fields

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 edit

Differences ...

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

@@ -1,16 +1,13 @@
 include ../../../Makeconfig
 
-vpath %.c $(SOURCE_ROOT)/sedarwin/sedarwin/ss
-
 PROG= checkpolicy
 
-OBJS = checkpolicy.o write.o policy_parse.o policy_scan.o services.o \
-       hashtab.o avtab.o ebitmap.o queue.o sidtab.o symtab.o policydb.o
+OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o
 
-CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/sedarwin/ss
-CFLAGS+= -I$(SOURCE_ROOT)/sedarwin
-LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsedarwin
-LDADD+= -lsebsd -lfl
+CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libsepol/include
+CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libselinux/include
+LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -L$(SOURCE_ROOT)/sedarwin/libsepol/src
+LDADD+= -lselinux -lsepol -lfl
 
 all: $(PROG)
 
@@ -21,7 +18,7 @@
 	install -m 555 $(PROG) $(DESTDIR)/usr/bin
 
 clean:
-	rm -f $(OBJS) $(PROG) policy_parse.c policy_scan.c policy_parse.h
+	rm -f $(OBJS) $(PROG) y.tab.* policy_scan.c
 
-policy_parse.c policy_parse.h: policy_parse.y
-	$(YACC) $(YFLAGS) -d -o policy_parse.c policy_parse.y
+y.tab.c y.tab.h: policy_parse.y
+	$(YACC) $(YFLAGS) -d policy_parse.y

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 (text+ko) ====

@@ -4438,6 +4438,8 @@
 	return 0;
 }
 
+#define s6_addr32 __u6_addr.__u6_addr32
+
 static int define_ipv6_node_context(void)
 {
 	char *id;