mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 18:26:45 +01:00
74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
|
commit 6aea54d2ad2287b3e8894c262ee895f3d4a60516
|
||
|
|
Author: André Draszik <git@andred.net>
|
||
|
|
Date: Mon Oct 17 12:45:32 2016 +0100
|
||
|
|
|
||
|
|
evmctl: use correct include for xattr.h
|
||
|
|
|
||
|
|
The xattr API/ABI is provided by both the c-library, as well as by the
|
||
|
|
libattr package. The c-library's header file is sys/xattr.h, whereas
|
||
|
|
libattr's header file can be found in attr/xattr.h.
|
||
|
|
|
||
|
|
Given none of the code here *links* against the libattr.so shared library, it
|
||
|
|
is wrong to *compile* against libattr's API (header file).
|
||
|
|
|
||
|
|
Doing so avoids confusion as to which xattr.h is used as the least problem,
|
||
|
|
and potential ABI differences as the worst problem due the mismatching header
|
||
|
|
file used.
|
||
|
|
|
||
|
|
So make sure we compile and link against the same thing, the c-library in
|
||
|
|
both cases.
|
||
|
|
|
||
|
|
Signed-off-by: André Draszik <git@andred.net>
|
||
|
|
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 0497eb7..a5b4288 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS)
|
||
|
|
AC_CHECK_HEADER(unistd.h)
|
||
|
|
AC_CHECK_HEADERS(openssl/conf.h)
|
||
|
|
|
||
|
|
-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])])
|
||
|
|
+AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
|
||
|
|
AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
|
||
|
|
|
||
|
|
#debug support - yes for a while
|
||
|
|
diff --git a/packaging/ima-evm-utils.spec b/packaging/ima-evm-utils.spec
|
||
|
|
index a11a27a..63388d2 100644
|
||
|
|
--- a/packaging/ima-evm-utils.spec
|
||
|
|
+++ b/packaging/ima-evm-utils.spec
|
||
|
|
@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||
|
|
BuildRequires: autoconf
|
||
|
|
BuildRequires: automake
|
||
|
|
BuildRequires: openssl-devel
|
||
|
|
-BuildRequires: libattr-devel
|
||
|
|
BuildRequires: keyutils-libs-devel
|
||
|
|
|
||
|
|
%description
|
||
|
|
diff --git a/packaging/ima-evm-utils.spec.in b/packaging/ima-evm-utils.spec.in
|
||
|
|
index 7ca6c6f..65c32f9 100644
|
||
|
|
--- a/packaging/ima-evm-utils.spec.in
|
||
|
|
+++ b/packaging/ima-evm-utils.spec.in
|
||
|
|
@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||
|
|
BuildRequires: autoconf
|
||
|
|
BuildRequires: automake
|
||
|
|
BuildRequires: openssl-devel
|
||
|
|
-BuildRequires: libattr-devel
|
||
|
|
BuildRequires: keyutils-libs-devel
|
||
|
|
|
||
|
|
%description
|
||
|
|
diff --git a/src/evmctl.c b/src/evmctl.c
|
||
|
|
index 2ffee78..3fbcd33 100644
|
||
|
|
--- a/src/evmctl.c
|
||
|
|
+++ b/src/evmctl.c
|
||
|
|
@@ -49,7 +49,7 @@
|
||
|
|
#include <stdint.h>
|
||
|
|
#include <string.h>
|
||
|
|
#include <dirent.h>
|
||
|
|
-#include <attr/xattr.h>
|
||
|
|
+#include <sys/xattr.h>
|
||
|
|
#include <linux/xattr.h>
|
||
|
|
#include <getopt.h>
|
||
|
|
#include <keyutils.h>
|