openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

nail: fix build against OpenSSL with disabled SSLv3

Browse Source 
Extend the existing patch handling disabled SSLv2 to cover the SSLv3 case as
well in order to fix the following build error reported by the buildbot:

    openssl.o: In function `ssl_open':
    openssl.c:(.text+0xa1c): undefined reference to `SSLv3_client_method'
    collect2: error: ld returned 1 exit status

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2017-01-18 04:03:00 +01:00
parent 12df5439b8
commit a642b4d371
2 changed files with 9 additions and 3 deletions
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,