cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases 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
parent e88560ee49 a642b4d371
commit 1d1804a16f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/nail/Makefile
+1 -1
View File
@@ -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
mail/nail/patches/100-handle-openssl-without-sslv2.patch → mail/nail/patches/100-handle-openssl-without-sslv2-sslv3.patch
+8 -2
View File
@@ -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,