From: Sven Vermeulen <swift@gentoo.org>
Date: Mon, 27 Aug 2018 17:03:39 +0000 (+0200)
Subject: app-crypt/ima-evm-utils: Use sys/xattr instead of attr/xattr
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=faa1e1acf25bdf284b0e5dbce8081c40933cb32f;p=gentoo.git

app-crypt/ima-evm-utils: Use sys/xattr instead of attr/xattr

The xattr syscalls are provided by glibc, so there is no need to depend
on libattr (and the ebuild didn't anyway).

This fixes Gentoo bug #649790.

Reported-by: Toralf Forster <toralf@gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch
new file mode 100644
index 000000000000..1a8a327ba87c
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch
@@ -0,0 +1,41 @@
+From 18566f4cd3601109fe0e64d1230e9afa4813bc54 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 15 May 2018 13:23:55 +0200
+Subject: [PATCH] attr/xattr.h is deprecated. Use sys/xattr.h instead
+
+See also:
+http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
+---
+ configure.ac | 2 +-
+ src/evmctl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0497eb7..1f017e2 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.])])
+ 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/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>
+-- 
+2.17.0
+
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
index 9ca9b52abd8e..35ae3638a988 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
@@ -22,6 +22,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-configure-use-sys-xattr-bug-649790.patch"
+)
+
 src_prepare() {
 	default