From 3f61e7588823ddb385f69839719fa52d732cd3b0 Mon Sep 17 00:00:00 2001
From: Bruno Meneguele <bmeneg@redhat.com>
Date: Thu, 2 Dec 2021 14:01:53 -0300
Subject: [PATCH] Rebase to upstream release v1.4

The new version already handles the two additional patches that were being
applied through the rpm package creation, with that, remove both of them.
Also, this commit modifies some specfile pieces to get closer to Fedora's
specfile.

Related: rhbz#2026028
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
---
 ima-evm-utils.spec | 26 +++++++++++++++-----------
 sources            |  4 +---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec
index a9152da..5e8824f 100644
--- a/ima-evm-utils.spec
+++ b/ima-evm-utils.spec
@@ -1,12 +1,10 @@
 Name:    ima-evm-utils
-Version: 1.3.2
-Release: 7%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 Summary: IMA/EVM support utilities
 License: GPLv2
 Url:     http://linux-ima.sourceforge.net/
 Source:  http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
-Patch0:  0001-evmctl-fix-memory-leak-in-get_password.patch
-Patch1:  0001-libimaevm-make-SHA-256-the-default-hash-algorithm.patch
 
 BuildRequires: asciidoc
 BuildRequires: autoconf
@@ -15,9 +13,10 @@ BuildRequires: gcc
 BuildRequires: keyutils-libs-devel
 BuildRequires: libtool
 BuildRequires: libxslt
+BuildRequires: make
 BuildRequires: openssl-devel
 BuildRequires: tpm2-tss-devel
-BuildRequires: make
+
 
 %description
 The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture
@@ -44,25 +43,30 @@ autoreconf -vif
 
 %install
 %make_install
-find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
+find %{buildroot} -type f -name "*.la" -print -delete
 
 %ldconfig_scriptlets
 
 %files
 %license COPYING
 %doc NEWS README AUTHORS
-%{_bindir}/*
+%{_bindir}/evmctl
 # if you need to bump the soname version, coordinate with dependent packages
-%{_libdir}/libimaevm.so.2
-%{_libdir}/libimaevm.so.2.0.0
-%{_mandir}/man1/*
+%{_libdir}/libimaevm.so.3*
+%{_mandir}/man1/evmctl*
 
 %files devel
 %{_pkgdocdir}/*.sh
-%{_includedir}/*
+%{_includedir}/imaevm.h
 %{_libdir}/libimaevm.so
 
 %changelog
+* Thu Dec 02 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.4.0-1
+- Modify some pieces to get closer to Fedora's specfile
+- Remove patch handling memory leak: solved in the rebase
+- Remove patch handling SHA-256 default hash: solved in the rebase
+- Rebase to upstream release v1.4 (rhbz#2026028)
+
 * Fri Aug 20 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.3.2-9
 - Use upstream accepted patch for the memory leak
 - Make SHA-256 the default hash algorithm (rhbz#1934949)
diff --git a/sources b/sources
index 492c4e4..a03a3da 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (ima-evm-utils-1.3.2.tar.gz) = af96935f953fbec8cdd40ba1a24001fae916633df03f9dee1e96775baec0ffea21a7a13798b3e3c3f375fd493a65fe65b5357887890b46cac0c4dcca5a5b79db
-SHA512 (0001-evmctl-fix-memory-leak-in-get_password.patch) = 2c3189571a19b5a1f3334934bcd318403ca766464e2e8c60387da54c0854a27646d5bc156ae9b22c795aa57f833e183697f3208c6c792e4de5e3a6fd4d8fe102
-SHA512 (0001-libimaevm-make-SHA-256-the-default-hash-algorithm.patch) = 271a9bdf8b6841afc03cae9ae5caf262c048cffdc9d3ab2388035eb3c67e4115dd9178aa211b0d0a4796b9d3bd9e08bc851db663d99dec3b7eb0897114f6c7ac
+SHA512 (ima-evm-utils-1.4.tar.gz) = 2fdf41470d88608162a084c4877ba17d531941b744bcb44dd4913e48ab2c2d131e0af3e3ead74c18748a5d46aced51213ebd7c13a5ee19050c28d54a26c011a3