Merge pull request #3871 from jow-/nail-fix-build

nail: fix build against OpenSSL with disabled SSLv3
2017-01-23 07:13:38 +02:00 · 2017-01-23 07:13:38 +02:00 · 1d1804a16f
commit 1d1804a16f
parent e88560ee49 a642b4d371
2 changed files with 9 additions and 3 deletions
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=nail
 PKG_VERSION:=12.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-2-Clause

 PKG_SOURCE:=heirloom-mailx_$(PKG_VERSION).orig.tar.gz
--- a/mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
+++ b/mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
@ -1,6 +1,6 @@
 --- a/openssl.c
 +++ b/openssl.c
-@@ -216,9 +216,12 @@ ssl_select_method(const char *uhp)
+@@ -216,11 +216,17 @@ ssl_select_method(const char *uhp)
 
 	cp = ssl_method_string(uhp);
 	if (cp != NULL) {
@ -10,7 +10,13 @@
 -		else if (equal(cp, "ssl3"))
 +		else
 +#endif
+#ifndef OPENSSL_NO_SSL3
 +		if (equal(cp, "ssl3"))
 			method = SSLv3_client_method();
- 		else if (equal(cp, "tls1"))
+-		else if (equal(cp, "tls1"))
+		else
+#endif
+		if (equal(cp, "tls1"))
 			method = TLSv1_client_method();
+ 		else {
+ 			fprintf(stderr, catgets(catd, CATSET, 244,