| 1 |
commit: abeac3adcbfa4b853b9a7d727f5c6b134fad6fe5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 15 07:33:40 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 28 21:33:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/elfix.git/commit/?id=abeac3ad |
| 7 |
|
| 8 |
attr/xattr.h is deprecated. Use sys/xattr.h instead |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
configure.ac | 4 ++-- |
| 13 |
scripts/paxmodule.c | 2 +- |
| 14 |
src/paxctl-ng.c | 5 ++++- |
| 15 |
3 files changed, 7 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index 208d566..84ef48d 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -114,9 +114,9 @@ AS_IF( |
| 22 |
[test "x$enable_xtpax" != "xno"], |
| 23 |
[ |
| 24 |
AC_CHECK_HEADERS( |
| 25 |
- [attr/xattr.h], |
| 26 |
+ [sys/xattr.h], |
| 27 |
[], |
| 28 |
- [AC_MSG_ERROR(["Missing necessary attr/xattr.h"])] |
| 29 |
+ [AC_MSG_ERROR(["Missing necessary sys/xattr.h"])] |
| 30 |
) |
| 31 |
AC_CHECK_LIB( |
| 32 |
[attr], |
| 33 |
|
| 34 |
diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c |
| 35 |
index 1355f86..6a93420 100644 |
| 36 |
--- a/scripts/paxmodule.c |
| 37 |
+++ b/scripts/paxmodule.c |
| 38 |
@@ -45,7 +45,7 @@ |
| 39 |
#endif |
| 40 |
|
| 41 |
#ifdef XTPAX |
| 42 |
- #include <attr/xattr.h> |
| 43 |
+ #include <sys/xattr.h> |
| 44 |
#define PAX_NAMESPACE "user.pax.flags" |
| 45 |
#endif |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/src/paxctl-ng.c b/src/paxctl-ng.c |
| 49 |
index d340a43..25396d4 100644 |
| 50 |
--- a/src/paxctl-ng.c |
| 51 |
+++ b/src/paxctl-ng.c |
| 52 |
@@ -49,7 +49,10 @@ |
| 53 |
#endif |
| 54 |
|
| 55 |
#ifdef XTPAX |
| 56 |
- #include <attr/xattr.h> |
| 57 |
+ #include <sys/xattr.h> |
| 58 |
+ #ifndef ENOATTR |
| 59 |
+ #define ENOATTR ENODATA |
| 60 |
+ #endif |
| 61 |
#define PAX_NAMESPACE "user.pax.flags" |
| 62 |
#define CREATE_XT_FLAGS_SECURE 1 |
| 63 |
#define CREATE_XT_FLAGS_DEFAULT 2 |
Archives