PERFORCE change 90011 for review

[Todd Miller]

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

Change 90011 by millert at 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__ ;