From d4148ae4d2e85148031b66eae8f8a810bd467685 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Sun, 6 Jan 2019 07:21:24 +0000 Subject: mail/fetchmail: backport less-old TLS support from Fedora Allows options like 'sslproto "TLS1.2+"', for example. PR: 233247 Submitted by: Corey Halpin (maintainer) Approved by: koobs --- mail/fetchmail/files/patch-fetchmail.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'mail/fetchmail/files/patch-fetchmail.c') diff --git a/mail/fetchmail/files/patch-fetchmail.c b/mail/fetchmail/files/patch-fetchmail.c index 03e505d44120..5e0b18eee2fa 100644 --- a/mail/fetchmail/files/patch-fetchmail.c +++ b/mail/fetchmail/files/patch-fetchmail.c @@ -1,5 +1,5 @@ ---- fetchmail.c.orig 2013-04-23 20:00:45 UTC -+++ fetchmail.c +--- fetchmail.c.orig 2018-12-30 11:43:19.032822000 -0600 ++++ fetchmail.c 2018-12-30 12:51:55.552234000 -0600 @@ -50,6 +50,10 @@ #include #include @@ -11,16 +11,16 @@ #ifndef ENETUNREACH #define ENETUNREACH 128 /* Interactive doesn't know this */ #endif /* ENETUNREACH */ -@@ -263,6 +267,12 @@ int main(int argc, char **argv) +@@ -263,10 +267,10 @@ #ifdef SSL_ENABLE "+SSL" #endif -+#ifdef OPENSSL_NO_SSL2 -+ "-SSLv2" -+#endif -+#ifdef OPENSSL_NO_SSL3_METHOD -+ "-SSLv3" -+#endif +-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 ++#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0) && !defined(OPENSSL_NO_SSL2) + "-SSLv2" + #endif +-#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 ++#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) && !defined(OPENSSL_NO_SSL3_METHOD) + "-SSLv3" + #endif #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ -- cgit v1.2.3