From ef7056997482e88010025045d56fff1fed03669b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 22 Jul 2014 21:02:49 +0200 Subject: [PATCH] mailx: switch to libressl. --- srcpkgs/mailx/patches/libressl.patch | 27 +++++++++++++++++++++++++++ srcpkgs/mailx/template | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mailx/patches/libressl.patch diff --git a/srcpkgs/mailx/patches/libressl.patch b/srcpkgs/mailx/patches/libressl.patch new file mode 100644 index 00000000000..dd7eb512d8e --- /dev/null +++ b/srcpkgs/mailx/patches/libressl.patch @@ -0,0 +1,27 @@ +--- a/openssl.c.orig 2014-07-22 20:59:16.024655378 +0200 ++++ b/openssl.c 2014-07-22 21:00:45.754482770 +0200 +@@ -137,11 +137,13 @@ ssl_rand_init(void) + + if ((cp = value("ssl-rand-egd")) != NULL) { + cp = expand(cp); ++#ifdef HAVE_OPENSSL_RAND_EGD + if (RAND_egd(cp) == -1) { + fprintf(stderr, catgets(catd, CATSET, 245, + "entropy daemon at \"%s\" not available\n"), + cp); + } else ++#endif + state = 1; + } else if ((cp = value("ssl-rand-file")) != NULL) { + cp = expand(cp); +@@ -216,9 +218,7 @@ 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")) ++ if (equal(cp, "ssl3")) + method = SSLv3_client_method(); + else if (equal(cp, "tls1")) + method = TLSv1_client_method(); diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index c7e7c6141b2..22e8ccb9140 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -1,10 +1,10 @@ # Template file for 'mailx' pkgname=mailx version=12.5 -revision=5 +revision=6 patch_args="-Np1" wrksrc="mailx-${version}" -makedepends="openssl-devel mit-krb5-devel" +makedepends="libressl-devel mit-krb5-devel" conf_files="/etc/mail.rc" provides="mail-${version}" replaces="mail>=0"