$ git show --format=fuller --patch-with-stat --summary a2037dae51aaba7c530ba928d6449d9c54512151
commit a2037dae51aaba7c530ba928d6449d9c54512151
Author: tpgxyz <tpgxyz@gmail.com>
AuthorDate: Thu Oct 1 17:57:48 2020 +0200
Commit: tpgxyz <tpgxyz@gmail.com>
CommitDate: Thu Oct 1 17:57:48 2020 +0200
add patch from Fedora
---
mailx-12.5-openssl.patch | 41 +++++++++++++++++++++++++++++++++++++++++
nail.spec | 4 ++++
2 files changed, 45 insertions(+)
create mode 100644 mailx-12.5-openssl.patch
diff --git a/mailx-12.5-openssl.patch b/mailx-12.5-openssl.patch
new file mode 100644
index 0000000..210890b
--- /dev/null
+++ b/mailx-12.5-openssl.patch
@@ -0,0 +1,41 @@
+diff --git a/openssl.c b/openssl.c
+index b4e33fc..9d1eaf4 100644
+--- a/openssl.c
++++ b/openssl.c
+@@ -136,6 +136,7 @@ ssl_rand_init(void)
+ int state = 0;
+
+ if ((cp = value("ssl-rand-egd")) != NULL) {
++#ifndef OPENSSL_NO_EGD
+ cp = expand(cp);
+ if (RAND_egd(cp) == -1) {
+ fprintf(stderr, catgets(catd, CATSET, 245,
+@@ -143,6 +144,9 @@ ssl_rand_init(void)
+ cp);
+ } else
+ state = 1;
++#else
++ fprintf(stderr, "entropy daemon not available\n");
++#endif
+ } else if ((cp = value("ssl-rand-file")) != NULL) {
+ cp = expand(cp);
+ if (RAND_load_file(cp, 1024) == -1) {
+@@ -216,9 +220,16 @@ ssl_select_method(const char *uhp)
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
+- if (equal(cp, "ssl2"))
++ if (equal(cp, "ssl2")) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ method = SSLv2_client_method();
+- else if (equal(cp, "ssl3"))
++#else
++ /* SSLv2 support was removed in OpenSSL 1.1.0 */
++ fprintf(stderr, catgets(catd, CATSET, 244,
++ "Unsupported SSL method \"%s\"\n"), cp);
++ method = SSLv23_client_method();
++#endif
++ } else if (equal(cp, "ssl3"))
+ method = SSLv3_client_method();
+ else if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
diff --git a/nail.spec b/nail.spec
index 697b15d..d6390b0 100644
--- a/nail.spec
+++ b/nail.spec
@@ -1,3 +1,5 @@
+%global debug_package %nil
+
Summary: A MIME capable implementation of the mailx command
Name: nail
Version: 12.4
@@ -21,6 +23,7 @@ Patch8: 0003-fio.c-Unconditionally-require-wordexp-support.patch
Patch9: 0004-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
Patch10: nail-12.4-no-sslv2.patch
Patch11: nail-2.4-openssl11.patch
+Patch12: https://src.fedoraproject.org/rpms/mailx/raw/master/f/mailx-12.5-openssl.patch
BuildRequires: pkgconfig(openssl)
Provides: mailx = %{EVRD}
Obsoletes: mailx < %{EVRD}
@@ -45,6 +48,7 @@ renamed to Mailx.
%patch4 -p1 -b .optopt~
%patch5 -p1 -b .openssl~
%patch6 -p1 -b .openssl11~
+%patch12 -p1
# (tpg) adapt to OpenSSL3
grep -rl "SSLv2_client_method" * | xargs sed -i 's/SSLv2_client_method/TLS_client_method/g'