[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst external/neon

[Caolán McNamara]

 download.lst                                 |    2 -
 external/neon/neon.patch                     |   47 +--------------------------
 external/neon/neon_ne_set_request_flag.patch |    6 +--
 3 files changed, 7 insertions(+), 48 deletions(-)

New commits:
commit e6a8fb33a948adf367baca31d54e1eb2f3ff0dc4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 7 09:52:51 2016 +0000

    upgrade neon to 0.30.1
    
    Reviewed-on: https://gerrit.libreoffice.org/22977
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 1827987fd11cd726005977e49d001283033f0419)
    
    Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30
    Reviewed-on: https://gerrit.libreoffice.org/23001
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/download.lst b/download.lst
index 6821b15..f000f78 100644
--- a/download.lst
+++ b/download.lst
@@ -108,7 +108,7 @@ export MWAW_VERSION_MICRO := 5
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
-export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
+export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
 export NSS_TARBALL := 478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
 export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
 export ODFGEN_VERSION_MICRO := 4
diff --git a/external/neon/neon.patch b/external/neon/neon.patch
index de52043..5abc3c9 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 3bcafd6..5189406 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;
      }
  }