diff --git a/mailx-12.5-openssl-1.1.0f.patch b/mailx-12.5-openssl-1.1.0f.patch
new file mode 100644
index 0000000..979fef1
--- /dev/null
+++ b/mailx-12.5-openssl-1.1.0f.patch
@@ -0,0 +1,62 @@
+---
+ openssl.c |   29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+--- openssl.c
++++ openssl.c	2017-06-12 12:57:43.048652634 +0200
+@@ -138,7 +138,12 @@ ssl_rand_init(void)
+ 
+ 	if ((cp = value("ssl-rand-egd")) != NULL) {
+ 		cp = expand(cp);
+-		if (RAND_egd(cp) == -1) {
++#ifndef OPENSSL_NO_EGD
++		if (RAND_egd(cp) == -1)
++#else
++		if (1)
++#endif
++		{
+ 			fprintf(stderr, catgets(catd, CATSET, 245,
+ 				"entropy daemon at \"%s\" not available\n"),
+ 					cp);
+@@ -221,12 +226,13 @@ ssl_select_method(const char *uhp)
+ 
+ 	cp = ssl_method_string(uhp);
+ 	if (cp != NULL) {
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
+ #ifndef OPENSSL_NO_SSL2
+ 		if (equal(cp, "ssl2"))
+ 			method = SSLv2_client_method();
+ 		else
+-#endif 
+-            if (equal(cp, "ssl3"))
++#endif
++		if (equal(cp, "ssl3"))
+ 			method = SSLv3_client_method();
+ 		else if (equal(cp, "tls1"))
+ 			method = TLSv1_client_method();
+@@ -235,8 +241,25 @@ ssl_select_method(const char *uhp)
+ 					"Invalid SSL method \"%s\"\n"), cp);
+ 			method = SSLv23_client_method();
+ 		}
++#else
++		method = NULL;
++		if (equal(cp, "tls"))
++			method = TLS_client_method();
++		else if (equal(cp, "dtls"))
++			method = DTLS_client_method();
++
++		if (!method) {
++			fprintf(stderr, catgets(catd, CATSET, 244,
++					"Invalid SSL method \"%s\"\n"), cp);
++			method = TLS_client_method();
++		}
++#endif
+ 	} else
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
+ 		method = SSLv23_client_method();
++#else
++		method = TLS_client_method();
++#endif
+ 	return method;
+ }
+ 
diff --git a/mailx-12.5.dif b/mailx-12.5.dif
index b2b2716..37f75e5 100644
--- a/mailx-12.5.dif
+++ b/mailx-12.5.dif
@@ -1,13 +1,45 @@
---- .pkgextract
-+++ .pkgextract	2006-07-20 11:42:19.000000000 +0000
-@@ -0,0 +1,5 @@
-+patch -p 0 -s --suffix=".path"   < ../nail-11.25-path.dif
-+patch -p 0 -s --suffix=".rplyto" < ../mailx-12.1-replyto.patch
-+patch -p 0 -s --suffix=".ttychr" < ../nail-11.25-ttychar.dif
-+patch -p 0 -s --suffix=".toaddr" < ../nail-11.25-toaddr.dif
-+patch -p 0 -s --suffix=".mime"   < ../mailx-12.2-mime.dif
---- Makefile
-+++ Makefile	2007-04-17 10:12:49.000000000 +0000
+---
+ mailx-12.5/Makefile      |    3 +-
+ mailx-12.5/aux.c         |    1 
+ mailx-12.5/base64.c      |    1 
+ mailx-12.5/catd/en_US    |    7 ++++-
+ mailx-12.5/cmd1.c        |    1 
+ mailx-12.5/cmd2.c        |    1 
+ mailx-12.5/cmd3.c        |    1 
+ mailx-12.5/cmdtab.c      |    1 
+ mailx-12.5/collect.c     |    1 
+ mailx-12.5/dotlock.c     |    1 
+ mailx-12.5/edit.c        |    1 
+ mailx-12.5/fio.c         |    1 
+ mailx-12.5/getname.c     |    1 
+ mailx-12.5/head.c        |    1 
+ mailx-12.5/hmac.c        |    1 
+ mailx-12.5/imap.c        |    2 -
+ mailx-12.5/imap_gssapi.c |    2 +
+ mailx-12.5/lex.c         |    1 
+ mailx-12.5/list.c        |    1 
+ mailx-12.5/mail.rc       |    2 +
+ mailx-12.5/mailx.1       |    6 ++--
+ mailx-12.5/main.c        |   15 +++++++----
+ mailx-12.5/makeconfig    |   60 +++++++++++++++++++++++++++++++++--------------
+ mailx-12.5/md5.c         |    1 
+ mailx-12.5/mime.c        |    1 
+ mailx-12.5/names.c       |    1 
+ mailx-12.5/nsserr.c      |    1 
+ mailx-12.5/popen.c       |    1 
+ mailx-12.5/quit.c        |    1 
+ mailx-12.5/send.c        |    1 
+ mailx-12.5/sendout.c     |    1 
+ mailx-12.5/smtp.c        |    1 
+ mailx-12.5/strings.c     |    1 
+ mailx-12.5/temp.c        |    1 
+ mailx-12.5/tty.c         |    1 
+ mailx-12.5/v7.local.c    |    1 
+ mailx-12.5/vars.c        |    1 
+ 37 files changed, 98 insertions(+), 28 deletions(-)
+
+--- mailx-12.5/Makefile
++++ mailx-12.5/Makefile	2017-06-12 11:07:30.560182707 +0000
 @@ -10,6 +10,7 @@ PREFIX		= /usr/local
  BINDIR		= $(PREFIX)/bin
  MANDIR		= $(PREFIX)/share/man
