From owner-p4-projects@FreeBSD.ORG Sun Nov 23 11:46:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E0516A4D0; Sun, 23 Nov 2003 11:46:25 -0800 (PST) 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 3F47316A4CE for ; Sun, 23 Nov 2003 11:46:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A720543F93 for ; Sun, 23 Nov 2003 11:46:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hANJkNXJ017167 for ; Sun, 23 Nov 2003 11:46:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hANJkN7g017164 for perforce@freebsd.org; Sun, 23 Nov 2003 11:46:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 23 Nov 2003 11:46:23 -0800 (PST) Message-Id: <200311231946.hANJkN7g017164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 42967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2003 19:46:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=42967 Change 42967 by rwatson@rwatson_powerbook on 2003/11/23 11:45:29 Attempt to improve the window server wrapper stuff a bit. There are two make targets: rotate-out-old-server, which renames the WindowServer to RealWindowServer. The second target, install-window-server-wrapper, installs our locally built WindowServer wrapper. Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#15 edit .. //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#15 (text+ko) ==== @@ -171,19 +171,12 @@ as LoginWindow appears not to offer any convenient hooks to allow this to be done without some subversion of its mechanisms. - First, build the wslogin dynamic library: + First, build and install the wslogin dynamic library and wsloginui.app + dialog: cd sebsd_system/wslogin - make - - Next, build the wslogin dialog using Project Builder: - - pbxbuild + make ; sudo make install - Install the library and wsloginui dialog tool using: - - sudo make install - In order to run the WindowServer in our modified environment, you must replace the existing WindowServer binary with our wrapper. NOTE: It is extremely important that these commands be executed cautiously: @@ -191,9 +184,9 @@ you really don't want to fail to rename before you install the new one, or you end up with no WindowServer at all: - sudo mv /System/Library/CoreServices/WindowServer \ - /System/Library/CoreServices/RealWindowServer + sudo make rotate-out-old-server # run exactly once sudo make install-window-server-wrapper + cd ../.. Step 9: Build SEDarwin Sample Policy ==== //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/Makefile#4 (text+ko) ==== @@ -6,6 +6,9 @@ wslogin.dylib: $(OBJS) gcc -dynamiclib -o $@ $(OBJS) ../../libsebsd/libsebsd.a ../../libmac/*.o +wsloginui.app: LabelChooser.m LabelChooser.h main.m + pbxbuild + install: install -m 644 -o root -g wheel wslogin.dylib /usr/lib cd build ; tar -cf - wsloginui.app | (cd /System/Library/CoreServices \ @@ -16,8 +19,14 @@ # Really be careful here! I wonder if we can make Make fail if it's already # there...? # +rotate-out-old-server: + sudo mv /System/Library/CoreServices/WindowServer \ + /System/Library/CoreServices/RealWindowServer + install-window-server-wrapper: - install -m 755 -o root -g wheel WindowServer /System/Library/Coreservices + install -m 755 -o root -g wheel WindowServer \ + /System/Library/CoreServices clean: rm -f $(OBJS) wslogin.dylib + rm -Rf wsloginui.app