SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/glibc/stuff/glibc-2.19-xattr_header.patch	Mon Jun 10 20:42:21 2024 +0000
     1.3 @@ -0,0 +1,43 @@
     1.4 +From: Serge Hallyn <serge.hallyn@ubuntu.com>
     1.5 +Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500)
     1.6 +Subject: misc/sys/xattr.h: guard against linux uapi header inclusion
     1.7 +X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0
     1.8 +
     1.9 +misc/sys/xattr.h: guard against linux uapi header inclusion
    1.10 +
    1.11 +If the glibc xattr.h header is included after the uapi header,
    1.12 +compilation fails due to an enum re-using a #define from the
    1.13 +uapi header.  Protect against this by guarding the define and
    1.14 +enum inclusions against each other.
    1.15 +
    1.16 +(A corresponding kernel patch has been sent here:
    1.17 +http://lkml.org/lkml/2014/3/7/331 )
    1.18 +
    1.19 +(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
    1.20 +and https://sourceware.org/glibc/wiki/Synchronizing_Headers
    1.21 +for more information.)
    1.22 +
    1.23 +Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
    1.24 +---
    1.25 +
    1.26 +diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
    1.27 +index 929cd87..796df90 100644
    1.28 +--- a/misc/sys/xattr.h
    1.29 ++++ b/misc/sys/xattr.h
    1.30 +@@ -26,6 +26,7 @@ __BEGIN_DECLS
    1.31 + 
    1.32 + /* The following constants should be used for the fifth parameter of
    1.33 +    `*setxattr'.  */
    1.34 ++#ifndef __USE_KERNEL_XATTR_DEFS
    1.35 + enum
    1.36 + {
    1.37 +   XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
    1.38 +@@ -33,6 +34,7 @@ enum
    1.39 +   XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
    1.40 + #define XATTR_REPLACE	XATTR_REPLACE
    1.41 + };
    1.42 ++#endif
    1.43 + 
    1.44 + /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
    1.45 +    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
    1.46 +