@@ -16,7 +48,7 @@
  
  DESTDIR		=
  
-@@ -51,7 +52,7 @@ SHELL		= /bin/sh
+@@ -51,7 +52,7 @@ IPv6		= -DHAVE_IPv6_FUNCS
  #
  # Binaries are stripped with this command after installation.
  #
@@ -25,8 +57,8 @@
  
  ###########################################################################
  ###########################################################################
---- aux.c
-+++ aux.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/aux.c
++++ mailx-12.5/aux.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)aux.c	2.83 (
  #endif
  #endif /* not lint */
@@ -35,8 +67,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/stat.h>
---- base64.c
-+++ base64.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/base64.c
++++ mailx-12.5/base64.c	2017-06-12 11:07:30.560182707 +0000
 @@ -33,6 +33,7 @@ static char sccsid[] = "@(#)base64.c	2.1
   * base64 functions
   */
@@ -45,8 +77,28 @@
  #include "rcv.h"
  #include "extern.h"
  
---- cmd1.c
-+++ cmd1.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/catd/en_US
++++ mailx-12.5/catd/en_US	2017-06-12 11:07:30.568182567 +0000
+@@ -180,7 +180,10 @@ The following ~ escapes are defined:\n\
+ 132 No applicable messages\n
+ 133 %d: Inappropriate message\n
+ 134 Unknown metachar (%c)\n
+-135 Usage: %s -eiIUdFntBNHV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -b USERS -c USERS users\n
++135 $Usage: %s [-BDFintv~] [-s subject] [-a attachment ] [-c cc-addr] [-b bcc-addr]\n\
++             [-r from-addr] [-h hops] [-A account] [-R reply-addr] [-S option] to-addr ...\n\
++       %s [-BDeHiInNRv~] [-T name] [-A account] -f [name] [-S option]\n\
++       %s [-BDeinNRv~] [-A account] [-u user] [-S option]\n
+ 136 --- DELETED ---
+ 137 Cannot give -f and people to send to.\n
+ 138 Send options without primary recipient specified.\n
+@@ -314,3 +317,5 @@ The following ~ escapes are defined:\n\
+ 266 Ignoring header field "%s"\n
+ 267 Restoring deleted header lines\n
+ 268 Pipe to: "%s"\n
++269 The -R option is meaningless in send mode.\n
++270 The reply-to is meaningless not in send mode.\n
+--- mailx-12.5/cmd1.c
++++ mailx-12.5/cmd1.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmd1.c	2.97
  #endif
  #endif /* not lint */
@@ -55,8 +107,8 @@
  #include "rcv.h"
  #include "extern.h"
  #ifdef	HAVE_WCWIDTH
---- cmd2.c
-+++ cmd2.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/cmd2.c
++++ mailx-12.5/cmd2.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmd2.c	2.47
  #endif
  #endif /* not lint */
@@ -65,8 +117,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/wait.h>
---- cmd3.c
-+++ cmd3.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/cmd3.c
++++ mailx-12.5/cmd3.c	2017-06-12 11:07:30.560182707 +0000
 @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)cmd3.c	2.87
  
  #include <math.h>
@@ -75,8 +127,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <unistd.h>
---- cmdtab.c
-+++ cmdtab.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/cmdtab.c
++++ mailx-12.5/cmdtab.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmdtab.c	2.5
  #endif
  #endif /* not lint */
@@ -85,8 +137,8 @@
  #include "rcv.h"
  #include "extern.h"
  
