[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 515e293e9a69e1272c3d51ddc01ed43d930c880f

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 515e293e9a69e1272c3d51ddc01ed43d930c880f
Author: Kyle J. McKay <mackyle at gmail.com>
Date:   Mon Oct 3 00:13:51 2011 -0700

    Add Mac OS X 10.7 Lion support (CoreServicesInternal bypass)

diff --git a/README_MACOSX.txt b/README_MACOSX.txt
index 26b38f0..ecb1fe1 100644
--- a/README_MACOSX.txt
+++ b/README_MACOSX.txt
@@ -31,8 +31,9 @@ means that fakeroot support on Mac OS X works ONLY with programs that
 rely solely on Linux/Unix/POSIX APIs.
 
 In particular, special effort is made to avoid crashes caused in
-CarbonCore starting on Mac OS X 10.6 when the result of getuid() running
-under fakeroot differs from the actual real uid as seen through various
+CarbonCore starting on Mac OS X 10.6 (and also CoreServicesInternal
+starting on Mac OS X 10.7) when the result of getuid() running under
+fakeroot differs from the actual real uid as seen through various
 Mach APIs that are not intercepted by fakeroot.
 
 The packagemaker command line interface is fully supported (ultimately
diff --git a/libfakeroot.c b/libfakeroot.c
index dc2020a..f7f91ce 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -1365,7 +1365,8 @@ static int check_fakeroot_disabled(void *retaddr){
   if (fakeroot_disabled || !dladdr(retaddr, &info))
     return fakeroot_disabled;
   suffix = strrchr(info.dli_fname, '/');
-  if (suffix && strcmp(suffix, "/CarbonCore") == 0)
+  if (suffix && (strcmp(suffix, "/CarbonCore") == 0 ||
+                 strcmp(suffix, "/CoreServicesInternal") == 0))
     return 1;
   return fakeroot_disabled;
 }

-- 
fakeroot