Gentoo Archives: gentoo-commits

From: Sven Vermeulen <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/ima-evm-utils/, app-crypt/ima-evm-utils/files/
Date: Mon, 27 Aug 2018 17:06:20
Message-Id: 1535389550.faa1e1acf25bdf284b0e5dbce8081c40933cb32f.swift@gentoo
1 commit: faa1e1acf25bdf284b0e5dbce8081c40933cb32f
2 Author: Sven Vermeulen <swift <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 27 17:03:39 2018 +0000
4 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 27 17:05:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa1e1ac
7
8 app-crypt/ima-evm-utils: Use sys/xattr instead of attr/xattr
9
10 The xattr syscalls are provided by glibc, so there is no need to depend
11 on libattr (and the ebuild didn't anyway).
12
13 This fixes Gentoo bug #649790.
14
15 Reported-by: Toralf Forster <toralf <AT> gentoo.org>
16 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
17 Package-Manager: Portage-2.3.40, Repoman-2.3.9
18
19 ...ls-1.1-configure-use-sys-xattr-bug-649790.patch | 41 ++++++++++++++++++++++
20 app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild | 4 +++
21 2 files changed, 45 insertions(+)
22
23 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
24 new file mode 100644
25 index 00000000000..1a8a327ba87
26 --- /dev/null
27 +++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch
28 @@ -0,0 +1,41 @@
29 +From 18566f4cd3601109fe0e64d1230e9afa4813bc54 Mon Sep 17 00:00:00 2001
30 +From: Lars Wendler <polynomial-c@g.o>
31 +Date: Tue, 15 May 2018 13:23:55 +0200
32 +Subject: [PATCH] attr/xattr.h is deprecated. Use sys/xattr.h instead
33 +
34 +See also:
35 +http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
36 +---
37 + configure.ac | 2 +-
38 + src/evmctl.c | 2 +-
39 + 2 files changed, 2 insertions(+), 2 deletions(-)
40 +
41 +diff --git a/configure.ac b/configure.ac
42 +index 0497eb7..1f017e2 100644
43 +--- a/configure.ac
44 ++++ b/configure.ac
45 +@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS)
46 + AC_CHECK_HEADER(unistd.h)
47 + AC_CHECK_HEADERS(openssl/conf.h)
48 +
49 +-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])])
50 ++AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found.])])
51 + AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
52 +
53 + #debug support - yes for a while
54 +diff --git a/src/evmctl.c b/src/evmctl.c
55 +index 2ffee78..3fbcd33 100644
56 +--- a/src/evmctl.c
57 ++++ b/src/evmctl.c
58 +@@ -49,7 +49,7 @@
59 + #include <stdint.h>
60 + #include <string.h>
61 + #include <dirent.h>
62 +-#include <attr/xattr.h>
63 ++#include <sys/xattr.h>
64 + #include <linux/xattr.h>
65 + #include <getopt.h>
66 + #include <keyutils.h>
67 +--
68 +2.17.0
69 +
70
71 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
72 index 9ca9b52abd8..35ae3638a98 100644
73 --- a/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
74 +++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
75 @@ -22,6 +22,10 @@ SLOT="0"
76 KEYWORDS="~amd64 ~x86"
77 IUSE="debug"
78
79 +PATCHES=(
80 + "${FILESDIR}/${PN}-1.1-configure-use-sys-xattr-bug-649790.patch"
81 +)
82 +
83 src_prepare() {
84 default