external/neon/neon_with_gnutls.patch

   1 --- src/ne_gnutls.c     2009-12-02 23:40:41.000000000 +0200
   2 +++ src/ne_gnutls.c     2013-03-29 13:41:00.429857276 +0200
   3 @@ -48,6 +48,26 @@
   4  #include <iconv.h>
   5  #endif
   6
   7 +
   8 +/* GnuTLS removed these symbols from 2.99.0.
   9 + *
  10 + * This is a dodgy solution to avoid further patching of neon
  11 + * sources */
  12 +#if LIBGNUTLS_VERSION_NUMBER >= 0x026300
  13 +# define gnutls_pkcs12          gnutls_pkcs12_t
  14 +# define gnutls_pkcs12_bag      gnutls_pkcs12_bag_t
  15 +# define gnutls_pkcs12_bag_type gnutls_pkcs12_bag_type_t
  16 +# define gnutls_certificate_verify_peers(_ssl) ({ \
  17 +    int __status_ ## __LINE__ = 0; \
  18 +    gnutls_certificate_verify_peers2((_ssl), &__status_ ## __LINE__) == 0 \
  19 +        ? __status_ ## __LINE__ : -1; \
  20 +  })
  21 +#elif LIBGNUTLS_VERSION_NUMBER >= 0x020303
  22 +/* GnuTLS had these symbols since 2.3.3. */
  23 +# define HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS
  24 +#endif /* LIBGNUTLS_VERSION_NUMBER */
  25 +
  26 +
  27  #include "ne_ssl.h"
  28  #include "ne_string.h"
  29  #include "ne_session.h"