Compare commits
No commits in common. "3e6bb2ac3caf8c800b5518009b40714ac3615997" and "53bb4b8a6049bb90cee06228c8eb07d02626795b" have entirely different histories.
3e6bb2ac3c
...
53bb4b8a60
@ -1,33 +0,0 @@
|
|||||||
From 266e1366a71c0e2cd3c96a747508fbd42c446b13 Mon Sep 17 00:00:00 2001
|
|
||||||
From: zhoushuiqing <zhoushuiqing2@huawei.com>
|
|
||||||
Date: Thu, 10 Aug 2023 15:21:14 +0800
|
|
||||||
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 ++++++++
|
|
||||||
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 <stdio.h>
|
|
||||||
+
|
|
||||||
+#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 <stdarg.h>
|
|
||||||
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
%define openssl_version 1.1.1t
|
%define openssl_version 1.1.1t
|
||||||
Name: intel-sgx-ssl
|
Name: intel-sgx-ssl
|
||||||
Version: 2.19
|
Version: 2.19
|
||||||
Release: 3
|
Release: 1
|
||||||
Summary: Intel® Software Guard Extensions SSL
|
Summary: Intel® Software Guard Extensions SSL
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
License: OpenSSL and BSD-3-Clause
|
License: OpenSSL and BSD-3-Clause
|
||||||
@ -11,10 +11,9 @@ Source1: https://www.openssl.org/source/old/1.1.1/openssl-%{openssl_versi
|
|||||||
|
|
||||||
Patch0: 0001-Solution_to_issue_ssl_library_is_not_supported.patch
|
Patch0: 0001-Solution_to_issue_ssl_library_is_not_supported.patch
|
||||||
Patch1: 0002-adapt-openssl-CVE.patch
|
Patch1: 0002-adapt-openssl-CVE.patch
|
||||||
Patch2: 0003-add-definition-for-FILE-variable.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc gcc-c++
|
BuildRequires: gcc gcc-c++
|
||||||
BuildRequires: libsgx-launch libsgx-urts sgxsdk perl openssl
|
BuildRequires: libsgx-launch libsgx-urts sgxsdk perl
|
||||||
|
|
||||||
Requires: glibc sgxsdk >= %{version}-%{release}
|
Requires: glibc sgxsdk >= %{version}-%{release}
|
||||||
|
|
||||||
@ -45,7 +44,6 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
%setup -q -D -T -n intel-sgx-ssl-lin_%{version}_%{openssl_version}
|
%setup -q -D -T -n intel-sgx-ssl-lin_%{version}_%{openssl_version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cp %{SOURCE1} openssl_source/
|
cp %{SOURCE1} openssl_source/
|
||||||
@ -67,12 +65,6 @@ cp License.txt $RPM_BUILD_ROOT/opt/intel/sgxssl/docs/
|
|||||||
/opt/intel/sgxssl/include/*
|
/opt/intel/sgxssl/include/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Mar 25 2024 yueyuankun <yueyuankun@kylinos.cn> - 2.19-3
|
|
||||||
- Add BuildRequires openssl
|
|
||||||
|
|
||||||
* Thu Aug 10 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-2
|
|
||||||
- Add definition for FILE variable
|
|
||||||
|
|
||||||
* Fri Jul 21 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-1
|
* Fri Jul 21 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-1
|
||||||
- Upgrade to 2.19
|
- Upgrade to 2.19
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user