diff --git a/attest-tools-support-openssl-3.0.patch b/attest-tools-support-openssl-3.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..7de8ab75da51a3127408fb34b97371c6debf3ea9 --- /dev/null +++ b/attest-tools-support-openssl-3.0.patch @@ -0,0 +1,26 @@ +From 63001de4b2b56d2a94c2e806f03ade285c4c9533 Mon Sep 17 00:00:00 2001 +From: Huaxin Lu +Date: Fri, 10 Feb 2023 13:41:25 +0800 +Subject: [PATCH] attest tools support openssl 3.0 + +Signed-off-by: Huaxin Lu +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9b2e89c..ab774c4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,7 +58,7 @@ AC_CHECK_LIB([digestlist-base], [new_key_pgp],[digestlists_pgp=true],[],[]) + AM_CONDITIONAL([DIGESTLISTS], [test x$digestlists = xtrue]) + AM_CONDITIONAL([DIGESTLISTS_PGP], [test x$digestlists_pgp = xtrue]) + +-CFLAGS="$CFLAGS -Wall -Werror -DTPM_POSIX" ++CFLAGS="$CFLAGS -Wall -Werror -DTPM_POSIX -Wno-deprecated-declarations -Wno-discarded-qualifiers" + + AC_SUBST(CFLAGS) + +-- +2.33.0 + diff --git a/attest-tools.spec b/attest-tools.spec index d57fdd74b7366c13f109470d61bcea7ecc652018..74f3f47df687386acb3fbfe83bc0858ff82fb6bc 100644 --- a/attest-tools.spec +++ b/attest-tools.spec @@ -1,20 +1,22 @@ name: attest-tools Version: 0.2.92 -Release: 6 +Release: 7 Summary: Attestation tools Source0: https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.tar.gz +Patch0: attest-tools-support-openssl-3.0.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPLv2+ Url: https://gitee.com/openeuler/attest-tools -BuildRequires: autoconf automake libcurl-devel libtool compat-openssl11-devel +BuildRequires: autoconf automake libcurl-devel libtool openssl-devel BuildRequires: digest-list-tools-devel json-c-devel libcurl-devel tss2-devel systemd Requires: json-c curl tss2 openssl_tpm2_engine %if 0%{?suse_version} BuildRequires: libopenssl-devel %else -BuildRequires: compat-openssl11-devel +BuildRequires: openssl-devel %endif %description @@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/attest-tools %changelog +* Thu Mar 16 2023 luhuaxin - 0.2.92-7 +- Support openssl 3.0 + * Tue Feb 7 2023 gaoyusong - 0.2.92-6 - Fix build error with openssl