From 8864003417d9c42085f77c2a8217eecaf7db6c44 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 14:15:23 -0700 Subject: [PATCH] Fix missing #include for gcc-10 --- softhsm-2.5.0-gcc10.patch | 11 +++++++++++ softhsm.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 softhsm-2.5.0-gcc10.patch diff --git a/softhsm-2.5.0-gcc10.patch b/softhsm-2.5.0-gcc10.patch new file mode 100644 index 0000000..da89190 --- /dev/null +++ b/softhsm-2.5.0-gcc10.patch @@ -0,0 +1,11 @@ +diff -Nrup a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp +--- a/src/lib/SoftHSM.cpp 2019-09-23 10:45:59.979484657 -0600 ++++ b/src/lib/SoftHSM.cpp 2019-09-23 10:46:46.394199562 -0600 +@@ -78,6 +78,7 @@ + + #include + #include ++#include + + // Initialise the one-and-only instance + diff --git a/softhsm.spec b/softhsm.spec index cca99da..8d710ca 100644 --- a/softhsm.spec +++ b/softhsm.spec @@ -4,7 +4,7 @@ Summary: Software version of a PKCS#11 Hardware Security Module Name: softhsm Version: 2.5.0 -Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist}.1 +Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist}.2 License: BSD Url: http://www.opendnssec.org/ Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Requires: p11-kit Requires: openssl-libs >= 1.0.1k-6 Patch1: softhsm-2.5.0-updates.patch +Patch2: softhsm-2.5.0-gcc10.patch %global _hardened_build 1 @@ -42,6 +43,7 @@ The devel package contains the libsofthsm include files %prep %setup -q -n %{name}-%{version}%{?prever} %patch1 -p1 +%patch2 -p1 %if 0%{?prever:1} || 0%{?prerelease:1} # pre-release or post-release snapshots fixup @@ -111,6 +113,9 @@ if [ -f /var/softhsm/slot0.db ]; then fi %changelog +* Sat Dec 14 2019 Jeff Law - 2.5.0-4.2 +- Fix missing #includes for gcc-10 + * Fri Jul 26 2019 Fedora Release Engineering - 2.5.0-4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild