PERFORCE change 91812 for review

[Todd Miller]

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

Change 91812 by millert at 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 <Cocoa/Cocoa.h>
 #import <sys/mac.h>
-#import <security/sebsd/sebsd.h>
+#import <sedarwin/sebsd.h>
 
-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 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>