Sync from SUSE:SLFO:Main ima-evm-utils revision e13c3edf8b33794cc466bacb8b96c163

0001-fsverity.test-Add-usr-sbin-into-PATH.patch

@@ -1,40 +0,0 @@
-From e445cc94831c55b6c5430716bc03613b7a2bb83b Mon Sep 17 00:00:00 2001
-From: Petr Vorel <pvorel@suse.cz>
-Date: Fri, 10 Mar 2023 11:39:00 +0100
-Subject: [PATCH] fsverity.test: Add /usr/sbin into $PATH
-
-Unlike GitHub CI, tests which run by packaging tools often run as non-root,
-thus required tools aren't visible:
-
-./functions.sh: line 45: type: mkfs: not found
-mkfs is required for test
-./functions.sh: line 45: type: blkid: not found
-blkid is required for test
-./functions.sh: line 45: type: e2fsck: not found
-e2fsck is required for test
-./functions.sh: line 45: type: tune2fs: not found
-tune2fs is required for test
-
-Signed-off-by: Petr Vorel <pvorel@suse.cz>
----
-Upstream status: https://lore.kernel.org/linux-integrity/20230310104729.32078-1-pvorel@suse.cz/
-
- tests/fsverity.test | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/fsverity.test b/tests/fsverity.test
-index 01d5c35..a274158 100755
---- a/tests/fsverity.test
-+++ b/tests/fsverity.test
-@@ -30,7 +30,7 @@
- # custom policy rules might take precedence.
- 
- cd "$(dirname "$0")" || exit 1
--PATH=../src:../fsverity-utils:$PATH
-+PATH=../src:../fsverity-utils:/usr/sbin:$PATH
- source ./functions.sh
- 
- # Base VERBOSE on the environment variable, if set.
--- 
-2.39.2
-

ima-evm-utils.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Mon Sep  2 09:59:06 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Update to version 1.6.2
+  https://github.com/linux-integrity/ima-evm-utils/blob/v1.6.2/NEWS
+- Remove LicenseRef-GPL-2.0-with-openssl-exception (no need due relicensing of
+  OpenSSL 3 or later to the Apache 2 license
+  https://github.com/linux-integrity/ima-evm-utils/commit/4a4c762c8e3cbbff5f41c682deb026d22440454d )
+- Upstream added COPYING (again) and COPYING.LGPL (new), add them to %license.
+
+-------------------------------------------------------------------
+Fri Jul 12 18:22:32 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Update project source URL.
+
+-------------------------------------------------------------------
+Thu Jul 11 05:19:42 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Add LicenseRef-GPL-2.0-with-openssl-exception to License: (upstream has not
+  yet created appropriate exception in SPDX).
+
+-------------------------------------------------------------------
+Mon Jul  8 09:43:58 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Update to version 1.6
+  https://lore.kernel.org/linux-integrity/20240703164454.61614-1-zohar@linux.ibm.com/
+- Upstream bumped soname to 5.0.0
+- Upstream changed license to GPL-2.0-or-later (evmctl), LGPL-2.0-or-later
+  (libimaevm + devel package), and GPL-2.0-or-later WITH Linux-syscall-note
+  exception (both)
+  https://github.com/linux-integrity/ima-evm-utils/issues/4
+  (mention both GPL and LGPL and add specific license to subpackages)
+- Remove patch from upstream (0001-fsverity.test-Add-usr-sbin-into-PATH.patch)
+
 -------------------------------------------------------------------
 Fri Dec 15 10:55:12 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 

ima-evm-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ima-evm-utils
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,16 @@
 #
 
 
-%define sover 4
+%define sover 5
 %define libname libimaevm%{sover}
 Name:           ima-evm-utils
-Version:        1.5
+Version:        1.6.2
 Release:        0
 Summary:        IMA/EVM control utility
-License:        LGPL-2.1-or-later
+License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND GPL-2.0-or-later WITH Linux-syscall-note
 Group:          System/Base
 URL:            https://sourceforge.net/projects/linux-ima/
-Source0:        https://github.com/mimizohar/ima-evm-utils/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/linux-integrity/ima-evm-utils/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Patch1:         0001-fsverity.test-Add-usr-sbin-into-PATH.patch
 BuildRequires:  asciidoc
 BuildRequires:  attr
 BuildRequires:  autoconf
@@ -49,6 +48,7 @@ Measurement Architecture/ Linux Extended Verification Module).
 
 %package devel
 Summary:        Development files for the IMA/EVM control utility library
+License:        LGPL-2.0-or-later AND GPL-2.0-or-later WITH Linux-syscall-note AND LicenseRef-GPL-2.0-with-openssl-exception
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
 Requires:       openssl-devel
@@ -58,6 +58,7 @@ This package contains the header files and the utilities for %{name}.
 
 %package -n %{libname}
 Summary:        IMA/EVM control utility libary
+License:        LGPL-2.0-or-later AND GPL-2.0-or-later WITH Linux-syscall-note AND LicenseRef-GPL-2.0-with-openssl-exception
 Group:          System/Libraries
 
 %description -n %{libname}
@@ -66,6 +67,7 @@ Measurement Architecture/Extended Verification Module).
 
 %package -n evmctl
 Summary:        IMA/EVM signing utility
+License:        GPL-2.0-or-later AND GPL-2.0-or-later WITH Linux-syscall-note AND LicenseRef-GPL-2.0-with-openssl-exception
 Group:          System/Kernel
 Provides:       ima-evm-utils = %{version}
 Obsoletes:      ima-evm-utils < %{version}
@@ -103,7 +105,9 @@ make %{?_smp_mflags} check
 
 %files -n %{libname}
 %doc README NEWS AUTHORS
+%license LICENSES.txt
 %license COPYING
+%license COPYING.LGPL
 %{_libdir}/libimaevm.so.%{sover}*
 
 %files -n evmctl