[packages/mailx] - rel 7; fix openssl 1.1.1 build

[arekm]

commit 212353cb2b04833a84b4e6ee799af128787ef1de
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Sep 18 13:53:05 2018 +0200

    - rel 7; fix openssl 1.1.1 build

 mailx.spec    |  4 +++-
 openssl.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/mailx.spec b/mailx.spec
index 645bd77..3d9f6b6 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -6,7 +6,7 @@ Summary:	An enhanced implementation of the mailx command
 Summary(pl.UTF-8):	Rozszerzona implementacja komendy mailx
 Name:		mailx
 Version:	12.4
-Release:	6
+Release:	7
 License:	BSD
 Group:		Applications/Mail
 Source0:	http://downloads.sourceforge.net/heirloom/%{name}-%{version}.tar.bz2
@@ -17,6 +17,7 @@ Patch2:		%{name}-openssl-nss.patch
 Patch3:		%{name}-openssl.patch
 Patch4:		%{name}-ipv6.patch
 Patch5:		%{name}-pager.patch
+Patch6:		openssl.patch
 URL:		http://heirloom.sourceforge.net/mailx.html
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -47,6 +48,7 @@ IMAP, wątkowanie wiadomości, punktacja i filtrowanie.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{!?with_kerberos5:sed -i -e 's#gssapi.h#puke.h#g' makeconfig}
 
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..ab7bf7a
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,33 @@
+--- mailx-12.4/openssl.c.org	2018-09-18 13:51:03.719475154 +0200
++++ mailx-12.4/openssl.c	2018-09-18 13:51:51.200881150 +0200
+@@ -134,16 +134,7 @@ ssl_rand_init(void)
+ {
+ 	char *cp;
+ 	int state = 0;
+-
+-	if ((cp = value("ssl-rand-egd")) != NULL) {
+-		cp = expand(cp);
+-		if (RAND_egd(cp) == -1) {
+-			fprintf(stderr, catgets(catd, CATSET, 245,
+-				"entropy daemon at \"%s\" not available\n"),
+-					cp);
+-		} else
+-			state = 1;
+-	} else if ((cp = value("ssl-rand-file")) != NULL) {
++	if ((cp = value("ssl-rand-file")) != NULL) {
+ 		cp = expand(cp);
+ 		if (RAND_load_file(cp, 1024) == -1) {
+ 			fprintf(stderr, catgets(catd, CATSET, 246,
+@@ -216,10 +207,8 @@ ssl_select_method(const char *uhp)
+ 
+ 	cp = ssl_method_string(uhp);
+ 	if (cp != NULL) {
+-		if (equal(cp, "ssl2"))
+-			method = SSLv2_client_method();
+-		else if (equal(cp, "ssl3"))
+-			method = SSLv3_client_method();
++		if (equal(cp, "ssl3"))
++			method = SSLv23_client_method();
+ 		else if (equal(cp, "tls1"))
+ 			method = TLSv1_client_method();
+ 		else {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mailx.git/commitdiff/212353cb2b04833a84b4e6ee799af128787ef1de