From eff3ee6245b9f03268baccd0061b49b2de5b6cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Fri, 21 May 2021 20:03:42 +0200
Subject: [PATCH] Handle missing SSLv3 support - resolves: #1952949

---
 mailx-12.5-no-SSLv3.patch | 23 +++++++++++++++++++++++
 mailx.spec                |  9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 mailx-12.5-no-SSLv3.patch

diff --git a/mailx-12.5-no-SSLv3.patch b/mailx-12.5-no-SSLv3.patch
new file mode 100644
index 0000000..775df6d
--- /dev/null
+++ b/mailx-12.5-no-SSLv3.patch
@@ -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,
diff --git a/mailx.spec b/mailx.spec
index a6f5549..b6c4524 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.5
-Release: 38%{?dist}
+Release: 39%{?dist}
 # MPLv1.1 .. nss.c, nsserr.c
 License: BSD with advertising and MPLv1.1
 URL: http://heirloom.sourceforge.net/mailx.html
@@ -38,6 +38,8 @@ Patch12: mailx-12.5-nss-hostname-matching.patch
 Patch13: mailx-12.5-encsplit.patch
 # fix issues with openssl >= 1.1.0
 Patch14: mailx-12.5-openssl.patch
+# handle missing SSLv3 support
+Patch15: mailx-12.5-no-SSLv3.patch
 
 BuildRequires: make
 BuildRequires: gcc
@@ -95,6 +97,7 @@ as well as "nail" (the initial name of this project).
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1
 
 
@@ -198,6 +201,10 @@ fi
 
 
 %changelog
+* Fri May 21 2021 Nikola Forró <nforro@redhat.com> - 12.5-39
+- Handle missing SSLv3 support
+- resolves: #1952949
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 12.5-38
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937