lede-packages-rs

commit 1d1804a16fe6b9521e6e94c921fb7a2ac5f209ec
parent e88560ee4981357147df1b40f862c332bea7187c
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Mon, 23 Jan 2017 07:13:38 +0200

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

nail: fix build against OpenSSL with disabled SSLv3
Diffstat:
M
mail/nail/Makefile
 | 
2
+-
A
mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
 | 
22
++++++++++++++++++++++
D
mail/nail/patches/100-handle-openssl-without-sslv2.patch
 | 
16
----------------

3 files changed, 23 insertions(+), 17 deletions(-)
diff --git 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
diff --git a/mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch b/mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
@@ -0,0 +1,22 @@
+--- a/openssl.c
++++ b/openssl.c
+@@ -216,11 +216,17 @@ ssl_select_method(const char *uhp)
+ 
+ 	cp = ssl_method_string(uhp);
+ 	if (cp != NULL) {
++#ifndef OPENSSL_NO_SSL2
+ 		if (equal(cp, "ssl2"))
+ 			method = SSLv2_client_method();
+-		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
++#endif
++		if (equal(cp, "tls1"))
+ 			method = TLSv1_client_method();
+ 		else {
+ 			fprintf(stderr, catgets(catd, CATSET, 244,
diff --git a/mail/nail/patches/100-handle-openssl-without-sslv2.patch b/mail/nail/patches/100-handle-openssl-without-sslv2.patch
@@ -1,16 +0,0 @@
---- a/openssl.c
-+++ b/openssl.c
-@@ -216,9 +216,12 @@ ssl_select_method(const char *uhp)
- 
- 	cp = ssl_method_string(uhp);
- 	if (cp != NULL) {
-+#ifndef OPENSSL_NO_SSL2
- 		if (equal(cp, "ssl2"))
- 			method = SSLv2_client_method();
--		else if (equal(cp, "ssl3"))
-+		else
-+#endif
-+		if (equal(cp, "ssl3"))
- 			method = SSLv3_client_method();
- 		else if (equal(cp, "tls1"))
- 			method = TLSv1_client_method();