From 846f6b26d01d21e0ecd1b866be498c26bb7680b4 Mon Sep 17 00:00:00 2001
From: "Bruno E. O. Meneguele" <bmeneguele@gmail.com>
Date: Fri, 16 Feb 2018 16:27:59 -0200
Subject: [PATCH] - New upstream release - Support for OpenSSL 1.1 added in
 upstream, thus removing specific patch for it - Docbook xsl stylesheet
 updated to a local path

Signed-off-by: Bruno E. O. Meneguele <bmeneguele@gmail.com>
---
 .gitignore             |  1 +
 docbook-xsl-path.patch |  2 +-
 ima-evm-utils.spec     | 14 ++++++++------
 sources                |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7cea8a..d1d52cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ima-evm-utils-0.6.tar.gz
 /ima-evm-utils-0.9.tar.gz
 /ima-evm-utils-1.0.tar.gz
+/ima-evm-utils-1.1.tar.gz
diff --git a/docbook-xsl-path.patch b/docbook-xsl-path.patch
index 03e5664..e4ee8e5 100644
--- a/docbook-xsl-path.patch
+++ b/docbook-xsl-path.patch
@@ -6,7 +6,7 @@ diff -urNp ima-evm-utils-1.0-orig/Makefile.am ima-evm-utils-1.0/Makefile.am
  
  # requires asciidoc, xslproc, docbook-xsl
 -MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
-+MANPAGE_DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current/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.spec b/ima-evm-utils.spec
index 955bb49..4ee6d7f 100644
--- a/ima-evm-utils.spec
+++ b/ima-evm-utils.spec
@@ -1,14 +1,13 @@
 Summary: IMA/EVM support utilities
 Name: ima-evm-utils
-Version: 1.0
-Release: 5%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: GPLv2
 Url:  http://linux-ima.sourceforge.net/
 Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
 BuildRequires: autoconf automake libtool m4 asciidoc libxslt
 BuildRequires: openssl-devel libattr-devel keyutils-libs-devel
 Patch1: docbook-xsl-path.patch
-Patch2: openssl1-1-interface.patch
 
 %description
 The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture
@@ -27,9 +26,6 @@ This package provides the header files for %{name}
 %prep
 %setup -q
 %patch1 -p1
-if pkgconf --atleast-version=1.1 openssl; then
-%patch2 -p1
-fi
 
 %build
 mkdir -p m4
@@ -56,6 +52,12 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 16 2018 Bruno E. O. Meneguele <brdeoliv@redhat.com> - 1.1-1
+- New upstream release
+- Support for OpenSSL 1.1 was added directly to the source code in upstream,
+  thus removing specific patch for it
+- Docbook xsl stylesheet updated to a local path
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 17e6d4e..baf9168 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ima-evm-utils-1.0.tar.gz) = f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a
+SHA512 (ima-evm-utils-1.1.tar.gz) = fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776