[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 4af4d13d13bfa6a55dfc214359cd656207e22033
Author: Clint Adams <schizo at debian.org>
Date:   Sat Jan 5 18:58:36 2008 +0000

    Apply patch from Thomas Bächler to work around fakeroot's inability to handle acls by pretending that the underlying filesystem does not support acls.  closes: #361306.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-152

diff --git a/debian/changelog b/debian/changelog
index be0a1df..f41126e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 fakeroot (1.9) unstable; urgency=low
 
   * Bump to Standards-Version 3.7.3. 
+  * Apply patch from Thomas Bächler to work around fakeroot's
+    inability to handle acls by pretending that the underlying
+    filesystem does not support acls.  closes: #361306.
 
  -- Clint Adams <schizo at debian.org>  Sat, 05 Jan 2008 13:53:26 -0500
 
diff --git a/libfakeroot.c b/libfakeroot.c
index 0d296ab..8414c85 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -57,6 +57,8 @@
 #include <unistd.h> 
 #include <dirent.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/acl.h>
 
 #if !HAVE_DECL_SETENV
 extern int setenv (const char *name, const char *value, int replace);
@@ -1461,3 +1463,13 @@ int fakeroot_isdisabled(void)
 {
   return fakeroot_disabled;
 }
+
+int acl_set_fd(int fd, acl_t acl) {
+  errno = ENOTSUP;
+  return -1;
+}
+
+int acl_set_file(const char *path_p, acl_type_t type, acl_t acl) {
+  errno = ENOTSUP;
+  return -1;
+}
diff --git a/wrapfunc.inp b/wrapfunc.inp
index 0039671..fd14c0d 100644
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -123,4 +123,5 @@ unlinkat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, fl
 #endif /* HAVE_UNLINKAT */
 #endif /* HAVE_FSTATAT */
 
-
+acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
+acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)

-- 
fakeroot