---- collect.c
-+++ collect.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/collect.c
++++ mailx-12.5/collect.c	2017-06-12 11:07:30.560182707 +0000
 @@ -49,6 +49,7 @@ static char sccsid[] = "@(#)collect.c	2.
   * ~ escapes.
   */
@@ -95,8 +147,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <unistd.h>
---- dotlock.c
-+++ dotlock.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/dotlock.c
++++ mailx-12.5/dotlock.c	2017-06-12 11:07:30.560182707 +0000
 @@ -38,6 +38,7 @@ static char sccsid[] = "@(#)dotlock.c	2.
  #endif
  #endif
@@ -105,8 +157,8 @@
  #include "rcv.h"
  #include <sys/stat.h>
  #include <unistd.h>
---- edit.c
-+++ edit.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/edit.c
++++ mailx-12.5/edit.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)edit.c	2.24
  #endif
  #endif /* not lint */
@@ -115,8 +167,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/stat.h>
---- fio.c
-+++ fio.c	2014-12-11 09:34:19.233519754 +0000
+--- mailx-12.5/fio.c
++++ mailx-12.5/fio.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)fio.c	2.76 (
  #endif
  #endif /* not lint */
@@ -125,8 +177,8 @@
  #include "rcv.h"
  
  #ifndef HAVE_WORDEXP
---- getname.c
-+++ getname.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/getname.c
++++ mailx-12.5/getname.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)getname.c	2.
  #endif
  #endif /* not lint */
@@ -135,8 +187,8 @@
  #include "rcv.h"
  #include <pwd.h>
  #include "extern.h"
---- head.c
-+++ head.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/head.c
++++ mailx-12.5/head.c	2017-06-12 11:07:30.560182707 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)head.c	2.17
  #endif
  #endif /* not lint */
@@ -145,8 +197,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <time.h>
---- hmac.c
-+++ hmac.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/hmac.c
++++ mailx-12.5/hmac.c	2017-06-12 11:07:30.564182637 +0000
 @@ -32,6 +32,7 @@ Appendix -- Sample Code
  
  /*	Sccsid @(#)hmac.c	1.8 (gritter) 3/4/06	*/
@@ -155,8 +207,19 @@
  #include "rcv.h"
  #include "md5.h"
  
---- imap_gssapi.c
-+++ imap_gssapi.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/imap.c
++++ mailx-12.5/imap.c	2017-06-12 11:07:56.295730796 +0000
+@@ -3541,7 +3541,7 @@ imap_read_date(const char *cp)
+ const char *
+ imap_make_date_time(time_t t)
+ {
+-	static char	s[30];
++	static char	s[64];
+ 	struct tm	*tmptr;
+ 	int	tzdiff, tzdiff_hour, tzdiff_min;
+ 
+--- mailx-12.5/imap_gssapi.c
++++ mailx-12.5/imap_gssapi.c	2017-06-12 11:07:30.564182637 +0000
 @@ -73,6 +73,8 @@ static char sccsid[] = "@(#)imap_gssapi.
  #endif
  #endif /* not lint */
@@ -166,8 +229,8 @@
  /*
   * Implementation of IMAP GSSAPI authentication according to RFC 1731.
   */
---- lex.c
-+++ lex.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/lex.c
++++ mailx-12.5/lex.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)lex.c	2.86 (
  #endif
  #endif /* not lint */
@@ -176,8 +239,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <errno.h>
---- list.c
-+++ list.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/list.c
++++ mailx-12.5/list.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)list.c	2.62
  #endif
  #endif /* not lint */
@@ -186,13 +249,13 @@
  #include "rcv.h"
  #include <ctype.h>
  #include "extern.h"
---- mail.rc
-+++ mail.rc	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/mail.rc
++++ mailx-12.5/mail.rc	2017-06-12 11:07:30.564182637 +0000
 @@ -0,0 +1,2 @@
 +set asksub append dot save crt=20
 +ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via
---- mailx.1
-+++ mailx.1	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/mailx.1
++++ mailx-12.5/mailx.1	2017-06-12 11:07:30.564182637 +0000
 @@ -175,7 +175,7 @@ Only applicable in combination with
  .IR \-f .
  .TP
@@ -202,7 +265,7 @@
  This option should be activated for
  .I mailx
  scripts that are invoked on more than one machine,
-@@ -3097,7 +3097,7 @@ in the user's home directory.
+@@ -3111,7 +3111,7 @@ in the user's home directory.
  The name of an optional startup file
  to be read after ~/.mailrc.
  This variable is ignored if it is imported from the environment;
