commit a642b4d3715ca9316b615a464de94b9d91ec50db
parent 12df5439b812ce34f9f716f3e19f603ead296701
Author: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 18 Jan 2017 04:03:00 +0100
nail: fix build against OpenSSL with disabled SSLv3
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>
Diffstat:
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();
