From owner-p4-projects@FreeBSD.ORG Fri Feb 16 15:39:08 2007 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 3513016A41F; Fri, 16 Feb 2007 15:39:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAA3D16A408 for ; Fri, 16 Feb 2007 15:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D703D13C4B3 for ; Fri, 16 Feb 2007 15:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1GFd7uq031952 for ; Fri, 16 Feb 2007 15:39:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1GFd7k8031949 for perforce@freebsd.org; Fri, 16 Feb 2007 15:39:07 GMT (envelope-from millert@freebsd.org) Date: Fri, 16 Feb 2007 15:39:07 GMT Message-Id: <200702161539.l1GFd7k8031949@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 114630 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, 16 Feb 2007 15:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114630 Change 114630 by millert@millert_p4 on 2007/02/16 15:39:02 Sync with contrib/sebsd Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#2 (text+ko) ==== @@ -15,22 +15,24 @@ #LDADD+= -L${.OBJDIR}/../libpam/libpam ${MINUSLPAM} #DPADD+= ${LIBPAM} -SRCS= booleans.c canonicalize_context.c compute_av.c compute_relabel.c \ - compute_user.c context.c disable.c enabled.c fgetfilecon.c \ - freecon.c freeconary.c fsetfilecon.c get_context_list.c \ - get_default_type.c getcon.c getenforce.c getexeccon.c \ - getfilecon.c getpeercon.c getpidcon.c init.c is_customizable_type.c \ - lgetfilecon.c load_policy.c lsetfilecon.c matchmediacon.c \ - matchpathcon.c policyvers.c query_user_context.c sebsd_config.c \ - setcon.c setenforce.c setfilecon.c seusers.c trans.c +SRCS= avc.c avc_internal.c avc_sidtab.c booleans.c canonicalize_context.c \ + checkAccess.c check_context.c compute_av.c compute_create.c \ + compute_member.c compute_relabel.c compute_user.c context.c \ + disable.c enabled.c fgetfilecon.c freecon.c freeconary.c \ + fsetfilecon.c get_context_list.c get_default_type.c \ + getcon.c getenforce.c getexeccon.c \ + getfilecon.c getpeercon.c getpidcon.c getprevcon.c init.c \ + is_customizable_type.c lgetfilecon.c load_policy.c \ + lsetfilecon.c matchmediacon.c matchpathcon.c policyvers.c \ + query_user_context.c sebsd_config.c \ + selinux_check_securetty_context.c setcon.c setenforce.c \ + setfilecon.c setrans_client.c seusers.c + +# The following require kernel support for fs and exec contexts +#SRCS += getfscreatecon.c setfscreatecon.c setexeccon.c -# Files left out, waiting for supporting functionality in the sebsd kernel -# module -# check_context.c compute_create.c \ -# compute_member.c getfscreatecon.c \ -# getprevcon.c setfscreatecon.c \ -# checkAccess.c rpm.c setexeccon.c -# +# The following are Linux-specific +#SRCS += procattr.c rpm.c INCSDIR=${INCLUDEDIR}/selinux @@ -41,7 +43,7 @@ MAN= avc_add_callback.3 avc_cache_stats.3 avc_context_to_sid.3 \ avc_has_perm.3 avc_init.3 context_new.3 freecon.3 \ get_ordered_context_list.3 getcon.3 getexeccon.3 getfilecon.3 \ - getfscreatecon.3 getseuserbyname.3 is_context_customizable.3 \ + getseuserbyname.3 is_context_customizable.3 \ is_selinux_enabled.3 matchmediacon.3 matchpathcon.3 \ security_check_context.3 security_compute_av.3 \ security_getenforce.3 security_load_booleans.3 \ @@ -102,8 +104,11 @@ matchpathcon.3 set_matchpathcon_printf.3 \ getcon.3 setcon.3 \ getexeccon.3 setexeccon.3 \ - getfscreatecon.3 setfscreatecon.3 \ avc_context_to_sid.3 sidget.3 \ avc_context_to_sid.3 sidput.3 +# Not currently supported +#MAN+= getfscreatecon.3 +#MLINKS+=getfscreatecon.3 setfscreatecon.3 + .include ==== //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#5 (text+ko) ====