diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 23:02:24 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:51:40 +0000 |
commit | 5d98836cfb94176c7a50d0836ad8f0c153364063 (patch) | |
tree | 8ba785d89f7c2223ded0186943dda61523813bad /external/neon/neon_with_gnutls.patch | |
parent | f1a99d2d22f8284ea09a2db0c0d3ee15b337a359 (diff) |
fdo#70393: move neon to a subdir of external
Change-Id: I504b69437ca2849a9bf825c67e52a671ec1e1ad8
Reviewed-on: https://gerrit.libreoffice.org/6348
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/neon/neon_with_gnutls.patch')
-rw-r--r-- | external/neon/neon_with_gnutls.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/external/neon/neon_with_gnutls.patch b/external/neon/neon_with_gnutls.patch new file mode 100644 index 000000000000..ed8b7faadebf --- /dev/null +++ b/external/neon/neon_with_gnutls.patch @@ -0,0 +1,29 @@ +--- src/ne_gnutls.c 2009-12-02 23:40:41.000000000 +0200 ++++ src/ne_gnutls.c 2013-03-29 13:41:00.429857276 +0200 +@@ -48,6 +48,26 @@ + #include <iconv.h> + #endif + ++ ++/* GnuTLS removed these symbols from 2.99.0. ++ * ++ * This is a dodgy solution to avoid further patching of neon ++ * sources */ ++#if LIBGNUTLS_VERSION_NUMBER >= 0x026300 ++# define gnutls_pkcs12 gnutls_pkcs12_t ++# define gnutls_pkcs12_bag gnutls_pkcs12_bag_t ++# define gnutls_pkcs12_bag_type gnutls_pkcs12_bag_type_t ++# define gnutls_certificate_verify_peers(_ssl) ({ \ ++ int __status_ ## __LINE__ = 0; \ ++ gnutls_certificate_verify_peers2((_ssl), &__status_ ## __LINE__) == 0 \ ++ ? __status_ ## __LINE__ : -1; \ ++ }) ++#elif LIBGNUTLS_VERSION_NUMBER >= 0x020303 ++/* GnuTLS had these symbols since 2.3.3. */ ++# define HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS ++#endif /* LIBGNUTLS_VERSION_NUMBER */ ++ ++ + #include "ne_ssl.h" + #include "ne_string.h" + #include "ne_session.h" |