Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
nail: fix build against OpenSSL with disabled SSLv3
This commit is contained in:
Hannu Nyman 2017-01-23 07:13:38 +02:00 committed by GitHub
commit 1d1804a16f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/nail/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nail PKG_NAME:=nail
PKG_VERSION:=12.5 PKG_VERSION:=12.5
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
PKG_SOURCE:=heirloom-mailx_$(PKG_VERSION).orig.tar.gz PKG_SOURCE:=heirloom-mailx_$(PKG_VERSION).orig.tar.gz

10
mail/nail/patches/100-handle-openssl-without-sslv2.patch → mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
View file

@ -1,6 +1,6 @@
--- a/openssl.c --- a/openssl.c
+++ b/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); cp = ssl_method_string(uhp);
if (cp != NULL) { if (cp != NULL) {
@ -10,7 +10,13 @@
- else if (equal(cp, "ssl3")) - else if (equal(cp, "ssl3"))
+ else + else
+#endif +#endif
+#ifndef OPENSSL_NO_SSL3
+ if (equal(cp, "ssl3")) + if (equal(cp, "ssl3"))
method = SSLv3_client_method(); method = SSLv3_client_method();
else if (equal(cp, "tls1")) - else if (equal(cp, "tls1"))
+ else
+#endif
+ if (equal(cp, "tls1"))
method = TLSv1_client_method(); method = TLSv1_client_method();
else {
fprintf(stderr, catgets(catd, CATSET, 244,