Ticket #1080: attr-2.4.47-sys_xattr-1.patch

File attr-2.4.47-sys_xattr-1.patch, 4.4 KB (added by William Harrington, 11 years ago)

  • attr-2.4.47 

    diff -Naur attr-2.4.47.orig/Makefile attr-2.4.47/Makefile
    old new  
    3535LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
    3636        Logs/* built .census install.* install-dev.* install-lib.* *.gz
    3737
    38 LIB_SUBDIRS = include libmisc libattr
     38LIB_SUBDIRS = include libmisc
    3939TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package
    4040
    4141SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)

  • attr/Makefile 

    diff -Naur attr-2.4.47.orig/attr/Makefile attr-2.4.47/attr/Makefile
    old new  
    2020include $(TOPDIR)/include/builddefs
    2121
    2222LTCOMMAND = attr
    23 CFILES = attr.c
    24 LLDLIBS = $(LIBATTR)
    25 LTDEPENDENCIES = $(LIBATTR)
     23CFILES = attr.c ../libattr/libattr.o
    2624
    2725default: $(LTCOMMAND)
    2826

  • getfattr/Makefile 

    diff -Naur attr-2.4.47.orig/getfattr/Makefile attr-2.4.47/getfattr/Makefile
    old new  
    2222LTCOMMAND = getfattr
    2323CFILES = getfattr.c
    2424
    25 LLDLIBS = $(LIBMISC) $(LIBATTR)
    26 LTDEPENDENCIES = $(LIBMISC) $(LIBATTR)
     25LLDLIBS = $(LIBMISC)
     26LTDEPENDENCIES = $(LIBMISC)
    2727
    2828default: $(LTCOMMAND)
    2929

  • getfattr/getfattr.c 

    diff -Naur attr-2.4.47.orig/getfattr/getfattr.c attr-2.4.47/getfattr/getfattr.c
    old new  
    2929#include <locale.h>
    3030#include <libgen.h>
    3131
    32 #include <attr/xattr.h>
     32#include <sys/xattr.h>
    3333#include "config.h"
    3434#include "walk_tree.h"
    3535#include "misc.h"

  • libattr/attr_copy_fd.c 

    diff -Naur attr-2.4.47.orig/libattr/attr_copy_fd.c attr-2.4.47/libattr/attr_copy_fd.c
    old new  
    3131#endif
    3232
    3333#if defined(HAVE_ATTR_XATTR_H)
    34 # include <attr/xattr.h>
     34# include <sys/xattr.h>
    3535#endif
    3636
    3737#if defined(HAVE_ATTR_LIBATTR_H)

  • libattr/attr_copy_file.c 

    diff -Naur attr-2.4.47.orig/libattr/attr_copy_file.c attr-2.4.47/libattr/attr_copy_file.c
    old new  
    3131#endif
    3232
    3333#if defined(HAVE_ATTR_XATTR_H)
    34 # include <attr/xattr.h>
     34# include <sys/xattr.h>
    3535#endif
    3636
    3737#if defined(HAVE_ATTR_LIBATTR_H)

  • libattr/libattr.c 

    diff -Naur attr-2.4.47.orig/libattr/libattr.c attr-2.4.47/libattr/libattr.c
    old new  
    1717 */
    1818
    1919#include <errno.h>
     20#ifndef ENOATTR
     21# define ENOATTR ENODATA        /* No such attribute */
     22#endif
    2023#include <stdlib.h>
    2124#include <string.h>
    2225#include <unistd.h>
    2326#include <sys/types.h>
    2427
    25 #include <attr/xattr.h>
     28#include <sys/xattr.h>
    2629#include <attr/attributes.h>
    2730
    2831#undef MAXNAMELEN

  • man/Makefile 

    diff -Naur attr-2.4.47.orig/man/Makefile attr-2.4.47/man/Makefile
    old new  
    1919TOPDIR = ..
    2020include $(TOPDIR)/include/builddefs
    2121
    22 SUBDIRS = man1 man2 man3 man5
     22SUBDIRS = man1
    2323
    2424default : $(SUBDIRS)
    2525

  • setfattr/Makefile 

    diff -Naur attr-2.4.47.orig/setfattr/Makefile attr-2.4.47/setfattr/Makefile
    old new  
    2222LTCOMMAND = setfattr
    2323CFILES = setfattr.c
    2424
    25 LLDLIBS = $(LIBMISC) $(LIBATTR)
    26 LTDEPENDENCIES = $(LIBMISC) $(LIBATTR)
     25LLDLIBS = $(LIBMISC)
     26LTDEPENDENCIES = $(LIBMISC)
    2727
    2828default: $(LTCOMMAND)
    2929

  • setfattr/setfattr.c 

    diff -Naur attr-2.4.47.orig/setfattr/setfattr.c attr-2.4.47/setfattr/setfattr.c
    old new  
    1919  along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
    2121
     22#include <errno.h>
    2223#include <limits.h>
    2324#include <stdio.h>
    2425#include <stdlib.h>
    … …  
    2829#include <ctype.h>
    2930#include <libgen.h>
    3031
    31 #include <attr/xattr.h>
     32#include <sys/xattr.h>
    3233#include "config.h"
    3334#include "misc.h"
    3435