commit 915dc09c28da083438d181e715f82a3847546da4
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 2 08:40:19 2022 +0200
- added openssl3 patch, use -Wno-error=deprecated-declarations to fix build
with openssl 3.0
- release 2
ibmswtpm2-openssl3.patch | 11 +++++++++++
ibmswtpm2.spec | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ibmswtpm2.spec b/ibmswtpm2.spec
index fa12fad..1bcd9c6 100644
--- a/ibmswtpm2.spec
+++ b/ibmswtpm2.spec
@@ -2,11 +2,12 @@ Summary: IBM's Software TPM 2.0
Summary(pl.UTF-8): Programowy TPM 2.0 stworzony przez IBM
Name: ibmswtpm2
Version: 1661
-Release: 1
+Release: 2
License: BSD
Group: Development/Tools
Source0:
https://downloads.sourceforge.net/ibmswtpm2/ibmtpm%{version}.tar.gz
# Source0-md5: df691c9c548023c1126742ff9213c006
+Patch0: %{name}-openssl3.patch
URL: https://sourceforge.net/projects/ibmswtpm2/
BuildRequires: openssl-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,11 +24,12 @@ Microsoft z dodatkowymi plikami dopełniającymi
implementację.
%prep
%setup -q -c
+%patch0 -p1
%build
%{__make} -C src \
CC="%{__cc}" \
- CCFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Werror -Wsign-compare -Wno-uninitialized
-DTPM_POSIX -D_POSIX_ -DTPM_NUVOTON -I. -c" \
+ CCFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Werror -Wsign-compare -Wno-uninitialized
-Wno-error=deprecated-declarations -DTPM_POSIX -D_POSIX_ -DTPM_NUVOTON -I. -c" \
LNFLAGS="%{rpmldflags} %{rpmcflags} -lcrypto -lpthread -lrt"
%install
diff --git a/ibmswtpm2-openssl3.patch b/ibmswtpm2-openssl3.patch
new file mode 100644
index 0000000..da88826
--- /dev/null
+++ b/ibmswtpm2-openssl3.patch
@@ -0,0 +1,11 @@
+--- ibmswtpm2-1661/src/TpmToOsslMath.h.orig 2021-01-23 00:14:01.000000000
+0100
++++ ibmswtpm2-1661/src/TpmToOsslMath.h 2022-07-01 22:24:21.822533492 +0200
+@@ -73,7 +73,7 @@
+
+ #define SYMMETRIC_ALIGNMENT RADIX_BYTES
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10200000L
++#if OPENSSL_VERSION_NUMBER >= 0x30100000L
+ // Check the bignum_st definition in crypto/bn/bn_lcl.h and either update the
+ // version check or provide the new definition for this version.
+ # error Untested OpenSSL version
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibmswtpm2.git/commitdiff/915dc09c28da083438d181e715f82a3847546da4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
