PERFORCE change 97288 for review

Todd Miller millert at FreeBSD.org
Tue May 16 19:27:34 UTC 2006


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

Change 97288 by millert at millert_p4 on 2006/05/16 19:26:26

	Replace libsebsd with libselinux and add libsemanage.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/lib/Makefile#20 edit
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/Makefile#8 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/filecon.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/get_ordered_context_list.c#4 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/getseccontext.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/query_user_context.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd.h#7 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd_config.c#3 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_change_context.c#3 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_compute_av.c#5 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_get_user_contexts.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/string_to_security_class.c#2 delete
.. //depot/projects/trustedbsd/sebsd/lib/libsebsd/system.c#5 delete
.. //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#1 add
.. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/lib/Makefile#20 (text+ko) ====

@@ -37,7 +37,7 @@
 	${_libsmdb} \
 	${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
 	libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \
-	${_libsecompat} ${_libsebsd} ${_libsepol}
+	${_libsecompat} ${_libselinux} ${_libsepol} ${_libsemanage}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
@@ -84,8 +84,9 @@
 
 .if !defined(NO_SEBSD)
 _libsecompat=	libsecompat
-_libsebsd=	libsebsd
+_libselinux=	libselinux
 _libsepol=	libsepol
+_libsemanage=	libsemanage
 .endif
 
 .if ${MK_SENDMAIL} != "no"

==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#4 (text+ko) ====

@@ -2,21 +2,31 @@
 # $FreeBSD: $
 #
 
-.PATH: ${.CURDIR} ${.CURDIR}/../../contrib/sebsd/libsepol/src ${.CURDIR}/../../contrib/sebsd/libsepol/include
+.PATH: ${.CURDIR} ${.CURDIR}/../../contrib/sebsd/libsepol/src
+.PATH: ${.CURDIR}/../../contrib/sebsd/libsepol/include
+.PATH: ${.CURDIR}/../../contrib/sebsd/libsepol/man/man3
 
 MAINTAINER= cboss at nai.com
 LIB= sepol
 CFLAGS+= -g -I${.CURDIR}/../../contrib/sebsd/libsepol/include
-NOMAN=
 
-SRCS=	avtab.c conditional.c ebitmap.c genbools.c hashtab.c mls.c policydb.c \
-	services.c sidtab.c symtab.c write.c
+SRCS=	assertion.c avrule_block.c avtab.c boolean_record.c booleans.c \
+	conditional.c constraint.c context.c context_record.c debug.c \
+	ebitmap.c expand.c genbools.c genusers.c handle.c hashtab.c \
+	hierarchy.c iface_record.c interfaces.c link.c mls.c module.c \
+	node_record.c nodes.c policydb.c policydb_convert.c \
+	policydb_public.c port_record.c ports.c roles.c services.c \
+	sidtab.c symtab.c user_record.c users.c util.c write.c
 
 INCSDIR=${INCLUDEDIR}/sepol
 
-INCS=	sepol/avtab.h sepol/conditional.h sepol/constraint.h sepol/context.h \
-	sepol/ebitmap.h sepol/flask.h sepol/flask_types.h sepol/hashtab.h \
-	sepol/mls.h sepol/mls_types.h sepol/policydb.h sepol/services.h \
-	sepol/sidtab.h sepol/sepol.h sepol/symtab.h
+INCS=	sepol/boolean_record.h sepol/booleans.h sepol/context.h \
+	sepol/context_record.h sepol/debug.h sepol/handle.h \
+	sepol/iface_record.h sepol/interfaces.h sepol/module.h \
+	sepol/node_record.h sepol/nodes.h sepol/policydb.h \
+	sepol/port_record.h sepol/ports.h sepol/roles.h sepol/sepol.h \
+	sepol/user_record.h sepol/users.h
+
+MAN=	sepol_check_context.3 sepol_genbools.3 sepol_genusers.3  
 
 .include <bsd.lib.mk>


More information about the trustedbsd-cvs mailing list