!4 fix build with openssl 3.0
From: @eaglegai Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
f13ee591c8
23
backport-mailx-12.5-no-SSLv3.patch
Normal file
23
backport-mailx-12.5-no-SSLv3.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff --git a/openssl.c b/openssl.c
|
||||
index 9d1eaf4..b5db2a8 100644
|
||||
--- a/openssl.c
|
||||
+++ b/openssl.c
|
||||
@@ -229,9 +229,16 @@ ssl_select_method(const char *uhp)
|
||||
"Unsupported SSL method \"%s\"\n"), cp);
|
||||
method = SSLv23_client_method();
|
||||
#endif
|
||||
- } else if (equal(cp, "ssl3"))
|
||||
+ } else if (equal(cp, "ssl3")) {
|
||||
+#ifndef OPENSSL_NO_SSL3_METHOD
|
||||
method = SSLv3_client_method();
|
||||
- else if (equal(cp, "tls1"))
|
||||
+#else
|
||||
+ /* no SSLv3 support */
|
||||
+ fprintf(stderr, catgets(catd, CATSET, 244,
|
||||
+ "Unsupported SSL method \"%s\"\n"), cp);
|
||||
+ method = SSLv23_client_method();
|
||||
+#endif
|
||||
+ } else if (equal(cp, "tls1"))
|
||||
method = TLSv1_client_method();
|
||||
else {
|
||||
fprintf(stderr, catgets(catd, CATSET, 244,
|
||||
@ -1,6 +1,6 @@
|
||||
Name: mailx
|
||||
Version: 12.5
|
||||
Release: 33
|
||||
Release: 34
|
||||
License: BSD with advertising and MPLv1.1
|
||||
Summary: Enhanced implementation of the mailx command
|
||||
URL: http://heirloom.sourceforge.net/mailx.html
|
||||
@ -27,6 +27,7 @@ Patch11: mailx-12.5-empty-from.patch
|
||||
Patch12: mailx-12.5-nss-hostname-matching.patch
|
||||
Patch13: mailx-12.5-encsplit.patch
|
||||
Patch14: mailx-12.5-openssl.patch
|
||||
Patch15: backport-mailx-12.5-no-SSLv3.patch
|
||||
Patch9000: set-mail-defualt-did-not-record-failsend.patch
|
||||
|
||||
BuildRequires: gcc openssl-devel
|
||||
@ -106,6 +107,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 02 2023 gaihuiying <eaglegai@163.com> - 12.5-34
|
||||
- DESC:fix build with openssl 3.0
|
||||
|
||||
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 12.5-33
|
||||
- DESC: delete -S git from %autosetup, and delete BuildRequires git
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user