[darwinbuild-changes] [1011] trunk

Revision: 1011 http://trac.macosforge.org/projects/darwinbuild/changeset/1011 Author: mww@apple.com Date: 2012-02-08 13:42:06 -0800 (Wed, 08 Feb 2012) Log Message: ----------- darwinup: Run xpchelper on system sandbox profile changes. Modified Paths: -------------- trunk/darwinup/Depot.cpp trunk/darwinup/Utils.cpp trunk/testing/darwinup/run-tests.sh Added Paths: ----------- trunk/testing/darwinup/sandboxprofile.tar.bz2 trunk/testing/darwinup/xpcservice.tar.bz2 Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-10008999:984 /branches/PR-10307836:993-996 /branches/PR-10363375:959-960 /branches/PR-10397485:967 /branches/PR-10412052:973-975 /branches/PR-10412066:974-975 /branches/PR-10428083:994-997 /branches/PR-10431324:979-980 /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7872907:830-840 /branches/PR-7935095:819-821 /branches/PR-8116613:849 /branches/PR-8279204:854-862 /branches/PR-8416637:870-880 /branches/PR-8486662:885-889 /branches/PR-8488185:894-898 /branches/PR-8604911:903-905 /branches/PR-8817822:917-933 /branches/PR-8908468:912 /branches/PR-9697169:1004-1008 /branches/PR-9709247:1002-1009 + /branches/PR-10008999:984 /branches/PR-10307836:993-996 /branches/PR-10363375:959-960 /branches/PR-10397485:967 /branches/PR-10412052:973-975 /branches/PR-10412066:974-975 /branches/PR-10428083:994-997 /branches/PR-10431324:979-980 /branches/PR-10821792:1007-1010 /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7872907:830-840 /branches/PR-7935095:819-821 /branches/PR-8116613:849 /branches/PR-8279204:854-862 /branches/PR-8416637:870-880 /branches/PR-8486662:885-889 /branches/PR-8488185:894-898 /branches/PR-8604911:903-905 /branches/PR-8817822:917-933 /branches/PR-8908468:912 /branches/PR-9697169:1004-1008 /branches/PR-9709247:1002-1009 Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2012-02-08 21:40:40 UTC (rev 1010) +++ trunk/darwinup/Depot.cpp 2012-02-08 21:42:06 UTC (rev 1011) @@ -550,16 +550,17 @@ this->m_modified_extensions = true; } - if (!this->m_modified_xpc_services && - (strstr(file->path(), ".xpc/") != NULL)) { - - bool modified = (has_suffix(file->path(), "Info.plist") || - has_suffix(file->path(), "framework.sb")); - - if (modified) { + if (!this->m_modified_xpc_services) { + if ((strstr(file->path(), ".xpc/") != NULL) && has_suffix(file->path(), "Info.plist")) { IF_DEBUG("[analyze] xpc service detected\n"); this->m_modified_xpc_services = true; } + + if ((strncmp(file->path(), "/System/Library/Sandbox/Profiles", 33) == 0) || + (has_suffix(file->path(), "framework.sb"))) { + IF_DEBUG("[analyze] profile modification detected\n"); + this->m_modified_xpc_services = true; + } } } Modified: trunk/darwinup/Utils.cpp =================================================================== --- trunk/darwinup/Utils.cpp 2012-02-08 21:40:40 UTC (rev 1010) +++ trunk/darwinup/Utils.cpp 2012-02-08 21:42:06 UTC (rev 1011) @@ -371,6 +371,14 @@ res = find_base_system_path(&base, path); if (res) return res; + // xpchelper expects the --root value to *not* end in a slash. + if (has_suffix(base, "/")) { + char *ptr = strrchr(base, '/'); + if (ptr) { + *ptr = '\0'; + } + } + if (verbosity) { fprintf(stdout, "Updating xpc services cache for %s ...", base); fflush(stdout); Modified: trunk/testing/darwinup/run-tests.sh =================================================================== --- trunk/testing/darwinup/run-tests.sh 2012-02-08 21:40:40 UTC (rev 1010) +++ trunk/testing/darwinup/run-tests.sh 2012-02-08 21:42:06 UTC (rev 1011) @@ -57,7 +57,7 @@ tar zxvf $R.tar.gz -C $PREFIX done; -for R in 300dirs.tbz2 300files.tbz2 deep-rollback.cpgz deep-rollback-2.xar extension.tar.bz2; +for R in 300dirs.tbz2 300files.tbz2 deep-rollback.cpgz deep-rollback-2.xar extension.tar.bz2 sandboxprofile.tar.bz2 xpcservice.tar.bz2; do cp $R $PREFIX/ done; @@ -360,7 +360,28 @@ echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 +echo "========== TEST: Install XPC Service ==========" +mkdir -p $DEST/usr/libexec +mkdir -p $DEST/System +cp /usr/libexec/xpchelper $DEST/usr/libexec +$DARWINUP install xpcservice.tar.bz2 +test -f $DEST/System/Library/Caches/com.apple.xpchelper.cache +$DARWINUP uninstall newest +rm -rf $DEST/System $DEST/usr +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +$DIFF $ORIG $DEST 2>&1 +echo "========== TEST: Install Sandbox Profile ==========" +mkdir -p $DEST/usr/libexec +mkdir -p $DEST/System +cp /usr/libexec/xpchelper $DEST/usr/libexec +$DARWINUP install sandboxprofile.tar.bz2 +test -f $DEST/System/Library/Caches/com.apple.xpchelper.cache +$DARWINUP uninstall newest +rm -rf $DEST/System $DEST/usr +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +$DIFF $ORIG $DEST 2>&1 + echo "========== TEST: Forcing object change: file to directory ==========" is_file $DEST/rep_file $DARWINUP -f install $PREFIX/rep_file_dir Copied: trunk/testing/darwinup/sandboxprofile.tar.bz2 (from rev 1010, branches/PR-10821792/testing/darwinup/sandboxprofile.tar.bz2) =================================================================== --- trunk/testing/darwinup/sandboxprofile.tar.bz2 (rev 0) +++ trunk/testing/darwinup/sandboxprofile.tar.bz2 2012-02-08 21:42:06 UTC (rev 1011) @@ -0,0 +1,3 @@ +BZh91AY&SY\xD0{4
#\xFF\x94Ѐ\xC0@
\xFF\xA0@$h wg\x9E\xE00\xF8\xD0cM\x804F\x9A\x9A0hI\x93A1&&\xC0"\x94ҟ\xA4\xF5M=M\xA4\xC4h\x86OT䘧\xF0\xF1 +!QX\xD0\xBBu\xCFg\x94\xC11K\x91J \xC0\x9A\x84\xB8'`\x92\xB5\xA1\xAD$\xB9\xE5\x9F4\xB0\xB1\x95\xF4A\xA3\x84\xF3HWw/\x9E<nI\xA5gD\xB2Ie\x89R' aS'dN\x88h@Ѕ\x8E-ր\xC5\xA64\x85:\xB1p\xC8(\xEE\x86\xB5 ۂo_\xE7\xA8d\xE4\x9DR\xE4\xFC#2\xA9\xD0;J\x9D\x9B\xD6\xE4\xE8\xC9 3=A38\xAAb\x9Aj\x98U*\x96\xB7\x87\xB2`\xA0\x8B\xB9"\x9C(Hh=\x9A + \ No newline at end of file Copied: trunk/testing/darwinup/xpcservice.tar.bz2 (from rev 1010, branches/PR-10821792/testing/darwinup/xpcservice.tar.bz2) =================================================================== --- trunk/testing/darwinup/xpcservice.tar.bz2 (rev 0) +++ trunk/testing/darwinup/xpcservice.tar.bz2 2012-02-08 21:42:06 UTC (rev 1011) @@ -0,0 +1,18 @@ +BZh91AY&SY\xE0\x87N\xBF ,\xFF\xFF\xFF\xED\xFF\xF7\xD7\xFF\xF7\xFF\xEF\xFFw\xFF\xFF\xFF\xF2\xCF\xFA@"D4\xC0\xF2}\xC0\xE2FWnU\xFD\xE0 O\x80v\xC0LE6\xA9?Tچ\x8FҀ\xD0\x81\xA0\xD0\xA2\x98\x8C\x9Ad\xD0hd\xC42\xD3@a#M0A\x84\xC414
\xA0F\xD04\xD3A\x90CL\x9Ai\x9054HiM\xE9Fi\xEA\x98\xF2\x990@ɀi\x80L d\xC16\x80
0C2b2i\x93A\xA1\x93\xC8M
\x84`\x8D4\xC1\xC4h\xD0\x80a@\xD3M@ +2h
\xA6B\x98\x8C\x9Ad\xD0hd\xC42\xD3@a#M0A\x84\xC414
\xA0F\xD04\xD3A\x90CL\x9Ai\x90$H\x82i\xA0\x8D\x9E\x80Sh'\xA6\xA4\xFC\xA9䞃P\xCD4\xD4\xF4\xD2<\x8D5<\x80\x8D\xA0\x8C\x8D\xA9\xA7\xA9\x93F@SL a4\x98\x86\x8D\x99\x8A +S\xA7Ԃ\x9B +\x8F\xDBP>P\x8A\xB6\x88`*\x87 1\xE7\x90DY\x80\x9C\x95\xC0L \x8Ef\xB9\xE9\xDDD\xF4|=\x90\x99\xCFY\xD5F\xE6\xB6׊d\xEB\xCD_q\x99\x9Eg췇\xC5\xC33\xEC\xE6}\xB3L\xFA&`\xDBgHio\xF2*\x80\xB8\xA9\xE1\xCAym\x90Xoz[!n\xB9\x9F\x96Ya\xDE\xE1\xAA\xDA- \xDF:"W\x92\x90ZTT`&b\x81Ȉm\xFC\x8F\xD2\xED\x847Ţ\xA2\xA8\xF2L\xE4\x97W"\x81\xE74\x80ްد\xE0\xE0\x99[\xA9\x99\xFE-ϩ\xA1\xD4/\xA0\xAC\xAF>ȳ\xCC\xD9*\xAFZ\xCEQ\x8Ebd\xFDY!@ï.\xD1!1"lU\x8CNO\xB0\x92\xF2\xF7\xD8$*s\xEE\xCDϼ\x8D\xAE\xDA\xEFg\xCD\xE3\xDC\xCBۙ2\x92\x9A^\xED\x874\x82\x862\xB2\xE3\xF1\xE4_\x9C\xA5\xA0\xE47x\x8E\xB1\x87af\x96\xD4\xCD!\xD0Eeu}\xE9ԝ\xD4\xF5\x8E4}\xEC\x8C߿\x8Dl\x9EaE +%dE\xC7wRR\xE0<\x97\xD4\xFE0\xEE\xF9\xFC\xDE^\x86 +\xBA8-\x91\xE01$\xBEK\x98\xF1#\x82P֔\x9B\x94466\xE4\xE0n$\x83``\xA64\x92\xC2\xCA
ȈEM \xCERI\xD6!61e\x8CA +1\xA3\xEC0HA`\xD44\xD1UP\xA5\xA0l \xF5ЖHɰ\x8E\xB7\x9E\xF9\xC6\xEF\xE5HX\xD2_bG\x9A4\x83)\xA4a\xCA`\xA4\xD2n\xC09\xEE\xF2i x\xEC0\xB1;F
\xF2\x98\x83\xF21\xD8e0II\xA0\xDF\xF8<h\x97\x83~\x84\xB7\x87.tU%kH\xB4k\x90 +3\x80 \xEAHA +/?&w\x99J\xD2\xE6O9\xAE\x9B׊\x82@\xBD\xF6Wn\xB2\xE9H\x82\x9F\xBCEE\xD5.,\x96\xECL\xD8hU\x85\xD9\xA6\xD0\xDA`\xFB\xF1\xA1
\xA9\xFF5di\x9Cî\xD9#i\xA5޵\x8D\xAA\xD8,\x92\x8E\xA3\x92Oh\xAEI\\xEC\xF1 #\xEE\xFB\xEB\xD9P\xC06\x80i\x8DA\xDAŐ\xD2*i\xBEC\xE84\x83\xFF16\xBE\x92-\xE6\x8A\xBA3\xFC0=v`h|\xA8w\x88\xD8i._\xBB:\xAAX\xD9=?\xFCB\xC0`^h\xA1\x8D\xAC\xBDJ\xC9${\x9E\xA4"D\xA01\x9F{R\xF3N^i\xAE\x9A\x9A@мj:27c\xB5\xF4˟\xC1<s\xEC\xF5\xB9\x99\x8AE\xCD.<2-\xCBB0SQubJ, +\xA0\xC6\xF6\x93\xC0\x83 +\xAA\x83$s\x9C\xCC\xD5;2\`\xD9\xE1Z\xC8V0 \xE9S\x91\x89\xB0\x86\x8D\xA0\xF9U\xD9\x8C\x88\xF7\x9C܀\xBF=\xC0!o'\xA1\xA3
]&^\x94\xD48Gdpꦔ\xD7\xC5I5-m/'\xDD\xDF\xE5\xB2\xA7\xDF\xF8\xBD\xF4\x974\xE6\x89s\xC9! +^ZZw$\x91\x82\xB3\x9F\xCE\xEC\xEE\xC3r%uQ>u*ܚ\xA5ɗ\xB6xG\xD18Ρ\xC9&U\xE5gt\xBD#\x81\x9B~t\xC2h\x96x\x81#\xD06\xC9{\xE3\xEEQx\x81q:\xB8\xEDZ\xCE3P\xD2c\xF4\xC2w\xE6Q\xF7\xCA\xC0<\xA2\x90(D\x92\xFD}\xE5\xBFi\xFBuǨ\-=bb=\xC0\x85C+\x91$\x93\x96\xDDR\x92\xA4+f\x8E\xAB\xC1b\xCCPBYJ\xE9\xF3M0\xF26\xDEv *ǎ +8/\xD6\x90\x89\xA4\xBBD\x93i\xA4\x83\x9B\xE6\xFAz\xB5\xFA\xBE\xB7T\xED\x9Fet\xC5΅\xD7\xE1@\x83\x89A[\x8C\xC8M\x86.$SM\xA91mv\xC8A]4*jw\xC3`\xB0\xF0(\xBB\P r\xACw%@\x81\xDA\xE6J(\xBD/fs\xB9%w\xE4\xDC\xE5 +\x8ErPNq!\xB9\xC4H\xBA\xB6鶦\xEA)s\x82&\xEA8\x8B\x92\x9D\xC2Т\xB2pVR\xA2l\xAAm4\x89\x88"\xBBI\xC9\xD5R)\x9D@J\x9Ah\xEE\xE2%*\xC9R
D\x87CT\xB8 \x99,qe\x95\xD8*u! +\x95\xD5P"\x95^\x88\xF5\xB2I\xEEu\xE7\xD59\x9Da\xE0:\xDC\xC9k\xEC\xCE\xF7\xBB\xFD.%X\xD1\xF4\xEE\xDC9\x97W˓\xD5!@~\xC2r\x98ɡ\xB6A\xD6w;/YeA٣\x92\x9E\xB1\xF2\xC4t)9 H\xDF\xF4\xF6Oin\xF3\xD8*z\xE5\x89o7\x98O<Qᔄ\xCC\x99\xC1\xA0K\xD8\xDF\x92H/\xFA\x80\x98D\x95 I\xB8\x84S\xAF~mq\xAF\xED\xAFd\xF8St\xE89e\xF0\xEE\x8DSL\xA1\xAE\xF8 \xDC6\xAEH{\xB3zWp\xFC\xF7\xCE\xE8畭'\xA6ʶ\x90}#8\x9B/\x91\x9C\xD6W\xBAdP$\xD8\xDA`Vs\x87BLZOQ\x86\xF8\xB8d\x89o|\x8Eq@\xA0\xCD\xB8_2\xB8\xAC\xC8\xD7\xD32=vv#\x9D \xB8f\x9E\x9D²\x907B^\xB5g\xF2\x9El\xF5u\xA3ry\x82$4\x93Pҿd7}\xB7*H^\x99\xEEK\xBC\xAAƩ\xD2:\xA0\x9A)\xE9\x8Fȃ8\xA0\xFA\xC5%-2\x92;\xE3\xE8 \xBD6\xF7(\x98?\xBA\x84$\xFE\x85\xE2\xF9Q\xC8\\xA1\x80\x82\xA1\xA62H\xBA\x93\xD7-h\xF3ŀ2 +h \x98\xF9|\xF4RP\x91cm\x8D\xCD\xEE\xF4O mi2\x93$2\xB2\x84[\xAC}ž10\xB4\x96#"2\xF2\xC2\xE9f\x81\xB4\xDD\xE34\xF2\xC1\x882L\x81oL\xB5\xA3 \xA7\x83"\xE8\xC33\xDD\xC6Jg\x8E.\xB9\xB4AqCnѤ\x98
x$w\xC0\x98[\x9E3@=\x9D\x99\x99\xF9P \xE3O\xF4\x9D\xAEϻ\xB7\x84\xD14L\xDA3\x8Cv\xC1\xAE\x97%\xF5\xA7\xAB\xA1Ia\xB8L\xA2\xA1\x89j\xD4\xC4tk`\xF7\xEA\xDF~(\xC4 ǖn\x83\x84\xEDѼF \x91j&\x82\xC1VcIe\xF9<"\xB0\x98 ۞I]\xF7\xBBc\xD4Ӑ\xB6\xCB\xC5\xDCm\x8CJ‘* %A\xA6&r\xCCH\xBD"\xA0G A\xAAX
\xA8\xAE\xBFX\xCA\x9B\xA8Tn\x91\xD5\xEE\xA4i\x9A'g\x82\xE8\xE0\xD0 + +`\xA3\xA5N%UK\x83\xBF\xD1@i\x82\xC0\xAF\xCA\xB0
\xACf\xA8\xADb0$i@^\xB4\x90m\xDE ؕ\xE8B\x94.A1)#]*R\xE8LM$6\xC8zYZ`\x8A\x8D\xD24Q\x8C\xA1\xA1\x9A%\x85\x8F"F\xFC6\x84\xA40\xB0\xBE@#zA\x89\x85\x86\x98\x84fXg\x85 \xA66\x89
iШ\xE0.x\xB1/\xCA\xA6\xEA\x99%\x88;\xEC\xFDo\xEBNV\xF02f\xAD{\xF3\xA4 \x99\xAAH\xC8(\xDFo\xB8\xA6\xCF$\xAC<CP\xD03Y-0\xE2|\xE0E\xD3\xE0\xD0\xC2;\xF0{m?\xF1I܌Sm\xFA0\xFEӑ\xF3\x86A\xC6~s\xEEFH\xFF\xB6\xF4\xD7E\xA4\xB1O\xC5,o\x8C\xFA$0\xC8\xCB޺\xD0w\xB3\x9C\x8C\xBE\xE1\x81^\xFC
\xC2A\x90"i\xBC\x84(B\x87\xD4MU\xC6Z2c\xDB\xFEA\xBB\x87\xFFP\xF0\x90j\xE0\x9A=\xEE\xDBIy\xD8\xF7\xC6Q"\xF0b
\xF0\x89j
\x81H\xAAO\xFC]\xC9\xE1BC\x82:\xFC \ No newline at end of file