Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/fakeroot/files: fakeroot-1.18.4-no-acl_h.patch
Date: Tue, 03 Jul 2012 09:52:57
Message-Id: 20120703095242.9997F2004C@flycatcher.gentoo.org
1 ssuominen 12/07/03 09:52:42
2
3 Added: fakeroot-1.18.4-no-acl_h.patch
4 Log:
5 Fix building with USE="-acl" wrt #424419 by Maksim Melnikau
6
7 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch?rev=1.1&content-type=text/plain
14
15 Index: fakeroot-1.18.4-no-acl_h.patch
16 ===================================================================
17 http://bugs.gentoo.org/424419
18
19 --- libfakeroot.c
20 +++ libfakeroot.c
21 @@ -1551,6 +1551,7 @@
22 return fakeroot_disabled;
23 }
24
25 +#ifdef HAVE_SYS_ACL_H
26 #ifdef HAVE_ACL_T
27 int acl_set_fd(int fd, acl_t acl) {
28 errno = ENOTSUP;
29 @@ -1561,6 +1562,7 @@
30 errno = ENOTSUP;
31 return -1;
32 }
33 +#endif /* HAVE_ACL_T */
34 #endif /* HAVE_SYS_ACL_H */
35
36 #ifdef HAVE_FTS_READ
37 --- wrapfunc.inp
38 +++ wrapfunc.inp
39 @@ -167,10 +167,12 @@
40 #endif /* HAVE_UNLINKAT */
41 #endif /* HAVE_FSTATAT */
42
43 +#ifdef HAVE_SYS_ACL_H
44 #ifdef HAVE_ACL_T
45 acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
46 acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)
47 #endif /* HAVE_ACL_T */
48 +#endif /* HAVE_SYS_ACL_H */
49
50 #ifdef HAVE_FTS_READ
51 fts_read;FTSENT *;(FTS *ftsp);(ftsp)