5 files changed, 58 insertions, 12 deletions
diff --git a/package/fetchmail/patches/patch-config_h_in b/package/fetchmail/patches/patch-config_h_in
new file mode 100644
index 000000000..ec8b9c74e
--- /dev/null
+++ b/package/fetchmail/patches/patch-config_h_in
@@ -0,0 +1,13 @@
+--- fetchmail-6.3.26.orig/config.h.in	2013-04-23 23:36:55.000000000 +0200
++++ fetchmail-6.3.26/config.h.in	2016-09-29 16:00:20.679625413 +0200
+@@ -53,6 +53,10 @@
+    if you don't. */
+ #undef HAVE_DECL_SSLV2_CLIENT_METHOD
+ 
++/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0
++   if you don't. */
++#undef HAVE_DECL_SSLV3_CLIENT_METHOD
++
+ /* Define to 1 if you have the declaration of `strerror', and to 0 if you
+    don't. */
+ #undef HAVE_DECL_STRERROR
diff --git a/package/fetchmail/patches/patch-configure b/package/fetchmail/patches/patch-configure
deleted file mode 100644
index e5dc5ce44..000000000
--- a/package/fetchmail/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- fetchmail-6.3.9.orig/configure	2008-11-16 15:18:49.000000000 +0100
-+++ fetchmail-6.3.9/configure	2009-06-12 22:27:25.000000000 +0200
-@@ -13176,9 +13176,6 @@ then
-     { echo "$as_me:$LINENO: Enabling OpenSSL support in $with_ssl." >&5
- echo "$as_me: Enabling OpenSSL support in $with_ssl." >&6;}
-     test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include"
--    ### In Red Hat 9, this file includes a reference to <krb5.h>, so we
--    ### force the Kerberos direcory onto the include path so it will build.
--    CFLAGS="$CFLAGS -I/usr/kerberos/include"
-     ###	OpenBSD comes with ssl headers
-   else
-     { { echo "$as_me:$LINENO: error: SSL support enabled, but OpenSSL not found" >&5
diff --git a/package/fetchmail/patches/patch-configure_ac b/package/fetchmail/patches/patch-configure_ac
new file mode 100644
index 000000000..7126bbc5f
--- /dev/null
+++ b/package/fetchmail/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- fetchmail-6.3.26.orig/configure.ac	2013-04-23 22:51:10.000000000 +0200
++++ fetchmail-6.3.26/configure.ac	2016-09-29 16:00:20.683625569 +0200
+@@ -803,6 +803,7 @@ fi
+ 
+ case "$LIBS" in *-lssl*)
+ 	AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
++	AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
+ 	;;
+ esac
+ 
diff --git a/package/fetchmail/patches/patch-fetchmail_c b/package/fetchmail/patches/patch-fetchmail_c
new file mode 100644
index 000000000..160afa85d
--- /dev/null
+++ b/package/fetchmail/patches/patch-fetchmail_c
@@ -0,0 +1,15 @@
+--- fetchmail-6.3.26.orig/fetchmail.c	2013-04-23 22:00:45.000000000 +0200
++++ fetchmail-6.3.26/fetchmail.c	2016-09-29 16:00:20.683625569 +0200
+@@ -263,6 +263,12 @@ int main(int argc, char **argv)
+ #ifdef SSL_ENABLE
+ 	"+SSL"
+ #endif
++#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0
++	"-SSLv2"
++#endif
++#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0
++	"-SSLv3"
++#endif
+ #ifdef OPIE_ENABLE
+ 	"+OPIE"
+ #endif /* OPIE_ENABLE */
diff --git a/package/fetchmail/patches/patch-socket_c b/package/fetchmail/patches/patch-socket_c
new file mode 100644
index 000000000..54f6ff27a
--- /dev/null
+++ b/package/fetchmail/patches/patch-socket_c
@@ -0,0 +1,20 @@
+--- fetchmail-6.3.26.orig/socket.c	2013-04-23 22:00:45.000000000 +0200
++++ fetchmail-6.3.26/socket.c	2016-09-29 16:00:20.683625569 +0200
+@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char
+ #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
+ 			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
+ #else
+-			report(stderr, GT_("Your operating system does not support SSLv2.\n"));
++			report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
+ 			return -1;
+ #endif
+ 		} else if(!strcasecmp("ssl3",myproto)) {
++#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0
+ 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
++#else
++			report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
++			return -1;
++#endif
+ 		} else if(!strcasecmp("tls1",myproto)) {
+ 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
+ 		} else if (!strcasecmp("ssl23",myproto)) {