From 607604d0b4feefe88da3af7b1006194ca431362e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 11 2022 18:25:58 +0000
Subject: import ima-evm-utils-1.4-4.el9


---

diff --git a/.gitignore b/.gitignore
index d2a7790..be3fbc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/ima-evm-utils-1.3.2.tar.gz
+SOURCES/ima-evm-utils-1.4.tar.gz
diff --git a/.ima-evm-utils.metadata b/.ima-evm-utils.metadata
index ac55e46..52cee1d 100644
--- a/.ima-evm-utils.metadata
+++ b/.ima-evm-utils.metadata
@@ -1 +1,2 @@
 034d163533ae5f9c06001b375ec7e5a1b09a3853 SOURCES/ima-evm-utils-1.3.2.tar.gz
+f23d8a406759a469b0223b0bfb302ada4407a1d1 SOURCES/ima-evm-utils-1.4.tar.gz
diff --git a/SPECS/ima-evm-utils.spec b/SPECS/ima-evm-utils.spec
index a9152da..109c0bd 100644
--- a/SPECS/ima-evm-utils.spec
+++ b/SPECS/ima-evm-utils.spec
@@ -1,12 +1,31 @@
+%bcond_with compat
+
+# For cases where the soname requires a bump we need to define with_compat,
+# update the package into the side-tag, update RPM (rpm-sign) into side-tag,
+# _then_ undefine with_compat and rebuild the package into the side-tag. This
+# is required to workaround the chiken-egg situation with the rpm-sign update.
+# The compat pkg must not make the compose, it's only a buildrequirement for
+# rpm-sign in a soname bump.
+%if ! %{with compat}
+%undefine with_compat
+%endif
+
+%if %{with compat}
+%global compat_soversion 2
+%endif
+
 Name:    ima-evm-utils
-Version: 1.3.2
-Release: 7%{?dist}
+Version: 1.4
+Release: 4%{?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
+
+# compat source and patches
+Source10: ima-evm-utils-1.3.2.tar.gz
+Patch10:  0001-evmctl-fix-memory-leak-in-get_password.patch
+Patch11:  0001-libimaevm-make-SHA-256-the-default-hash-algorithm.patch
 
 BuildRequires: asciidoc
 BuildRequires: autoconf
@@ -15,9 +34,9 @@ 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
@@ -34,35 +53,86 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 This package provides the header files for %{name}
 
+%if %{with compat}
+%package -n %{name}%{compat_soversion}
+Summary: Compatibility package of %{name}
+
+%description -n %{name}%{compat_soversion}
+This package provides the libimaevm.so.%{compat_soversion} relative to %{name}-1.3
+%endif
+
 %prep
-%autosetup -p1
+%setup -q
+
+%if %{with compat}
+mkdir compat/
+tar -zxf %{SOURCE10} --strip-components=1 -C compat/
+cd compat/
+%patch10 -p1
+%patch11 -p1
+%endif
 
 %build
 autoreconf -vif
 %configure --disable-static
 %make_build
 
+%if %{with compat}
+pushd compat/
+autoreconf -vif
+%configure --disable-static
+%make_build
+popd
+%endif
+
 %install
 %make_install
-find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
+find %{buildroot} -type f -name "*.la" -print -delete
+
+%if %{with compat}
+pushd compat/src/.libs/
+install -p libimaevm.so.%{compat_soversion}.0.0 %{buildroot}%{_libdir}/libimaevm.so.%{compat_soversion}.0.0
+ln -s -f %{buildroot}%{_libdir}/libimaevm.so.%{compat_soversion}.0.0 %{buildroot}%{_libdir}/libimaevm.so.%{compat_soversion}
+popd
+%endif
 
 %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
 
+%if %{with compat}
+%files -n %{name}%{compat_soversion}
+%{_libdir}/libimaevm.so.%{compat_soversion}
+%{_libdir}/libimaevm.so.%{compat_soversion}.0.0
+%endif
+
 %changelog
+* Mon Dec 13 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.4-4
+- Fix compat bcond_with value check.
+
+* Fri Dec 10 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.4-3
+- Remove compat subpkg from compose (rhbz#2026028)
+
+* Tue Dec 07 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.4-2
+- Add compat subpkg for helping building dependencies (rhbz#2026028)
+
+* Thu Dec 02 2021 Bruno Meneguele <bmeneg@redhat.com> - 1.4-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)