From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 17:58:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DF8816A424 for ; Wed, 15 Feb 2006 17:58:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B96FE43D45 for ; Wed, 15 Feb 2006 17:58:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 598A446BF2 for ; Wed, 15 Feb 2006 12:57:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CFF3455443; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E9116A423; Wed, 15 Feb 2006 17:57:59 +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 696B816A420 for ; Wed, 15 Feb 2006 17:57:59 +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 1C25A43D45 for ; Wed, 15 Feb 2006 17:57:59 +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 k1FHvwC7032150 for ; Wed, 15 Feb 2006 17:57:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FHvw3T032147 for perforce@freebsd.org; Wed, 15 Feb 2006 17:57:58 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 17:57:58 GMT Message-Id: <200602151757.k1FHvw3T032147@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 91812 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 17:58:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91812 Change 91812 by millert@millert_g4tower on 2006/02/15 17:57:41 Build and install the GUI file relabel tool Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 (text+ko) ==== @@ -2,19 +2,23 @@ SUBDIR= checkpolicy \ loadpolicy \ - newrole + newrole \ + relabel_gui all: cd checkpolicy ; gnumake cd loadpolicy ; gnumake cd newrole ; gnumake + cd relabel_gui ; gnumake clean: cd checkpolicy ; gnumake clean cd loadpolicy ; gnumake clean cd newrole ; gnumake clean + cd relabel_gui ; gnumake clean install: cd checkpolicy ; gnumake install cd loadpolicy ; gnumake install cd newrole ; gnumake install + cd relabel_gui ; gnumake install ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 (text+ko) ==== @@ -2,14 +2,16 @@ #import "LabelDialog.h" #import #import -#import +#import -const char *filename, *initial; +const char *filename; +char *initial; char **users, **roles, **types; size_t nusers, nroles, ntypes; extern int security_get_file_contexts(const char *fromcontext, char ***retcontexts, size_t *ncontexts); +extern char *getseccontext(void); static void addstring (char **ar, size_t *n, char *in) { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 (text+ko) ==== @@ -171,10 +171,10 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ""; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = "../../libsebsd/libsebsd.a ../../libmac/libmac.a"; + OTHER_CFLAGS = "-I../.."; + OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; USE_GCC3_PFE_SUPPORT = NO; @@ -185,7 +185,7 @@ ); isa = PBXApplicationTarget; name = relabel_gui; - productInstallPath = "$(HOME)/Applications"; + productInstallPath = "/Applications"; productName = relabel_gui; productReference = 17587328FF379C6511CA2CBB; productSettingsXML = "