diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-03-22 21:34:59 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-03-28 10:37:05 +0100 |
| commit | 6d5939af2ce095a46491c8360cc32ee5bbaa44f0 (patch) | |
| tree | 84a89a3ed2e237e84a89f7d1c702a14b45ee0c1e /package/fetchmail/0002-enable-libressl.patch | |
| parent | 55893e0cbefb03cf667190fbb40f3ce9bf3c08be (diff) | |
| download | buildroot-6d5939af2ce095a46491c8360cc32ee5bbaa44f0.tar.gz buildroot-6d5939af2ce095a46491c8360cc32ee5bbaa44f0.zip | |
package/fetchmail: use pkg-config to find openssl
openssl can have multiples dependencies such as libatomic on sparcv8
32 bits so drop first patch and add a new patch to use pkg-config
Fixes:
- http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 3aa3a72b45238c4cf240b947531d253a53a46d35)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/fetchmail/0002-enable-libressl.patch')
| -rw-r--r-- | package/fetchmail/0002-enable-libressl.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/package/fetchmail/0002-enable-libressl.patch b/package/fetchmail/0002-enable-libressl.patch deleted file mode 100644 index a98e19dda4..0000000000 --- a/package/fetchmail/0002-enable-libressl.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fetched from upstream git and tweaked for the release: -https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura fetchmail-6.3.26.orig/config.h.in fetchmail-6.3.26/config.h.in ---- fetchmail-6.3.26.orig/config.h.in 2015-12-30 10:44:33.467746835 -0300 -+++ fetchmail-6.3.26/config.h.in 2015-12-30 10:45:50.271403589 -0300 -@@ -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 -Nura fetchmail-6.3.26.orig/configure.ac fetchmail-6.3.26/configure.ac ---- fetchmail-6.3.26.orig/configure.ac 2015-12-30 10:44:33.465746766 -0300 -+++ fetchmail-6.3.26/configure.ac 2015-12-30 10:46:03.708868409 -0300 -@@ -803,6 +803,7 @@ - - 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 -Nura fetchmail-6.3.26.orig/fetchmail.c fetchmail-6.3.26/fetchmail.c ---- fetchmail-6.3.26.orig/fetchmail.c 2015-12-30 10:44:33.469746904 -0300 -+++ fetchmail-6.3.26/fetchmail.c 2015-12-30 10:46:03.708868409 -0300 -@@ -263,6 +263,12 @@ - #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 -Nura fetchmail-6.3.26.orig/socket.c fetchmail-6.3.26/socket.c ---- fetchmail-6.3.26.orig/socket.c 2015-12-30 10:44:33.464746731 -0300 -+++ fetchmail-6.3.26/socket.c 2015-12-30 10:46:03.709868443 -0300 -@@ -910,11 +910,16 @@ - #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)) { |
