From bd8eaf0a7e7793e58baaed9eae36c18c51f89f7d Mon Sep 17 00:00:00 2001 From: Anakin Zhang Date: Thu, 17 Sep 2020 21:30:19 +0800 Subject: [PATCH 1/2] add libimaevm.so.1 --- change-libimaevm-release-number.patch | 26 ++++++++++++++++++++++++++ ima-evm-utils.spec | 8 ++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 change-libimaevm-release-number.patch diff --git a/change-libimaevm-release-number.patch b/change-libimaevm-release-number.patch new file mode 100644 index 0000000..9677ada --- /dev/null +++ b/change-libimaevm-release-number.patch @@ -0,0 +1,26 @@ +From 28eefc4b05c8733a3e7d220ac70cfe1e3777f714 Mon Sep 17 00:00:00 2001 +From: Anakin Zhang +Date: Thu, 17 Sep 2020 13:38:37 +0800 +Subject: [PATCH] change libimaevm release number + +Signed-off-by: Anakin Zhang +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d6c779f..ba9719b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,7 +4,7 @@ libimaevm_la_SOURCES = libimaevm.c + libimaevm_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) + # current[:revision[:age]] + # result: [current-age].age.revision +-libimaevm_la_LDFLAGS = -version-info 2:0:0 ++libimaevm_la_LDFLAGS = -version-info 1:0:0 + libimaevm_la_LIBADD = $(LIBCRYPTO_LIBS) + + include_HEADERS = imaevm.h +-- +2.23.0 + diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 9b38cd2..95fffdc 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,11 +1,12 @@ Name: ima-evm-utils Version: 1.3.1 -Release: 1 +Release: 2 Summary: IMA/EVM control utilities Group: System/Libraries License: GPLv2 URL: http://linux-ima.sourceforge.net/ Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz +Patch0: change-libimaevm-release-number.patch BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git Requires: %{name}-libs = %{version}-%{release} @@ -16,7 +17,7 @@ and verifying digital signatures, which are used by Linux kernel integrity subsy It can be also used to import keys into the kernel keyring. %package libs -Summary: shared library for IMA/EVM +Summary: shared library for IMA/EVM %description libs This package provides shared library for IMA/EVM. @@ -77,6 +78,9 @@ make check %doc %{_mandir}/*/* %changelog +* Thu Sep 17 2020 openEuler Buildteam - 1.3.1-2 +- provide libimaevm.so.1 + * Wed Aug 19 2020 openEuler Buildteam - 1.3.1-1 - update to 1.3.1 -- Gitee From b54f8d8728b52129c5e8b88c1f2b13e7b73636f5 Mon Sep 17 00:00:00 2001 From: Anakin Zhang Date: Mon, 21 Sep 2020 21:50:30 +0800 Subject: [PATCH 2/2] provide both libimaevm.so.1 and libimaevm.so.2 --- change-libimaevm-release-number.patch | 26 -------------------------- ima-evm-utils.spec | 10 +++++++--- 2 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 change-libimaevm-release-number.patch diff --git a/change-libimaevm-release-number.patch b/change-libimaevm-release-number.patch deleted file mode 100644 index 9677ada..0000000 --- a/change-libimaevm-release-number.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28eefc4b05c8733a3e7d220ac70cfe1e3777f714 Mon Sep 17 00:00:00 2001 -From: Anakin Zhang -Date: Thu, 17 Sep 2020 13:38:37 +0800 -Subject: [PATCH] change libimaevm release number - -Signed-off-by: Anakin Zhang ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index d6c779f..ba9719b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -4,7 +4,7 @@ libimaevm_la_SOURCES = libimaevm.c - libimaevm_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCRYPTO_CFLAGS) - # current[:revision[:age]] - # result: [current-age].age.revision --libimaevm_la_LDFLAGS = -version-info 2:0:0 -+libimaevm_la_LDFLAGS = -version-info 1:0:0 - libimaevm_la_LIBADD = $(LIBCRYPTO_LIBS) - - include_HEADERS = imaevm.h --- -2.23.0 - diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 95fffdc..0535018 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,14 +1,14 @@ Name: ima-evm-utils Version: 1.3.1 -Release: 2 +Release: 3 Summary: IMA/EVM control utilities Group: System/Libraries License: GPLv2 URL: http://linux-ima.sourceforge.net/ Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz -Patch0: change-libimaevm-release-number.patch -BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git +BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel +BuildRequires: keyutils-libs-devel git ima-evm-utils Requires: %{name}-libs = %{version}-%{release} %description @@ -45,6 +45,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} %make_install +cp %{_libdir}/libimaevm.so.1* %{buildroot}/%{_libdir} %check make check @@ -78,6 +79,9 @@ make check %doc %{_mandir}/*/* %changelog +* Mon Sep 21 2020 openEuler Buildteam - 1.3.1-3 +- provide both libimaevm.so.1 and libimaevm.so.2 + * Thu Sep 17 2020 openEuler Buildteam - 1.3.1-2 - provide libimaevm.so.1 -- Gitee