diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 09:52:51 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-08 16:15:36 +0000 |
| commit | 83dd8050ebbbddbd5573b76e3f848df1f411ee1f (patch) | |
| tree | be1e5e4441213357f0c708641713be207d17cf1e /external | |
| parent | 463cee91dcb503190d9209870367592bac993404 (diff) | |
upgrade neon to 0.30.1
Reviewed-on: https://gerrit.libreoffice.org/22977
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1827987fd11cd726005977e49d001283033f0419)
Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30
Reviewed-on: https://gerrit.libreoffice.org/22998
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/neon/neon.patch | 47 | ||||
| -rw-r--r-- | external/neon/neon_ne_set_request_flag.patch | 6 |
2 files changed, 6 insertions, 47 deletions
diff --git a/external/neon/neon.patch b/external/neon/neon.patch index de52043d3dc1..5abc3c91078c 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -319,51 +319,10 @@ /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU, /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, ---- src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ src/ne_utils.c 2011-02-03 10:26:21.000000000 +0100 -@@ -118,6 +118,9 @@ - #ifdef HAVE_GNUTLS - ", GNU TLS " LIBGNUTLS_VERSION - #endif /* HAVE_GNUTLS */ -+#ifdef HAVE_SSPI -+ ", SSPI" -+#endif /* HAVE_SSPI */ - "." - ; - -@@ -137,7 +140,7 @@ - switch (feature) { - #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \ - || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \ -- || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) -+ || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI) - #ifdef NE_HAVE_SSL - case NE_FEATURE_SSL: - #endif -@@ -159,6 +162,9 @@ - #ifdef NE_HAVE_I18N - case NE_FEATURE_I18N: - #endif -+#ifdef HAVE_SSPI -+ case NE_FEATURE_SSPI: -+#endif - return 1; - #endif /* NE_HAVE_* */ - default: ---- src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ src/ne_utils.h 2011-02-03 10:26:21.000000000 +0100 -@@ -54,6 +54,7 @@ - #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ - #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ - #define NE_FEATURE_I18N (7) /* i18n error message support */ -+#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */ - - /* Returns non-zero if library is built with support for the given - * NE_FEATURE_* feature code 'code'. */ --- src/ne_openssl.c +++ src/ne_openssl.c -@@ -41,6 +41,13 @@ - #include <pthread.h> +@@ -43,6 +43,13 @@ + #endif #endif +#ifdef WIN32 @@ -376,7 +335,7 @@ #include "ne_ssl.h" #include "ne_string.h" #include "ne_session.h" -@@ -798,6 +798,31 @@ +@@ -798,6 +805,31 @@ X509_STORE_load_locations(store, NE_SSL_CA_BUNDLE, NULL); #else X509_STORE_set_default_paths(store); diff --git a/external/neon/neon_ne_set_request_flag.patch b/external/neon/neon_ne_set_request_flag.patch index 3bcafd62fee6..5189406a45a3 100644 --- a/external/neon/neon_ne_set_request_flag.patch +++ b/external/neon/neon_ne_set_request_flag.patch @@ -1,11 +1,11 @@ --- src/ne_request.c 2010-09-28 13:57:26.000000000 +0200 +++ src/ne_request.c 2011-05-18 12:39:05.134445529 +0200 -@@ -529,7 +529,7 @@ +@@ -585,7 +585,7 @@ void ne_set_request_flag(ne_request *req, ne_request_flag flag, int value) { -- if (flag < NE_SESSFLAG_LAST) { -+ if (flag < NE_REQFLAG_LAST) { +- if (flag < (ne_request_flag)NE_SESSFLAG_LAST) { ++ if (flag < (ne_request_flag)NE_REQFLAG_LAST) { req->flags[flag] = value; } } |