@@ -211,7 +274,7 @@
  to allow bypassing the configuration with e. g. `MAILRC=/dev/null'.
  Use this file for commands
  that are not understood by other mailx implementations.
-@@ -3674,7 +3674,7 @@ Used as directory for temporary files in
+@@ -3688,7 +3688,7 @@ Used as directory for temporary files in
  ~/.mailrc
  File giving initial commands.
  .TP
@@ -220,8 +283,8 @@
  System wide initialization file.
  .TP
  ~/.mime.types
---- main.c
-+++ main.c	2011-05-13 11:25:38.211926290 +0000
+--- mailx-12.5/main.c
++++ mailx-12.5/main.c	2017-06-12 11:07:30.564182637 +0000
 @@ -93,7 +93,7 @@ int
  main(int argc, char *argv[])
  {
@@ -261,8 +324,8 @@
  		goto usage;
  	}
  	if (Iflag && ef == NULL) {
---- makeconfig
-+++ makeconfig	2011-05-13 11:28:45.907925652 +0000
+--- mailx-12.5/makeconfig
++++ mailx-12.5/makeconfig	2017-06-12 11:07:30.564182637 +0000
 @@ -304,23 +304,49 @@ int main(void)
  			'for socket functionality in libsocket and libnsl' \
  			'#define HAVE_SOCKETS' '-lsocket -lnsl'
@@ -330,8 +393,8 @@
  
  link_check nss 'for Network Security Services (NSS)' '#define USE_SSL
  #define USE_NSS' '-lsmime3 -lnss3 -lssl3 -lnspr4 -lplc4' <<\! || \
---- md5.c
-+++ md5.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/md5.c
++++ mailx-12.5/md5.c	2017-06-12 11:07:30.564182637 +0000
 @@ -33,6 +33,7 @@ documentation and/or software.
  
  /*	Sccsid @(#)md5.c	1.8 (gritter) 3/4/06	*/
@@ -340,8 +403,8 @@
  #include "rcv.h"
  #include "md5.h"
  
---- mime.c
-+++ mime.c	2006-07-20 11:42:19.000000000 +0000
+--- mailx-12.5/mime.c
++++ mailx-12.5/mime.c	2017-06-12 11:07:30.564182637 +0000
 @@ -44,6 +44,7 @@ static char sccsid[]  = "@(#)mime.c	2.71
  #endif /* DOSCCS */
  #endif /* not lint */
@@ -350,8 +413,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <ctype.h>
---- names.c
-+++ names.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/names.c
++++ mailx-12.5/names.c	2017-06-12 11:07:30.564182637 +0000
 @@ -48,6 +48,7 @@ static char sccsid[] = "@(#)names.c	2.22
   * Handle name lists.
   */
@@ -360,8 +423,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/stat.h>
---- nsserr.c
-+++ nsserr.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/nsserr.c
++++ mailx-12.5/nsserr.c	2017-06-12 11:07:30.564182637 +0000
 @@ -29,6 +29,7 @@
  
  /*	"@(#)nsserr.c	1.3 (gritter) 3/4/06"	*/
@@ -370,8 +433,8 @@
  #include <sslerr.h>
  #include <secerr.h>
  
---- popen.c
-+++ popen.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/popen.c
++++ mailx-12.5/popen.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)popen.c	2.20
  #endif
  #endif /* not lint */
@@ -380,8 +443,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/stat.h>
---- quit.c
-+++ quit.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/quit.c
++++ mailx-12.5/quit.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)quit.c	2.30
  #endif
  #endif /* not lint */
@@ -390,8 +453,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <stdio.h>
---- send.c
-+++ send.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/send.c
++++ mailx-12.5/send.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)send.c	2.86
  #endif
  #endif /* not lint */
@@ -400,8 +463,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <time.h>
---- sendout.c
-+++ sendout.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/sendout.c
++++ mailx-12.5/sendout.c	2017-06-12 11:07:30.564182637 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)sendout.c	2.
  #endif
  #endif /* not lint */
@@ -410,8 +473,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <errno.h>
---- smtp.c
-+++ smtp.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/smtp.c
++++ mailx-12.5/smtp.c	2017-06-12 11:07:30.568182567 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)smtp.c	2.43
  #endif
  #endif /* not lint */
@@ -420,8 +483,8 @@
  #include "rcv.h"
  
  #include <sys/utsname.h>
---- strings.c
-+++ strings.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/strings.c
++++ mailx-12.5/strings.c	2017-06-12 11:07:30.568182567 +0000
 @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)strings.c	2.
   * loop each time, so they need not be freed.
   */
@@ -430,8 +493,8 @@
  #include "rcv.h"
  #include "extern.h"
  
---- temp.c
-+++ temp.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/temp.c
++++ mailx-12.5/temp.c	2017-06-12 11:07:30.568182567 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)temp.c	2.8 (
  #endif
  #endif /* not lint */
@@ -440,8 +503,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <errno.h>
---- tty.c
-+++ tty.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/tty.c
++++ mailx-12.5/tty.c	2017-06-12 11:07:30.568182567 +0000
 @@ -48,6 +48,7 @@ static char sccsid[] = "@(#)tty.c	2.29 (
   * Generally useful tty stuff.
   */
@@ -450,8 +513,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <errno.h>
---- v7.local.c
-+++ v7.local.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/v7.local.c
++++ mailx-12.5/v7.local.c	2017-06-12 11:07:30.568182567 +0000
 @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)v7.local.c	2
   * Local routines that are installation dependent.
   */
@@ -460,8 +523,8 @@
  #include "rcv.h"
  #include "extern.h"
  #include <sys/stat.h>
---- vars.c
-+++ vars.c	2006-07-20 11:42:22.000000000 +0000
+--- mailx-12.5/vars.c
++++ mailx-12.5/vars.c	2017-06-12 11:07:30.568182567 +0000
 @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)vars.c	2.12
  #endif
  #endif /* not lint */
@@ -470,23 +533,3 @@
  #include "rcv.h"
  #include "extern.h"
  
---- catd/en_US
-+++ catd/en_US	2006-07-20 12:48:28.000000000 +0000
-@@ -180,7 +180,10 @@ The following ~ escapes are defined:\n\
- 132 No applicable messages\n
- 133 %d: Inappropriate message\n
- 134 Unknown metachar (%c)\n
--135 Usage: %s -eiIUdFntBNHV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -b USERS -c USERS users\n
-+135 $Usage: %s [-BDFintv~] [-s subject] [-a attachment ] [-c cc-addr] [-b bcc-addr]\n\
-+             [-r from-addr] [-h hops] [-A account] [-R reply-addr] [-S option] to-addr ...\n\
-+       %s [-BDeHiInNRv~] [-T name] [-A account] -f [name] [-S option]\n\
-+       %s [-BDeinNRv~] [-A account] [-u user] [-S option]\n
- 136 --- DELETED ---
- 137 Cannot give -f and people to send to.\n
- 138 Send options without primary recipient specified.\n
-@@ -314,3 +317,5 @@ The following ~ escapes are defined:\n\
- 266 Ignoring header field "%s"\n
- 267 Restoring deleted header lines\n
- 268 Pipe to: "%s"\n
-+269 The -R option is meaningless in send mode.\n
-+270 The reply-to is meaningless not in send mode.\n
diff --git a/mailx.changes b/mailx.changes
index ac8772f..8f35066 100644
--- a/mailx.changes
+++ b/mailx.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 12 11:11:38 UTC 2017 - werner@suse.de
+
+- Add patch mailx-12.5-openssl-1.1.0f.patch
+  Avoid deprecated/unavailable openSSL client methods (boo#1042663)
+
 -------------------------------------------------------------------
 Sat Apr 29 18:56:02 UTC 2017 - bwiedemann@suse.com
 
diff --git a/mailx.spec b/mailx.spec
index 828421e..8970f29 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mailx
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,9 @@ BuildRequires:  krb5-devel
 BuildRequires:  man
 BuildRequires:  openssl-devel
 BuildRequires:  pcre
+BuildRequires:  pkg-config
 BuildRequires:  postfix
+BuildRequires:  pkgconfig(openssl)
 Url:            http://heirloom.sourceforge.net/mailx.html
 Provides:       mail
 Recommends:     smtp_daemon
@@ -51,6 +53,8 @@ Patch10:        0002-unpack-Disable-option-processing-for-email-addresses.patch
 Patch11:        0003-fio.c-Unconditionally-require-wordexp-support.patch
 #PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell command injection via crafted email addresses
 Patch12:        0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch
+#PATCH-FIX-SUSE: bsc#1042663 -- mailx fails to build with openssl-1.1
+Patch13:        mailx-12.5-openssl-1.1.0f.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -74,11 +78,12 @@ minor enhancements like the ability to set a "From:" address.
 %patch10 -p1 -b .0002
 %patch11 -p1 -b .0003
 %patch12 -p1 -b .0004
-%patch -p0 -b .0
+%patch13 -p0 -b .ssl11f
+%patch -p1 -b .0
 
 %build
     CC=gcc
-    CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN"
+    CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags openssl)"
     export CC CFLAGS
     $SHELL ./makeconfig
     make %{?jobs:-j%jobs} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS"