CWS-TOOLING: integrate CWS kso48

5 files changed, 77 insertions, 52 deletions

diff --git a/neon/makefile.mk b/neon/makefile.mk
index d296db7a3f98..c92a84936f46 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -46,10 +46,10 @@ TARGET=so_neon
     @echo "neon disabled...."
 .ENDIF
 
-NEON_NAME=neon-0.29.3
+NEON_NAME=neon-0.29.5
 
 TARFILE_NAME=$(NEON_NAME)
-TARFILE_MD5=ba1015b59c112d44d7797b62fe7bee51
+TARFILE_MD5=ff369e69ef0f0143beb5626164e87ae2
 PATCH_FILES=neon.patch
 
 .IF "$(GUI)"=="WNT"
diff --git a/neon/neon.patch b/neon/neon.patch
index 3d4e5019e0b7..51ec3a8d6d0b 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/config.h	2010-03-23 14:47:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/config.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/config.h	2010-12-07 15:53:32.000000000 +0100
++++ misc/build/neon-0.29.5/src/config.h	2010-12-07 13:44:29.000000000 +0100
 @@ -1 +1,488 @@
 -dummy
 +
@@ -304,7 +304,7 @@
 +#define NEON_IS_LIBRARY 1
 +
 +/* Define to be the neon version string */
-+#define NEON_VERSION "0.29.3"
++#define NEON_VERSION "0.29.5"
 +
 +/* Define to enable debugging */
 +/* #undef NE_DEBUGGING */
@@ -363,7 +363,7 @@
 +#define NE_VERSION_MINOR (29)
 +
 +/* Define to be neon library patch version */
-+#define NE_VERSION_PATCH (3)
++#define NE_VERSION_PATCH (5)
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#define PACKAGE_BUGREPORT "neon@webdav.org"
@@ -372,13 +372,13 @@
 +#define PACKAGE_NAME "neon"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "neon 0.29.3"
++#define PACKAGE_STRING "neon 0.29.5"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "neon"
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.29.3"
++#define PACKAGE_VERSION "0.29.5"
 +
 +/* The size of a `int', as computed by sizeof. */
 +#define SIZEOF_INT 4
@@ -490,8 +490,8 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.29.3/src/makefile.mk	2010-03-23 14:47:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/makefile.mk	2010-03-23 14:45:21.000000000 +0100
+--- misc/neon-0.29.5/src/makefile.mk	2010-12-07 15:53:32.000000000 +0100
++++ misc/build/neon-0.29.5/src/makefile.mk	2010-12-07 13:44:29.000000000 +0100
 @@ -1 +1,102 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
@@ -596,46 +596,71 @@
 +# --- Targets ------------------------------------------------------
 +DEF1NAME=$(SHL1TARGET)
 +.INCLUDE :  target.mk
---- misc/neon-0.29.3/src/ne_auth.c	2009-12-30 22:29:30.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_auth.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_auth.c	2010-10-14 17:00:53.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_auth.c	2010-12-07 15:39:56.000000000 +0100
 @@ -367,7 +367,7 @@
  static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
                             struct auth_challenge *chall, char *pwbuf) 
  {
 -    if (chall->handler->creds(chall->handler->userdata, sess->realm, 
-+    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm,
++    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, 
                                chall->handler->attempt++, sess->username, pwbuf) == 0) {
          return 0;
      } else {
-@@ -617,6 +617,7 @@
-     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+@@ -610,10 +610,12 @@
+         return NULL;
+ }
+ 
+-static int continue_sspi(auth_session *sess, int ntlm, const char *hdr)
++static int continue_sspi(auth_session *sess, int ntlm, const char *hdr,
++                         int attempt, struct auth_challenge *parms, ne_buffer **errmsg)
+ {
      int status;
      char *response = NULL;
 +    char password[NE_ABUFSIZ];
      
      NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
      
-@@ -633,8 +634,17 @@
+@@ -630,8 +632,17 @@
              return status;
          }
      }
-+
-+	/* Authentification needs more than one http request.
-+	 * As long as authentification in progress use the existing credentials.
-+	 * Otherwise get new credentials.*/
-+	if (!parms->opaque)
-+		if (get_credentials(sess, errmsg, attempt, parms, password)) {
-+		        /* Failed to get credentials */
-+			    return -1;
-+		}
-     
--    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
-+    status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
+-    
+-    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response);
++   
++    /* Authentification needs more than one http request.
++     * As long as authentification in progress use the existing credentials.
++     * Otherwise get new credentials.*/
++    if (!hdr)
++        if (get_credentials(sess, errmsg, attempt, parms, password)) {
++            /* Failed to get credentials */
++            return -1;
++        } 
++
++    status = ne_sspi_authenticate(sess->sspi_context, hdr, &response, sess->username, password);
      if (status) {
          return status;
      }
---- misc/neon-0.29.3/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_auth.h	2010-03-23 12:19:50.000000000 +0100
+@@ -651,7 +662,7 @@
+ {
+     int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+ 
+-    return continue_sspi(sess, ntlm, parms->opaque);
++    return continue_sspi(sess, ntlm, parms->opaque, attempt, parms, errmsg);
+ }
+ 
+ static int verify_sspi(struct auth_request *req, auth_session *sess,
+@@ -674,7 +685,7 @@
+         return NE_OK;
+     }
+ 
+-    return continue_sspi(sess, ntlm, ptr);
++    return continue_sspi(sess, ntlm, ptr, 0, NULL, NULL);
+ }
+ 
+ #endif
+--- misc/neon-0.29.5/src/ne_auth.h	2009-09-01 22:13:12.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_auth.h	2010-12-07 13:44:30.000000000 +0100
 @@ -47,8 +47,8 @@
   * Hint: if you just wish to attempt authentication just once (even if
   * the user gets the username/password wrong), have the callback
@@ -647,8 +672,8 @@
  
  /* Set callbacks to provide credentials for server and proxy
   * authentication, using the default set of authentication protocols.
---- misc/neon-0.29.3/src/ne_defs.h	2009-09-02 16:04:43.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_defs.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_defs.h	2010-01-11 23:57:34.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_defs.h	2010-12-07 13:44:30.000000000 +0100
 @@ -41,7 +41,7 @@
  #endif
  
@@ -658,8 +683,8 @@
  #define ssize_t int
  #endif
  
---- misc/neon-0.29.3/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_locks.c	2007-02-05 11:09:27.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.c	2010-12-07 13:44:30.000000000 +0100
 @@ -579,6 +579,23 @@
          const char *token = ne_get_response_header(ctx->req, "Lock-Token");
          /* at the root element; retrieve the Lock-Token header,
@@ -726,8 +751,8 @@
  	    ctx->found = 1;
  	}
      }
---- misc/neon-0.29.3/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_locks.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_locks.h	2010-12-07 13:44:30.000000000 +0100
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -739,8 +764,8 @@
  #include "ne_request.h" /* for ne_session + ne_request */
  #include "ne_uri.h" /* for ne_uri */
  
---- misc/neon-0.29.3/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_sspi.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_sspi.c	2010-12-07 13:44:31.000000000 +0100
 @@ -206,6 +206,45 @@
  }
  
@@ -826,8 +851,8 @@
  
          securityStatus =
              initializeSecurityContext(&sspiContext->credentials, NULL,
---- misc/neon-0.29.3/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_sspi.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_sspi.h	2010-12-07 13:44:31.000000000 +0100
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -837,8 +862,8 @@
  
  #endif /* HAVE_SSPI */
  
---- misc/neon-0.29.3/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_uri.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_uri.c	2010-12-07 13:44:31.000000000 +0100
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -884,8 +909,8 @@
  /*   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,
---- misc/neon-0.29.3/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.29.3/src/ne_utils.c	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
++++ misc/build/neon-0.29.5/src/ne_utils.c	2010-12-07 13:44:31.000000000 +0100
 @@ -118,6 +118,9 @@
  #ifdef HAVE_GNUTLS
      ", GNU TLS " LIBGNUTLS_VERSION
@@ -915,8 +940,8 @@
          return 1;
  #endif /* NE_HAVE_* */
      default:
---- misc/neon-0.29.3/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.29.3/src/ne_utils.h	2010-03-23 12:19:50.000000000 +0100
+--- misc/neon-0.29.5/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
++++ misc/build/neon-0.29.5/src/ne_utils.h	2010-12-07 13:44:31.000000000 +0100
 @@ -54,6 +54,7 @@
  #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
  #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
index f5c2ce8afea3..d162a145d707 100644
--- a/neon/neon_exports_unix.patch
+++ b/neon/neon_exports_unix.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+--- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,288 @@
 +UDK_3_0_0 {
 +	global:
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
index 85d73da2b41d..40f130e66da3 100644
--- a/neon/neon_exports_win.patch
+++ b/neon/neon_exports_win.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.29.3/src/exports.map	2009-09-29 10:28:13.531250000 +0200
-+++ misc/build/neon-0.29.3/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+--- misc/neon-0.29.5/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.29.5/src/exports.map	2009-09-21 12:16:53.453125000 +0200
 @@ -0,0 +1,294 @@
 +UDK_3_0_0 {
 +	global:
diff --git a/neon/version.mk b/neon/version.mk
index 418999ff1452..0bac1cd47f05 100644
--- a/neon/version.mk
+++ b/neon/version.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@ NEON_MAJOR=0
 # the minor
 NEON_MINOR=29
 # the micro
-NEON_MICRO=3
+NEON_MICRO=5
 
 # concat
 NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)