[Fakeroot-commits] [SCM] Debian packaging of fakeroot branch, upstream, updated. 63fbf30376b81f2d8a540d36cd3ab223a15c406f
Clint Adams
clint at debian.org
Fri May 17 00:11:18 UTC 2013
The following commit has been merged in the upstream branch:
commit 63fbf30376b81f2d8a540d36cd3ab223a15c406f
Merge: ed5c7914fc68e334cb57d57bac3eff28e36bdfd3 8dde82eecad1e5c1814734e6677b828a5151d8da
Author: Clint Adams <clint at debian.org>
Date: Thu May 16 20:11:00 2013 -0400
Merge remote-tracking branch 'mackyle/pull-request' into upstream
diff --combined libfakeroot.c
index 7f07d66,7e6c0c6..b0c3f3b
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@@ -59,6 -59,23 +59,23 @@@
#include "config.h"
#include "communicate.h"
+ #ifdef __APPLE__
+ /* The *xattr functions are currently disabled on __APPLE__ since the prototypes
+ are all different from the Linux versions and there is, as of yet, no
+ STUPID_APPLE_HACK (or similar) to deal with the differences.
+ Note that __APPLE__ does not have the l*xattr variants or capset so those
+ will already be undefined.
+ */
+ #undef HAVE_LISTXATTR
+ #undef HAVE_FLISTXATTR
+ #undef HAVE_GETXATTR
+ #undef HAVE_FGETXATTR
+ #undef HAVE_SETXATTR
+ #undef HAVE_FSETXATTR
+ #undef HAVE_REMOVEXATTR
+ #undef HAVE_FREMOVEXATTR
+ #endif /* __APPLE__ */
+
#ifdef STUPID_ALPHA_HACK
#define SEND_STAT(a,b,c) send_stat(a,b,c)
#define SEND_STAT64(a,b,c) send_stat64(a,b,c)
@@@ -1544,12 -1561,15 +1561,15 @@@ int setgroups(SETGROUPS_SIZE_TYPE size
return 0;
}
+ #ifdef HAVE_CAPSET
int capset(cap_user_header_t hdrp, const cap_user_data_t datap)
{
int rc = next_capset(hdrp, datap);
return (fakeroot_disabled) ? (rc) : 0;
}
+ #endif /* HAVE_CAPSET */
+ #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR)
static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags)
{
xattr_args xattr;
@@@ -1566,7 -1586,9 +1586,9 @@@
}
return 0;
}
+ #endif /* defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR) */
+ #if defined(HAVE_GETXATTR) || defined(HAVE_LGETXATTR) || defined(HAVE_FGETXATTR)
static size_t common_getxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size)
{
xattr_args xattr;
@@@ -1582,7 -1604,9 +1604,9 @@@
}
return xattr.size;
}
+ #endif /* defined(HAVE_GETXATTR) || defined(HAVE_LGETXATTR) || defined(HAVE_FGETXATTR) */
+ #if defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR)
static size_t common_listxattr(INT_STRUCT_STAT *st, char *list, size_t size)
{
xattr_args xattr;
@@@ -1598,8 -1622,10 +1622,10 @@@
}
return xattr.size;
}
+ #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */
- static size_t common_removexattr(INT_STRUCT_STAT *st, char *name)
+ #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR)
+ static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name)
{
xattr_args xattr;
xattr.name = name;
@@@ -1614,7 -1640,9 +1640,9 @@@
}
return 0;
}
+ #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */
+ #ifdef HAVE_SETXATTR
ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags)
{
INT_STRUCT_STAT st;
@@@ -1633,7 -1661,9 +1661,9 @@@
return common_setxattr(&st, name, value, size, flags);
}
+ #endif /* HAVE_SETXATTR */
+ #ifdef HAVE_LSETXATTR
ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags)
{
INT_STRUCT_STAT st;
@@@ -1652,7 -1682,9 +1682,9 @@@
return common_setxattr(&st, name, value, size, flags);
}
+ #endif /* HAVE_LSETXATTR */
+ #ifdef HAVE_FSETXATTR
ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags)
{
INT_STRUCT_STAT st;
@@@ -1671,7 -1703,9 +1703,9 @@@
return common_setxattr(&st, name, value, size, flags);
}
+ #endif /* HAVE_FSETXATTR */
+ #ifdef HAVE_GETXATTR
ssize_t getxattr(const char *path, const char *name, void *value, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1690,7 -1724,9 +1724,9 @@@
return common_getxattr(&st, name, value, size);
}
+ #endif /* HAVE_GETXATTR */
+ #ifdef HAVE_LGETXATTR
ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1709,7 -1745,9 +1745,9 @@@
return common_getxattr(&st, name, value, size);
}
+ #endif /* HAVE_LGETXATTR */
+ #ifdef HAVE_FGETXATTR
ssize_t fgetxattr(int fd, const char *name, void *value, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1728,7 -1766,9 +1766,9 @@@
return common_getxattr(&st, name, value, size);
}
+ #endif /* HAVE_FGETXATTR */
+ #ifdef HAVE_LISTXATTR
ssize_t listxattr(const char *path, char *list, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1747,7 -1787,9 +1787,9 @@@
return common_listxattr(&st, list, size);
}
+ #endif /* HAVE_LISTXATTR */
+ #ifdef HAVE_LLISTXATTR
ssize_t llistxattr(const char *path, char *list, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1766,7 -1808,9 +1808,9 @@@
return common_listxattr(&st, list, size);
}
+ #endif /* HAVE_LLISTXATTR */
+ #ifdef HAVE_FLISTXATTR
ssize_t flistxattr(int fd, char *list, size_t size)
{
INT_STRUCT_STAT st;
@@@ -1785,8 -1829,10 +1829,10 @@@
return common_listxattr(&st, list, size);
}
+ #endif /* HAVE_FLISTXATTR */
- ssize_t removexattr(const char *path, char *name)
+ #ifdef HAVE_REMOVEXATTR
+ ssize_t removexattr(const char *path, const char *name)
{
INT_STRUCT_STAT st;
int r;
@@@ -1804,8 -1850,10 +1850,10 @@@
return common_removexattr(&st, name);
}
+ #endif /* HAVE_REMOVEXATTR */
- ssize_t lremovexattr(const char *path, char *name)
+ #ifdef HAVE_LREMOVEXATTR
+ ssize_t lremovexattr(const char *path, const char *name)
{
INT_STRUCT_STAT st;
int r;
@@@ -1823,8 -1871,10 +1871,10 @@@
return common_removexattr(&st, name);
}
+ #endif /* HAVE_LREMOVEXATTR */
- ssize_t fremovexattr(int fd, char *name)
+ #ifdef HAVE_FREMOVEXATTR
+ ssize_t fremovexattr(int fd, const char *name)
{
INT_STRUCT_STAT st;
int r;
@@@ -1842,6 -1892,7 +1892,7 @@@
return common_removexattr(&st, name);
}
+ #endif /* HAVE_FREMOVEXATTR */
#undef fakeroot_disabled
@@@ -1858,14 -1909,6 +1909,14 @@@ int fakeroot_isdisabled(void
}
#ifdef HAVE_ACL_T
+acl_t acl_get_fd(int fd) {
+ errno = ENOTSUP;
+ return (acl_t)NULL;
+}
+acl_t acl_get_file(const char *path_p, acl_type_t type) {
+ errno = ENOTSUP;
+ return (acl_t)NULL;
+}
int acl_set_fd(int fd, acl_t acl) {
errno = ENOTSUP;
return -1;
diff --combined wrapfunc.inp
index 3b1511b,fedb68e..caab0e1
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@@ -145,19 -145,45 +145,45 @@@ setfsgid;gid_t;(gid_t fsgid);(fsgid
#endif /* HAVE_SETFSGID */
initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
+ #ifdef HAVE_CAPSET
capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
+ #endif /* HAVE_CAPSET */
+ #ifdef HAVE_LISTXATTR
listxattr; ssize_t;(const char *path, char *list, size_t size);(path, list, size)
+ #endif /* HAVE_LISTXATTR */
+ #ifdef HAVE_LLISTXATTR
llistxattr; ssize_t;(const char *path, char *list, size_t size);(path, list, size)
+ #endif /* HAVE_LLISTXATTR */
+ #ifdef HAVE_FLISTXATTR
flistxattr; ssize_t;(int fd, char *list, size_t size);(fd, list, size)
+ #endif /* HAVE_FLISTXATTR */
+ #ifdef HAVE_GETXATTR
getxattr;ssize_t;(const char *path, const char *name, void *value, size_t size);(path, name, value, size)
+ #endif /* HAVE_GETXATTR */
+ #ifdef HAVE_LGETXATTR
lgetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size);(path, name, value, size)
+ #endif /* HAVE_LGETXATTR */
+ #ifdef HAVE_FGETXATTR
fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size)
+ #endif /* HAVE_FGETXATTR */
+ #ifdef HAVE_SETXATTR
setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_SETXATTR */
+ #ifdef HAVE_LSETXATTR
lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_LSETXATTR */
+ #ifdef HAVE_FSETXATTR
fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags)
+ #endif /* HAVE_FSETXATTR */
+ #ifdef HAVE_REMOVEXATTR
removexattr;ssize_t;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_REMOVEXATTR */
+ #ifdef HAVE_LREMOVEXATTR
lremovexattr;ssize_t;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_LREMOVEXATTR */
+ #ifdef HAVE_FREMOVEXATTR
fremovexattr;ssize_t;(int fd, const char *name);(fd, name)
+ #endif /* HAVE_FREMOVEXATTR */
#ifdef HAVE_FSTATAT
#ifdef HAVE_FCHMODAT
@@@ -181,8 -207,6 +207,8 @@@ unlinkat;int;(int dir_fd, const char *p
#endif /* HAVE_FSTATAT */
#ifdef HAVE_ACL_T
+acl_get_fd;acl_t;(int fd);(fd)
+acl_get_file;acl_t;(const char *path_p, acl_type_t type);(path_p, type)
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)
#endif /* HAVE_ACL_T */
--
Debian packaging of fakeroot
More information about the Fakeroot-commits
mailing list