cirros-testvm/src-cirros/buildroot-2015.05/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch

   1 From 84fb6007dcc7f6b6da9f6dab77a487c22b6c7beb Mon Sep 17 00:00:00 2001
   2 From: Andrew G Morgan <morgan@kernel.org>
   3 Date: Sun, 9 Mar 2014 16:33:15 -0700
   4 Subject: [PATCH] Change the location we include linux/xattr.h
   5
   6 This header stuff seems a bit fragile, but Serge reports including
   7 it in sys/capability.h was causing a lot of trouble building dependent
   8 app packages.
   9
  10 From the perspective of libcap, this API is only needed internally in
  11 cap_file.c so we put an include there.
  12
  13 Status: upstream.
  14
  15 Signed-off-by: Andrew G Morgan <morgan@kernel.org>
  16 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  17 ---
  18
  19 diff --git a/libcap/cap_file.c b/libcap/cap_file.c
  20 index d3dc1d0..553c2d2 100644
  21 --- a/libcap/cap_file.c
  22 +++ b/libcap/cap_file.c
  23 @@ -10,6 +10,8 @@
  24  #include <sys/stat.h>
  25  #include <unistd.h>
  26
  27 +#include <linux/xattr.h>
  28 +
  29  #define XATTR_SECURITY_PREFIX "security."
  30
  31  #include "libcap.h"
  32 diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
  33 index 64ac50e..dddc75b 100644
  34 --- a/libcap/include/sys/capability.h
  35 +++ b/libcap/include/sys/capability.h
  36 @@ -27,7 +27,6 @@ extern "C" {
  37  #define __user
  38  #endif
  39  #include <linux/capability.h>
  40 -#include <linux/xattr.h>
  41
  42  /*
  43   * POSIX capability types
  44 --
  45 2.0.4
  46