fdm: Update to 2.0

Removed upstream patches.

Fixed up Makefile slightly as configure bugs seem to have been solved.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-02-18 13:08:42 -08:00
parent 9c82fc1136
commit f1a01790ac
5 changed files with 21 additions and 439 deletions
@@ -1,4 +1,4 @@
From f6c656c5c0368b2fb4284af0484c3bedfc7ae42c Mon Sep 17 00:00:00 2001
From 3aa079c4885d89257c5033b4992011511b603150 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 26 Jun 2018 14:14:34 -0700
Subject: [PATCH] Fix compile with OpenSSL 1.1.0
@@ -6,23 +6,20 @@ Subject: [PATCH] Fix compile with OpenSSL 1.1.0
OpenSSL 1.1.0 deprecared SSL_library_init and SSL_load_error_strings.
They're part of OPENSSL_init_ssl now.
---
fdm.c | 5 +++++
1 file changed, 5 insertions(+)
fdm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fdm.c b/fdm.c
index cdf8383..9355b91 100644
index cdf8383..6721bbd 100644
--- a/fdm.c
+++ b/fdm.c
@@ -717,8 +717,13 @@ retry:
@@ -717,8 +717,10 @@ retry:
}
conf.lock_file = lock;
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
SSL_load_error_strings();
+#else
+ OPENSSL_init_ssl(0, NULL);
+#endif
/* Filter account list. */