From 6ef9e47fe6fac4c5fbc1016c28795f0504e01ad1 Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 08:52:48 +0000 Subject: [PATCH 1/7] fix secgear build error Signed-off-by: zhoushuiqing --- 0001-fix-secgear-build-error.patch | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 0001-fix-secgear-build-error.patch diff --git a/0001-fix-secgear-build-error.patch b/0001-fix-secgear-build-error.patch new file mode 100644 index 0000000..ff1e64c --- /dev/null +++ b/0001-fix-secgear-build-error.patch @@ -0,0 +1,31 @@ +From 266e1366a71c0e2cd3c96a747508fbd42c446b13 Mon Sep 17 00:00:00 2001 +From: zhoushuiqing +Date: Thu, 10 Aug 2023 15:21:14 +0800 +Subject: [PATCH] fix secgear build error + +--- + openssl_source/openssl-1.1.1t/include/openssl/bio.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/openssl_source/openssl-1.1.1t/include/openssl/bio.h b/openssl_source/openssl-1.1.1t/include/openssl/bio.h +index ae559a5..514e107 100644 +--- a/openssl_source/openssl-1.1.1t/include/openssl/bio.h ++++ b/openssl_source/openssl-1.1.1t/include/openssl/bio.h +@@ -14,6 +14,14 @@ + + # ifndef OPENSSL_NO_STDIO + # include ++ ++#ifndef __FILE_defined ++#define __FILE_defined 1 ++struct _IO_FILE; ++/* The opaque type of streams. This is the definition used elsewhere. */ ++typedef struct _IO_FILE FILE; ++#endif ++ + # endif + # include + +-- +2.33.0 + From eed59b7f7ee92a84fd28e3c025e61a52151424cb Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 08:53:09 +0000 Subject: [PATCH 2/7] update intel-sgx-ssl.spec. Signed-off-by: zhoushuiqing --- intel-sgx-ssl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/intel-sgx-ssl.spec b/intel-sgx-ssl.spec index 1a5ff9b..c9b32d2 100644 --- a/intel-sgx-ssl.spec +++ b/intel-sgx-ssl.spec @@ -11,6 +11,7 @@ Source1: https://www.openssl.org/source/old/1.1.1/openssl-%{openssl_versi Patch0: 0001-Solution_to_issue_ssl_library_is_not_supported.patch Patch1: 0002-adapt-openssl-CVE.patch +Patch2: 0001-fix-secgear-build-error.patch BuildRequires: gcc gcc-c++ BuildRequires: libsgx-launch libsgx-urts sgxsdk perl From 462ecc5733280754a20d87aa3d47367f2c940928 Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 09:00:31 +0000 Subject: [PATCH 3/7] 1700-update intel-sgx-ssl.spec. Signed-off-by: zhoushuiqing --- intel-sgx-ssl.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/intel-sgx-ssl.spec b/intel-sgx-ssl.spec index c9b32d2..554e3ea 100644 --- a/intel-sgx-ssl.spec +++ b/intel-sgx-ssl.spec @@ -1,7 +1,7 @@ %define openssl_version 1.1.1t Name: intel-sgx-ssl Version: 2.19 -Release: 1 +Release: 2 Summary: Intel® Software Guard Extensions SSL ExclusiveArch: x86_64 License: OpenSSL and BSD-3-Clause @@ -45,6 +45,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -D -T -n intel-sgx-ssl-lin_%{version}_%{openssl_version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build cp %{SOURCE1} openssl_source/ From e07154daee4fa763cd0744af94171b71e0707abc Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 09:26:43 +0000 Subject: [PATCH 4/7] update intel-sgx-ssl.spec. Signed-off-by: zhoushuiqing --- intel-sgx-ssl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intel-sgx-ssl.spec b/intel-sgx-ssl.spec index 554e3ea..6fc4fad 100644 --- a/intel-sgx-ssl.spec +++ b/intel-sgx-ssl.spec @@ -1,7 +1,7 @@ %define openssl_version 1.1.1t Name: intel-sgx-ssl Version: 2.19 -Release: 2 +Release: 1 Summary: Intel® Software Guard Extensions SSL ExclusiveArch: x86_64 License: OpenSSL and BSD-3-Clause From 09a9ad76489a0f10a7d4f9eede4bd924da657ddf Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 09:34:25 +0000 Subject: [PATCH 5/7] update 0001-fix-secgear-build-error.patch. Signed-off-by: zhoushuiqing --- 0001-fix-secgear-build-error.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/0001-fix-secgear-build-error.patch b/0001-fix-secgear-build-error.patch index ff1e64c..af7ac71 100644 --- a/0001-fix-secgear-build-error.patch +++ b/0001-fix-secgear-build-error.patch @@ -1,7 +1,9 @@ From 266e1366a71c0e2cd3c96a747508fbd42c446b13 Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 15:21:14 +0800 -Subject: [PATCH] fix secgear build error +Subject: [PATCH] Add a definition for FILE variable + +Add the definition of the FILE variable to the bio.h header file of OpenSSL. --- openssl_source/openssl-1.1.1t/include/openssl/bio.h | 8 ++++++++ From 1c1b68c8551f9216ca1c54308b0a978127f030e8 Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 10:06:29 +0000 Subject: [PATCH 6/7] rename 0001-fix-secgear-build-error.patch to 0003-add-definition-for-FILE-variable.patch. Signed-off-by: zhoushuiqing --- ...ild-error.patch => 0003-add-definition-for-FILE-variable.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 0001-fix-secgear-build-error.patch => 0003-add-definition-for-FILE-variable.patch (100%) diff --git a/0001-fix-secgear-build-error.patch b/0003-add-definition-for-FILE-variable.patch similarity index 100% rename from 0001-fix-secgear-build-error.patch rename to 0003-add-definition-for-FILE-variable.patch From e91517cadbc472e894051e0d0c88ef9e8e80e20c Mon Sep 17 00:00:00 2001 From: zhoushuiqing Date: Thu, 10 Aug 2023 10:10:10 +0000 Subject: [PATCH 7/7] update intel-sgx-ssl.spec. Signed-off-by: zhoushuiqing --- intel-sgx-ssl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intel-sgx-ssl.spec b/intel-sgx-ssl.spec index 6fc4fad..e878388 100644 --- a/intel-sgx-ssl.spec +++ b/intel-sgx-ssl.spec @@ -1,7 +1,7 @@ %define openssl_version 1.1.1t Name: intel-sgx-ssl Version: 2.19 -Release: 1 +Release: 2 Summary: Intel® Software Guard Extensions SSL ExclusiveArch: x86_64 License: OpenSSL and BSD-3-Clause @@ -11,7 +11,7 @@ Source1: https://www.openssl.org/source/old/1.1.1/openssl-%{openssl_versi Patch0: 0001-Solution_to_issue_ssl_library_is_not_supported.patch Patch1: 0002-adapt-openssl-CVE.patch -Patch2: 0001-fix-secgear-build-error.patch +Patch2: 0003-add-definition-for-FILE-variable.patch BuildRequires: gcc gcc-c++ BuildRequires: libsgx-launch libsgx-urts sgxsdk perl @@ -67,6 +67,9 @@ cp License.txt $RPM_BUILD_ROOT/opt/intel/sgxssl/docs/ /opt/intel/sgxssl/include/* %changelog +* Thu Aug 10 2023 zhoushuiqing - 2.19-2 +- Add definition for FILE variable + * Fri Jul 21 2023 zhoushuiqing - 2.19-1 - Upgrade to 2.19