CVS commit: pkgsrc/mail/heirloom-mailx

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Wed Jan 22 20:50:34 UTC 2020

Modified Files:
        pkgsrc/mail/heirloom-mailx: distinfo
        pkgsrc/mail/heirloom-mailx/patches: patch-openssl.c

Log Message:
Fix building against OpenSSL 1.1.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/heirloom-mailx/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/heirloom-mailx/distinfo
diff -u pkgsrc/mail/heirloom-mailx/distinfo:1.4 pkgsrc/mail/heirloom-mailx/distinfo:1.5
--- pkgsrc/mail/heirloom-mailx/distinfo:1.4     Tue Nov  3 23:27:06 2015
+++ pkgsrc/mail/heirloom-mailx/distinfo Wed Jan 22 20:50:34 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 23:27:06 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/01/22 20:50:34 sevan Exp $
 
 SHA1 (heirloom-mailx_12.5.orig.tar.gz) = 2fa7f300dea7747e5880d61fd691a103d70863ba
 RMD160 (heirloom-mailx_12.5.orig.tar.gz) = 9722c9ecd2cae6b2b47a598e5c32544c1320502f
@@ -12,5 +12,5 @@ SHA1 (patch-fio.c) = 0f850a28fb7c6d511af
 SHA1 (patch-getopt.c) = b238221ae17fdc7285febd1e9209ac9acac92069
 SHA1 (patch-mailx.1) = 070ae8af60dc22d0acc1c68caf66384ff390379e
 SHA1 (patch-names.c) = 5a7f4bd255f30a425114b5371430012079511d88
-SHA1 (patch-openssl.c) = 45160c726bc93382a2455c44947ca6c4cc9e8a12
+SHA1 (patch-openssl.c) = 5b221586d5159788b22bdcefb9918ab49719e91f
 SHA1 (patch-sendout.c) = 1270c454ec7956ef4c3c3f3f71e847928bbbd2e3

Index: pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c
diff -u pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.1 pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.2
--- pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.1      Sun Dec 28 14:16:14 2014
+++ pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c  Wed Jan 22 20:50:34 2020
@@ -1,18 +1,41 @@
-$NetBSD: patch-openssl.c,v 1.1 2014/12/28 14:16:14 bsiegert Exp $
+$NetBSD: patch-openssl.c,v 1.2 2020/01/22 20:50:34 sevan Exp $
 
-Imported Debian package fixes:
 - remove SSL2 support since it is no longer supported by OpenSSL.
+- fix build against modern OpenSSL
+  from https://github.com/maximeh/buildroot/commit/9f145e4957fa562ed8df89527433fccd438b3502
 
 --- openssl.c.orig     2011-04-26 21:23:22.000000000 +0000
 +++ openssl.c
-@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
+@@ -137,11 +137,13 @@ ssl_rand_init(void)
+ 
+       if ((cp = value("ssl-rand-egd")) != NULL) {
+               cp = expand(cp);
++#ifndef OPENSSL_NO_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,12 +218,15 @@ 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"))
++              #ifndef OPENSSL_NO_SSL3
 +              if (equal(cp, "ssl3"))
                        method = SSLv3_client_method();
                else if (equal(cp, "tls1"))
                        method = TLSv1_client_method();
++              #else
++              if (equal(cp, "tls1"))
++                      method = TLSv1_client_method();
++              #endif
+               else {
+                       fprintf(stderr, catgets(catd, CATSET, 244,
+                                       "Invalid SSL method \"%s\"\n"), cp);