From 8302e3c479154157667e22e9d7c5461c966b4586 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 19 Jan 2020 11:02:51 +0800
Subject: [PATCH] ima-inspect: upgrade 0.11 -> 0.13

Fixes:
* Use glibc header instead of libattr header because the attr/xattr.h
  has been removed from attr package.
* fix configure check for newer libimaevm versions.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../ima-inspect/ima-inspect/fix-new-imaevm.patch    | 13 -------------
 .../{ima-inspect_0.11.bb => ima-inspect_0.13.bb}    |  3 +--
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch
 rename meta-integrity/recipes-support/ima-inspect/{ima-inspect_0.11.bb => ima-inspect_0.13.bb} (74%)

diff --git a/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch b/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch
deleted file mode 100644
index 6ba0fcd..0000000
--- a/meta-integrity/recipes-support/ima-inspect/ima-inspect/fix-new-imaevm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects
- AC_CONFIG_FILES([Makefile])
- 
- PKG_CHECK_MODULES([TCLAP], [tclap])
--AC_SEARCH_LIBS([do_dump], [imaevm], [], [
-+AC_SEARCH_LIBS([imaevm_do_hexdump], [imaevm], [], [
- 	AC_MSG_ERROR([unable to find libimaevm, you need ima-evm-utils-devel or similar package])
- ])
- 
diff --git a/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb b/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb
similarity index 74%
rename from meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb
rename to meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb
index 09cbe15..c5ee628 100644
--- a/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.11.bb
+++ b/meta-integrity/recipes-support/ima-inspect/ima-inspect_0.13.bb
@@ -5,9 +5,8 @@ DEPENDS += "attr ima-evm-utils tclap"
 
 SRC_URI = " \
     git://github.com/mgerstner/ima-inspect.git \
-    file://fix-new-imaevm.patch \
 "
-SRCREV = "e912be2d2a9fdf30a9693a7fc5d6b2473990a71c"
+SRCREV = "90f395c84eff54c69ba9ee078274313cfd308b53"
 
 S = "${WORKDIR}/git"