X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fpatches%2Ffetchmail-6.3.26-permit-build-without-ssl3.patch;fp=src%2Fpatches%2Ffetchmail-6.3.26-permit-build-without-ssl3.patch;h=0000000000000000000000000000000000000000;hp=5f8b2772a86e68af60c9147a7a082bd91aad2483;hb=9a652ff69b29aa27a81989cf96730208fdcfab0b;hpb=d73709d8ee01b5e39f6f6ca85801c3c28c18414d

diff --git a/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch b/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
deleted file mode 100644
index 5f8b2772a8..0000000000
--- a/src/patches/fetchmail-6.3.26-permit-build-without-ssl3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc Mon Sep 17 00:00:00 2001
-From: Matthias Andree <matthias.andree@gmx.de>
-Date: Fri, 16 Jan 2015 20:48:46 +0100
-Subject: [PATCH] Permit build on SSLv3-disabled OpenSSL,
-
-providing that these also omit the declaration of SSLv3_client_method().
-Related to Debian Bug#775255.
-Version report lists -SSLv3 on +SSL builds that omit SSLv3_client_method().
-Version report lists -SSLv2 on +SSL builds that omit SSLv2_client_method().
-
-diff --git a/configure.ac b/configure.ac
-index bdcbb20..9248b26 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -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/fetchmail.c b/fetchmail.c
-index 5f31d6e..be0e9ab 100644
---- a/fetchmail.c
-+++ b/fetchmail.c
-@@ -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/socket.c b/socket.c
-index 58a8e15..91a21c2 100644
---- a/socket.c
-+++ b/socket.c
-@@ -910,11 +910,16 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
- #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)) {