[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 5026024bfa353d6ebcc6a41c825dcdf6ac5c382c
Author: Clint Adams <schizo at debian.org>
Date:   Sat Aug 2 15:11:05 2008 +0000

    libfakeroot.c: patch from Petr Salinger to fix chmod 1755 on GNU/kFreeBSD.  closes: #493196.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-166

diff --git a/debian/changelog b/debian/changelog
index 839a069..9931353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.9.6) unstable; urgency=low
+
+  * libfakeroot.c: patch from Petr Salinger to fix chmod 1755 on
+    GNU/kFreeBSD.  closes: #493196.
+
+ -- Clint Adams <schizo at debian.org>  Sat, 02 Aug 2008 11:08:38 -0400
+
 fakeroot (1.9.5) unstable; urgency=low
 
   * configure.ac: patch from Ganael LAPLANCHE to fix typo in detection of
diff --git a/libfakeroot.c b/libfakeroot.c
index aaaa8d6..5a4c4be 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -856,6 +856,10 @@ int chmod(const char *path, mode_t mode){
   r=next_chmod(path, mode);
   if(r&&(errno==EPERM))
     r=0;
+#ifdef EFTYPE		/* available under FreeBSD kernel */
+  if(r&&(errno==EFTYPE))
+    r=0;
+#endif
   return r;
 }
 
@@ -884,6 +888,10 @@ int fchmod(int fd, mode_t mode){
   r=next_fchmod(fd, mode);
   if(r&&(errno==EPERM))
     r=0;
+#ifdef EFTYPE		/* available under FreeBSD kernel */
+  if(r&&(errno==EFTYPE))
+    r=0;
+#endif
   return r;
 }
 
@@ -916,6 +924,10 @@ int fchmodat(int dir_fd, const char *path, mode_t mode, int flags) {
   r=next_fchmodat(dir_fd, path, mode, flags);
   if(r&&(errno==EPERM))
     r=0;
+#ifdef EFTYPE		/* available under FreeBSD kernel */
+  if(r&&(errno==EFTYPE))
+    r=0;
+#endif
   return r;
 }
 #endif /* HAVE_FCHMODAT */

-- 
fakeroot