Revision: 622 http://trac.macosforge.org/projects/darwinbuild/changeset/622 Author: wsiegrist@apple.com Date: 2009-11-02 13:22:05 -0800 (Mon, 02 Nov 2009) Log Message: ----------- Merge in r602 to add dyld copy protection in darwinup. Revision Links: -------------- http://trac.macosforge.org/projects/darwinbuild/changeset/602 Modified Paths: -------------- releases/Darwin9/darwinup/Depot.cpp Property Changed: ---------------- releases/Darwin9/ releases/Darwin9/darwinbuild/darwinbuild.in releases/Darwin9/darwinbuild/darwinmaster.sh.in releases/Darwin9/darwinbuild/installXcode.in releases/Darwin9/darwinbuild/packageRoots.sh.in releases/Darwin9/darwinbuild/thinPackages.sh.in Property changes on: releases/Darwin9 ___________________________________________________________________ Modified: svn:mergeinfo - /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-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434 + /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-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434,602 Property changes on: releases/Darwin9/darwinbuild/darwinbuild.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /trunk/darwinbuild/darwinbuild:432-434 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /trunk/darwinbuild/darwinbuild:432-434 /trunk/darwinbuild/darwinbuild.in:602 Property changes on: releases/Darwin9/darwinbuild/darwinmaster.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /trunk/darwinbuild/darwinmaster.sh:432-434 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /trunk/darwinbuild/darwinmaster.sh:432-434 /trunk/darwinbuild/darwinmaster.sh.in:602 Property changes on: releases/Darwin9/darwinbuild/installXcode.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /trunk/darwinbuild/installXcode:432-434 + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /trunk/darwinbuild/installXcode:432-434 /trunk/darwinbuild/installXcode.in:602 Property changes on: releases/Darwin9/darwinbuild/packageRoots.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /trunk/darwinbuild/packageRoots.sh:432-434 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /trunk/darwinbuild/packageRoots.sh:432-434 /trunk/darwinbuild/packageRoots.sh.in:602 Property changes on: releases/Darwin9/darwinbuild/thinPackages.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /trunk/darwinbuild/thinPackages.sh:432-434 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /trunk/darwinbuild/thinPackages.sh:432-434 /trunk/darwinbuild/thinPackages.sh.in:602 Modified: releases/Darwin9/darwinup/Depot.cpp =================================================================== --- releases/Darwin9/darwinup/Depot.cpp 2009-11-02 19:12:19 UTC (rev 621) +++ releases/Darwin9/darwinup/Depot.cpp 2009-11-02 21:22:05 UTC (rev 622) @@ -475,6 +475,7 @@ const char* tarfiles[] = {"/usr/bin/tar", "/usr/bin/gnutar", "/usr/bin/bsdtar", + "/usr/lib/dyld", "/usr/lib/libarchive", "/usr/lib/libbz2", "/usr/lib/libz",