diff --git a/docbook-xsl-path.patch b/docbook-xsl-path.patch deleted file mode 100644 index e4ee8e5..0000000 --- a/docbook-xsl-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp ima-evm-utils-1.0-orig/Makefile.am ima-evm-utils-1.0/Makefile.am ---- ima-evm-utils-1.0-orig/Makefile.am 2015-07-30 15:28:53.000000000 -0300 -+++ ima-evm-utils-1.0/Makefile.am 2017-11-20 16:20:04.245591165 -0200 -@@ -24,7 +24,7 @@ rpm: $(tarname) - rpmbuild -ba --nodeps $(SPEC) - - # requires asciidoc, xslproc, docbook-xsl --MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl - - evmctl.1.html: README - @asciidoc -o $@ $< diff --git a/ima-evm-utils-1.1.tar.gz b/ima-evm-utils-1.1.tar.gz deleted file mode 100644 index 23411a4..0000000 Binary files a/ima-evm-utils-1.1.tar.gz and /dev/null differ diff --git a/ima-evm-utils-1.2.1.tar.gz b/ima-evm-utils-1.2.1.tar.gz new file mode 100644 index 0000000..cbca2cd Binary files /dev/null and b/ima-evm-utils-1.2.1.tar.gz differ diff --git a/ima-evm-utils.spec b/ima-evm-utils.spec index 884dc3f..197e0d1 100644 --- a/ima-evm-utils.spec +++ b/ima-evm-utils.spec @@ -1,6 +1,6 @@ Name: ima-evm-utils -Version: 1.1 -Release: 7 +Version: 1.2.1 +Release: 1 Summary: IMA/EVM control utilities License: GPLv2 URL: http://linux-ima.sourceforge.net/ @@ -8,9 +8,6 @@ Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{na BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel keyutils-libs-devel git -Patch1: docbook-xsl-path.patch -Patch2: remove-libattr-dependency.patch - %description ima-evm-utils package provides the evmctl utility that can be used for producing and verifying digital signatures, which are used by Linux kernel integrity subsystem. @@ -68,6 +65,12 @@ make check %doc %{_mandir}/*/* %changelog +* Fri Jan 10 2020 openEuler Buildteam - 1.2.1-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: clean code + * Wed Oct 9 2019 openEuler Buildteam - 1.1-7 - Type:enhancement - ID:NA diff --git a/remove-libattr-dependency.patch b/remove-libattr-dependency.patch deleted file mode 100644 index 0c7a5a0..0000000 --- a/remove-libattr-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0497eb7..a5b4288 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS) - AC_CHECK_HEADER(unistd.h) - AC_CHECK_HEADERS(openssl/conf.h) - --AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])]) -+AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])]) - AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])]) - - #debug support - yes for a while -diff --git a/src/evmctl.c b/src/evmctl.c -index 2ffee78..3fbcd33 100644 ---- a/src/evmctl.c -+++ b/src/evmctl.c -@@ -49,7 +49,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include --- -2.14.4 -