diff -Naur attr-2.4.47.orig/Makefile attr-2.4.47/Makefile
old
|
new
|
|
35 | 35 | LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ |
36 | 36 | Logs/* built .census install.* install-dev.* install-lib.* *.gz |
37 | 37 | |
38 | | LIB_SUBDIRS = include libmisc libattr |
| 38 | LIB_SUBDIRS = include libmisc |
39 | 39 | TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package |
40 | 40 | |
41 | 41 | SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) |
diff -Naur attr-2.4.47.orig/attr/Makefile attr-2.4.47/attr/Makefile
old
|
new
|
|
20 | 20 | include $(TOPDIR)/include/builddefs |
21 | 21 | |
22 | 22 | LTCOMMAND = attr |
23 | | CFILES = attr.c |
24 | | LLDLIBS = $(LIBATTR) |
25 | | LTDEPENDENCIES = $(LIBATTR) |
| 23 | CFILES = attr.c ../libattr/libattr.o |
26 | 24 | |
27 | 25 | default: $(LTCOMMAND) |
28 | 26 | |
diff -Naur attr-2.4.47.orig/getfattr/Makefile attr-2.4.47/getfattr/Makefile
old
|
new
|
|
22 | 22 | LTCOMMAND = getfattr |
23 | 23 | CFILES = getfattr.c |
24 | 24 | |
25 | | LLDLIBS = $(LIBMISC) $(LIBATTR) |
26 | | LTDEPENDENCIES = $(LIBMISC) $(LIBATTR) |
| 25 | LLDLIBS = $(LIBMISC) |
| 26 | LTDEPENDENCIES = $(LIBMISC) |
27 | 27 | |
28 | 28 | default: $(LTCOMMAND) |
29 | 29 | |
diff -Naur attr-2.4.47.orig/getfattr/getfattr.c attr-2.4.47/getfattr/getfattr.c
old
|
new
|
|
29 | 29 | #include <locale.h> |
30 | 30 | #include <libgen.h> |
31 | 31 | |
32 | | #include <attr/xattr.h> |
| 32 | #include <sys/xattr.h> |
33 | 33 | #include "config.h" |
34 | 34 | #include "walk_tree.h" |
35 | 35 | #include "misc.h" |
diff -Naur attr-2.4.47.orig/libattr/attr_copy_fd.c attr-2.4.47/libattr/attr_copy_fd.c
old
|
new
|
|
31 | 31 | #endif |
32 | 32 | |
33 | 33 | #if defined(HAVE_ATTR_XATTR_H) |
34 | | # include <attr/xattr.h> |
| 34 | # include <sys/xattr.h> |
35 | 35 | #endif |
36 | 36 | |
37 | 37 | #if defined(HAVE_ATTR_LIBATTR_H) |
diff -Naur attr-2.4.47.orig/libattr/attr_copy_file.c attr-2.4.47/libattr/attr_copy_file.c
old
|
new
|
|
31 | 31 | #endif |
32 | 32 | |
33 | 33 | #if defined(HAVE_ATTR_XATTR_H) |
34 | | # include <attr/xattr.h> |
| 34 | # include <sys/xattr.h> |
35 | 35 | #endif |
36 | 36 | |
37 | 37 | #if defined(HAVE_ATTR_LIBATTR_H) |
diff -Naur attr-2.4.47.orig/libattr/libattr.c attr-2.4.47/libattr/libattr.c
old
|
new
|
|
17 | 17 | */ |
18 | 18 | |
19 | 19 | #include <errno.h> |
| 20 | #ifndef ENOATTR |
| 21 | # define ENOATTR ENODATA /* No such attribute */ |
| 22 | #endif |
20 | 23 | #include <stdlib.h> |
21 | 24 | #include <string.h> |
22 | 25 | #include <unistd.h> |
23 | 26 | #include <sys/types.h> |
24 | 27 | |
25 | | #include <attr/xattr.h> |
| 28 | #include <sys/xattr.h> |
26 | 29 | #include <attr/attributes.h> |
27 | 30 | |
28 | 31 | #undef MAXNAMELEN |
diff -Naur attr-2.4.47.orig/man/Makefile attr-2.4.47/man/Makefile
old
|
new
|
|
19 | 19 | TOPDIR = .. |
20 | 20 | include $(TOPDIR)/include/builddefs |
21 | 21 | |
22 | | SUBDIRS = man1 man2 man3 man5 |
| 22 | SUBDIRS = man1 |
23 | 23 | |
24 | 24 | default : $(SUBDIRS) |
25 | 25 | |
diff -Naur attr-2.4.47.orig/setfattr/Makefile attr-2.4.47/setfattr/Makefile
old
|
new
|
|
22 | 22 | LTCOMMAND = setfattr |
23 | 23 | CFILES = setfattr.c |
24 | 24 | |
25 | | LLDLIBS = $(LIBMISC) $(LIBATTR) |
26 | | LTDEPENDENCIES = $(LIBMISC) $(LIBATTR) |
| 25 | LLDLIBS = $(LIBMISC) |
| 26 | LTDEPENDENCIES = $(LIBMISC) |
27 | 27 | |
28 | 28 | default: $(LTCOMMAND) |
29 | 29 | |
diff -Naur attr-2.4.47.orig/setfattr/setfattr.c attr-2.4.47/setfattr/setfattr.c
old
|
new
|
|
19 | 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | 21 | |
| 22 | #include <errno.h> |
22 | 23 | #include <limits.h> |
23 | 24 | #include <stdio.h> |
24 | 25 | #include <stdlib.h> |
… |
… |
|
28 | 29 | #include <ctype.h> |
29 | 30 | #include <libgen.h> |
30 | 31 | |
31 | | #include <attr/xattr.h> |
| 32 | #include <sys/xattr.h> |
32 | 33 | #include "config.h" |
33 | 34 | #include "misc.h" |
34 | 35 | |