From owner-p4-projects@FreeBSD.ORG Fri Jan 20 15:51:28 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 EF48A16A423; Fri, 20 Jan 2006 15:51:27 +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 B021116A420 for ; Fri, 20 Jan 2006 15:51:27 +0000 (GMT) (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 5AAB943D46 for ; Fri, 20 Jan 2006 15:51:27 +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 k0KFpRUB076118 for ; Fri, 20 Jan 2006 15:51:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0KFpQk6076115 for perforce@freebsd.org; Fri, 20 Jan 2006 15:51:26 GMT (envelope-from millert@freebsd.org) Date: Fri, 20 Jan 2006 15:51:26 GMT Message-Id: <200601201551.k0KFpQk6076115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90011 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: Fri, 20 Jan 2006 15:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=90011 Change 90011 by millert@millert_g4tower on 2006/01/20 15:50:46 Update to work with the new module build framework. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#25 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#5 (text+ko) ==== @@ -1,21 +1,16 @@ -include ../../Makeconfig -include $(DARWIN_ROOT)/build/PolicyKext.mk +POLICY= sedarwin +POLICY_VER= 1.0 +POLICY_COMPVER= 1.0 +POLICY_DESC= "SEDarwin (SELinux compatible TE)" +POLICY_NOMAN= yes -CFLAGS += $(DARWIN_HDRS) -DKERNEL -DAPPLE -I.. +POLICY_SRCS= sebsd.c sebsd_syscall.c sebsd_sysctl.c +POLICY_SRCS+= ss/avtab.c ss/ebitmap.c ss/hashtab.c ss/init.c ss/policydb.c \ + ss/queue.c ss/services.c ss/sidtab.c ss/symtab.c ss/mach_av.c \ + ss/conditional.c +POLICY_SRCS+= avc/avc.c -OBJS = sebsd.o sebsd_syscall.o sebsd_sysctl.o ss/avtab.o ss/ebitmap.o \ - ss/hashtab.o ss/init.o ss/policydb.o ss/queue.o ss/services.o \ - ss/sidtab.o ss/symtab.o avc/avc.o ss/mach_av.o ss/conditional.o +CFLAGS+= -DSEFOS_DEBUG -I.. -sedarwin.kext.tar: sedarwin.o - -sedarwin.o: $(OBJS) - ld -r -o $@ $^ - -clean: - rm -rf sedarwin.kext.tar sedarwin.kext - rm -f $(OBJS) sedarwin.o - -install: sedarwin.kext.tar - cat $< | (cd $(DESTDIR)/System/Library/Extensions; tar xf -) - touch $(DESTDIR)/System/Library/Extensions/sedarwin.kext/LoadEarly +include ../../Makeconfig +include $(DARWIN_ROOT)/build/PolicyKext.mk ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#25 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2005, 2006 SPARTA, Inc. * Copyright (c) 2002, 2003 Networks Associates Technology, Inc. * All rights reserved. * @@ -2769,7 +2770,7 @@ extern kern_return_t _start(kmod_info_t *ki, void *data); extern kern_return_t _stop(kmod_info_t *ki, void *data); -KMOD_EXPLICIT_DECL(security.sedarwin, "1.0", _start, _stop) +KMOD_EXPLICIT_DECL(security.sedarwin, POLICY_VER, _start, _stop) kmod_start_func_t *_realmain = kmod_start; kmod_stop_func_t *_antimain = kmod_stop; int _kext_apple_cc = __APPLE_CC__ ;