CWS-TOOLING: integrate CWS tkr27

2009-10-28 06:49:21 +0100 tkr  r277234 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-27 12:25:20 +0100 tkr  r277198 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-26 08:06:52 +0100 tkr  r277172 : #105418# rename -lineon to -lneon for mingw port
2009-10-22 14:58:56 +0200 tkr  r277125 : #i105418# rename neon lib name
2009-10-22 14:56:48 +0200 tkr  r277123 : #i105418# rename neon lib name
2009-10-14 13:33:53 +0200 tkr  r276894 : #i105891# windows ifilter relocated
2009-10-12 12:12:43 +0200 tkr  r276826 : CWS-TOOLING: rebase CWS tkr27 to branches/OOO320@276773 (milestone: OOO320:m1)
2009-10-08 12:50:50 +0200 tkr  r276787 : #i105418# introduced new defines for special_lib_file
2009-10-08 12:48:08 +0200 tkr  r276786 : #i105418# build neon as shared library
2009-10-08 12:13:35 +0200 tkr  r276782 : #i105418# build neon as shared library
2009-09-29 12:46:16 +0200 tkr  r276523 : #i105418# build neon as shared library
2009-09-29 12:36:15 +0200 tkr  r276522 : #i105418# build neon as shared library
2009-09-29 12:17:21 +0200 tkr  r276519 : #i105418# build neon as shared library
2009-09-29 11:11:33 +0200 tkr  r276512 : #i105418# build neon as shared library
2009-09-29 10:39:19 +0200 tkr  r276509 : #i105418# build neon as shared library
2009-09-29 10:36:45 +0200 tkr  r276508 : #i105418# build neon as shared library

5 files changed, 651 insertions, 26 deletions

diff --git a/neon/makefile.mk b/neon/makefile.mk
index 247e640ce8b1..dd0022822752 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -54,6 +54,13 @@ NEON_NAME=neon-0.28.2
 
 TARFILE_NAME=$(NEON_NAME)
 PATCH_FILES=neon.patch
+
+.IF "$(GUI)"=="WNT" 
+    PATCH_FILES+=neon_exports_win.patch
+.ELSE
+    PATCH_FILES+=neon_exports_unix.patch
+.ENDIF
+
 ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c
 
 BUILD_DIR=src
diff --git a/neon/neon.patch b/neon/neon.patch
index 569ed0f0a189..94769f7cc58f 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.28.2/src/config.h	2009-08-30 19:00:56.000000000 +0200
-+++ misc/build/neon-0.28.2/src/config.h	2009-08-11 09:48:54.000000000 +0200
+--- misc/neon-0.28.2/src/config.h	2009-09-29 10:28:26.750000000 +0200
++++ misc/build/neon-0.28.2/src/config.h	2009-09-29 10:22:51.890625000 +0200
 @@ -1 +1,484 @@
 -dummy
 +
@@ -486,15 +486,16 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.28.2/src/makefile.mk	2009-08-30 19:00:56.000000000 +0200
-+++ misc/build/neon-0.28.2/src/makefile.mk	2009-08-11 09:48:54.000000000 +0200
-@@ -1 +1,59 @@
+--- misc/neon-0.28.2/src/makefile.mk	2009-09-29 10:28:26.687500000 +0200
++++ misc/build/neon-0.28.2/src/makefile.mk	2009-09-17 13:04:18.031250000 +0200
+@@ -1 +1,91 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
 +PRJNAME=neon
 +TARGET=neon
 +LIBTARGET=NO
++USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
 +# --- Settings -----------------------------------------------------
@@ -506,9 +507,15 @@
 +CDEFS+=-DHAVE_CONFIG_H
 +
 +.IF "$(SYSTEM_LIBXML)" == "YES"
-+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++CFLAGS+= -DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++.ELSE
++LIBXMLINCDIR=external$/libxml
++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
 +.ENDIF
 +
++.IF "$(SYSTEM_OPENSSL)" == "YES"
++CFLAGS+= $(OPENSSL_CFLAGS)
++.ENDIF
 +
 +SLOFILES= \
 +        $(SLO)$/ne_207.obj \
@@ -542,15 +549,40 @@
 +#       $(SLO)$/ne_gnutls.obj \
 +#       $(SLO)$/ne_stubssl.obj 
 +
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
++SHL1OBJS=$(SLOFILES)
++SHL1TARGET=$(TARGET)
++SHL1VERSIONMAP=exports.map
++SHL1IMPLIB=i$(TARGET)
++
++SHL1STDLIBS+= $(LIBXML2LIB)
++
++.IF "$(GUI)"=="WNT"
++	SHL1STDLIBS+= $(WSOCK32LIB)
++	.IF "$(WINDOWS_VISTA_PSDK)" != ""
++		SHL1STDLIBS+= $(WS2_32LIB)
++	.ENDIF
++	SHL1STDLIBS+= $(OPENSSLLIB)
++.ELSE # WNT
++	.IF "$(OS)"=="SOLARIS"
++		SHL1STDLIBS+= -lnsl -lsocket -ldl
++	.ENDIF # SOLARIS
++	.IF "$(OS)"=="OS2"
++		SHL1STDLIBS+= pthread.lib libz.lib
++	.ENDIF # OS2
++	.IF "$(SYSTEM_OPENSSL)"=="YES"
++		SHL1STDLIBS+= $(OPENSSLLIB)
++	.ELSE
++		SHL1STDLIBS+= $(OPENSSLLIBST)
++	.ENDIF
++.ENDIF # WNT
++
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +
 +# --- Targets ------------------------------------------------------
-+
++DEF1NAME=$(SHL1TARGET) 
 +.INCLUDE :  target.mk
 --- misc/neon-0.28.2/src/ne_auth.c	2008-02-29 17:30:12.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.c	2009-08-24 15:41:32.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_auth.c	2009-09-29 10:22:51.906250000 +0200
 @@ -77,6 +77,10 @@
  #include "ne_sspi.h"
  #endif
@@ -714,7 +746,7 @@
      return ret;
  }
 --- misc/neon-0.28.2/src/ne_auth.h	2007-12-05 17:39:58.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.h	2009-08-24 15:16:22.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_auth.h	2009-09-29 10:22:51.921875000 +0200
 @@ -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
@@ -727,7 +759,7 @@
  /* Set callbacks to provide credentials for server and proxy
   * authentication, using the default set of authentication protocols.
 --- misc/neon-0.28.2/src/ne_defs.h	2006-10-24 21:40:09.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_defs.h	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_defs.h	2009-09-29 10:22:51.921875000 +0200
 @@ -41,7 +41,7 @@
  #endif
  
@@ -738,7 +770,7 @@
  #endif
  
 --- misc/neon-0.28.2/src/ne_locks.h	2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_locks.h	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_locks.h	2009-09-29 10:22:51.921875000 +0200
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -750,8 +782,8 @@
  #include "ne_request.h" /* for ne_session + ne_request */
  #include "ne_uri.h" /* for ne_uri */
  
---- misc/neon-0.28.2/src/ne_ntlm.c	2009-08-30 19:00:56.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-08-11 09:48:54.000000000 +0200
+--- misc/neon-0.28.2/src/ne_ntlm.c	2009-09-29 10:28:26.875000000 +0200
++++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-09-29 10:22:51.937500000 +0200
 @@ -1 +1,700 @@
 -dummy
 +/* 
@@ -1454,8 +1486,8 @@
 +
 +#endif /* HAVE_OPENSSL */
 +#endif /* HAVE_NTLM */
---- misc/neon-0.28.2/src/ne_ntlm.h	2009-08-30 19:00:56.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-08-11 09:48:54.000000000 +0200
+--- misc/neon-0.28.2/src/ne_ntlm.h	2009-09-29 10:28:26.812500000 +0200
++++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-09-29 10:22:51.937500000 +0200
 @@ -1 +1,44 @@
 -dummy
 +/* 
@@ -1503,7 +1535,7 @@
 +
 +#endif /* NE_NTLM_H */
 --- misc/neon-0.28.2/src/ne_socket.c	2008-02-28 14:19:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_socket.c	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_socket.c	2009-09-29 10:22:51.953125000 +0200
 @@ -60,6 +60,7 @@
  #include <stddef.h>
  #ifdef USE_GETADDRINFO
@@ -1513,7 +1545,7 @@
  #endif
  
 --- misc/neon-0.28.2/src/ne_sspi.c	2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-09-29 10:22:51.953125000 +0200
 @@ -202,9 +202,48 @@
          return -1;
      }
@@ -1604,7 +1636,7 @@
          securityStatus =
              initializeSecurityContext(&sspiContext->credentials, NULL,
 --- misc/neon-0.28.2/src/ne_sspi.h	2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_sspi.h	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.h	2009-09-29 10:22:51.968750000 +0200
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -1615,7 +1647,7 @@
  #endif /* HAVE_SSPI */
  
 --- misc/neon-0.28.2/src/ne_uri.c	2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_uri.c	2009-08-11 09:48:54.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_uri.c	2009-09-29 10:22:51.968750000 +0200
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -1662,7 +1694,7 @@
  /*   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.28.2/src/ne_utils.c	2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_utils.c	2009-08-30 18:55:04.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_utils.c	2009-09-29 10:22:51.984375000 +0200
 @@ -118,6 +118,9 @@
  #ifdef HAVE_GNUTLS
      ", GNU TLS " LIBGNUTLS_VERSION
@@ -1693,7 +1725,7 @@
  #endif /* NE_HAVE_* */
      default:
 --- misc/neon-0.28.2/src/ne_utils.h	2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_utils.h	2009-08-24 15:47:03.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_utils.h	2009-09-29 10:22:51.984375000 +0200
 @@ -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
new file mode 100644
index 000000000000..4e8098eb1eeb
--- /dev/null
+++ b/neon/neon_exports_unix.patch
@@ -0,0 +1,289 @@
+--- misc/neon-0.28.2/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.28.2/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+@@ -0,0 +1,286 @@
++NEON_0_28_2 {
++	global:
++		ne__negotiate_ssl;
++		ne__ssl_exit;
++		ne__ssl_init;
++		ne_ssl_cert_cmp;
++		ne_ssl_cert_digest;
++		ne_ssl_cert_export;
++		ne_ssl_cert_free;
++		ne_ssl_cert_identity;
++		ne_ssl_cert_import;
++		ne_ssl_cert_issuer;
++		ne_ssl_cert_read;
++		ne_ssl_cert_signedby;
++		ne_ssl_cert_subject;
++		ne_ssl_cert_validity_time;
++		ne_ssl_cert_write;
++		ne_ssl_clicert_decrypt;
++		ne_ssl_clicert_encrypted;
++		ne_ssl_clicert_free;
++		ne_ssl_clicert_name;
++		ne_ssl_clicert_owner;
++		ne_ssl_clicert_read;
++		ne_ssl_context_create;
++		ne_ssl_context_destroy;
++		ne_ssl_context_keypair;
++		ne_ssl_context_set_flag;
++		ne_ssl_context_set_verify;
++		ne_ssl_context_trustcert;
++		ne_ssl_dname_cmp;
++		ne_ssl_readable_dname;
++		ne_ssl_set_clicert;
++		ne_ssl_trust_default_ca;
++		ne_xml_dispatch_request;
++		ne_xml_parse_response;
++		ne_xml_create;
++		ne_xml_currentline;
++		ne_xml_destroy;
++		ne_xml_doc_encoding;
++		ne_xml_failed;
++		ne_xml_get_attr;
++		ne_xml_get_error;
++		ne_xml_mapid;
++		ne_xml_parse;
++		ne_xml_parse_v;
++		ne_xml_push_handler;
++		ne_xml_resolve_nspace;
++		ne_xml_set_error;
++		ne_debug;
++		ne_debug_init;
++		ne_debug_mask;
++		ne_debug_stream;
++		ne_has_support;
++		ne_parse_statusline;
++		ne_version_match;
++		ne_version_string;
++		ne_path_childof;
++		ne_path_compare;
++		ne_path_escape;
++		ne_path_has_trailing_slash;
++		ne_path_parent;
++		ne_path_unescape;
++		ne_uri_cmp;
++		ne_uri_copy;
++		ne_uri_defaultport;
++		ne_uri_free;
++		ne_uri_parse;
++		ne_uri_resolve;
++		ne_uri_unparse;
++		ne_base64;
++		ne_buffer_altered;
++		ne_buffer_append;
++		ne_buffer_clear;
++		ne_buffer_concat;
++		ne_buffer_create;
++		ne_buffer_destroy;
++		ne_buffer_finish;
++		ne_buffer_grow;
++		ne_buffer_ncreate;
++		ne_buffer_snprintf;
++		ne_buffer_zappend;
++		ne_concat;
++		ne_qtoken;
++		ne_shave;
++		ne_snprintf;
++		ne_strcasecmp;
++		ne_strclean;
++		ne_strerror;
++		ne_strncasecmp;
++		ne_token;
++		ne_tolower_array;
++		ne_unbase64;
++		ne_vsnprintf;
++		ne__sock_sslsock;
++		ne_addr_destroy;
++		ne_addr_error;
++		ne_addr_first;
++		ne_addr_next;
++		ne_addr_resolve;
++		ne_addr_result;
++		ne_iaddr_cmp;
++		ne_iaddr_free;
++		ne_iaddr_make;
++		ne_iaddr_print;
++		ne_iaddr_reverse;
++		ne_iaddr_typeof;
++		ne_sock_accept;
++		ne_sock_accept_ssl;
++		ne_sock_block;
++		ne_sock_cipher;
++		ne_sock_close;
++		ne_sock_connect;
++		ne_sock_connect_ssl;
++		ne_sock_connect_timeout;
++		ne_sock_create;
++		ne_sock_error;
++		ne_sock_exit;
++		ne_sock_fd;
++		ne_sock_fullread;
++		ne_sock_fullwrite;
++		ne_sock_init;
++		ne_sock_peek;
++		ne_sock_peer;
++		ne_sock_prebind;
++		ne_sock_read;
++		ne_sock_read_timeout;
++		ne_sock_readline;
++		ne_sock_sessid;
++		ne__ssl_set_verify_err;
++		ne_close_connection;
++		ne_fill_proxy_uri;
++		ne_fill_server_uri;
++		ne_get_error;
++		ne_get_scheme;
++		ne_get_server_hostport;
++		ne_get_session_flag;
++		ne_hook_close_conn;
++		ne_hook_create_request;
++		ne_hook_destroy_request;
++		ne_hook_destroy_session;
++		ne_hook_post_headers;
++		ne_hook_post_send;
++		ne_hook_pre_send;
++		ne_session_create;
++		ne_session_destroy;
++		ne_session_proxy;
++		ne_set_addrlist;
++		ne_set_connect_timeout;
++		ne_set_error;
++		ne_set_localaddr;
++		ne_set_notifier;
++		ne_set_progress;
++		ne_set_read_timeout;
++		ne_set_session_flag;
++		ne_set_session_private;
++		ne_set_useragent;
++		ne_ssl_cert_validity;
++		ne_ssl_provide_clicert;
++		ne_ssl_set_verify;
++		ne_ssl_trust_cert;
++		ne_unhook_close_conn;
++		ne_unhook_create_request;
++		ne_unhook_destroy_request;
++		ne_unhook_destroy_session;
++		ne_unhook_post_headers;
++		ne_unhook_post_send;
++		ne_unhook_pre_send;
++		ne_version_pre_http11;
++		ne_accept_2xx;
++		ne_accept_always;
++		ne_add_request_header;
++		ne_add_response_body_reader;
++		ne_begin_request;
++		ne_discard_response;
++		ne_end_request;
++		ne_get_request_flag;
++		ne_get_request_private;
++		ne_get_response_header;
++		ne_get_session;
++		ne_get_session_private;
++		ne_get_status;
++		ne_print_request_header;
++		ne_read_response_block;
++		ne_read_response_to_fd;
++		ne_request_create;
++		ne_request_destroy;
++		ne_request_dispatch;
++		ne_response_header_iterate;
++		ne_set_request_body_buffer;
++		ne_set_request_body_fd;
++		ne_set_request_body_provider;
++		ne_set_request_flag;
++		ne_set_request_private;
++		ne_redirect_location;
++		ne_redirect_register;
++		ne_propfind_allprop;
++		ne_propfind_create;
++		ne_propfind_current_private;
++		ne_propfind_destroy;
++		ne_propfind_get_parser;
++		ne_propfind_get_request;
++		ne_propfind_named;
++		ne_propfind_set_private;
++		ne_propnames;
++		ne_proppatch;
++		ne_propset_iterate;
++		ne_propset_lang;
++		ne_propset_private;
++		ne_propset_status;
++		ne_propset_value;
++		ne_simple_propfind;
++		ne_ascii_to_md5;
++		ne_md5_create_ctx;
++		ne_md5_destroy_ctx;
++		ne_md5_dup_ctx;
++		ne_md5_finish_ascii;
++		ne_md5_finish_ctx;
++		ne_md5_process_block;
++		ne_md5_process_bytes;
++		ne_md5_read_ctx;
++		ne_md5_reset_ctx;
++		ne_md5_stream;
++		ne_md5_to_ascii;
++		ne_lock;
++		ne_lock_copy;
++		ne_lock_create;
++		ne_lock_destroy;
++		ne_lock_discover;
++		ne_lock_free;
++		ne_lock_refresh;
++		ne_lock_using_parent;
++		ne_lock_using_resource;
++		ne_lockstore_add;
++		ne_lockstore_create;
++		ne_lockstore_destroy;
++		ne_lockstore_findbyuri;
++		ne_lockstore_first;
++		ne_lockstore_next;
++		ne_lockstore_register;
++		ne_lockstore_remove;
++		ne_unlock;
++		ne_i18n_init;
++		ne_asctime_parse;
++		ne_httpdate_parse;
++		ne_iso8601_parse;
++		ne_rfc1036_parse;
++		ne_rfc1123_date;
++		ne_rfc1123_parse;
++		ne_decompress_destroy;
++		ne_decompress_reader;
++		ne_add_depth_header;
++		ne_copy;
++		ne_delete;
++		ne_get;
++		ne_get_content_type;
++		ne_get_range;
++		ne_getmodtime;
++		ne_mkcol;
++		ne_move;
++		ne_options;
++		ne_options2;
++		ne_post;
++		ne_put;
++		ne_add_proxy_auth;
++		ne_add_server_auth;
++		ne_forget_auth;
++		ne_set_proxy_auth;
++		ne_set_server_auth;
++		ne_calloc;
++		ne_malloc;
++		ne_oom_callback;
++		ne_realloc;
++		ne_strdup;
++		ne_strndup;
++		ne_acl_set;
++		ne_207_create;
++		ne_207_destroy;
++		ne_207_get_current_propstat;
++		ne_207_get_current_response;
++		ne_207_set_propstat_handlers;
++		ne_207_set_response_handlers;
++		ne_accept_207;
++		ne_simple_request;
++	local:
++		*;
++};
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
new file mode 100644
index 000000000000..479f03a9d6bc
--- /dev/null
+++ b/neon/neon_exports_win.patch
@@ -0,0 +1,295 @@
+--- misc/neon-0.28.2/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.28.2/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+@@ -0,0 +1,292 @@
++NEON_0_28_2 {
++	global:
++		ne_sspi_authenticate;
++		ne_sspi_clear_context;
++		ne_sspi_create_context;
++		ne_sspi_deinit;
++		ne_sspi_destroy_context;
++		ne_sspi_init;
++		ne__negotiate_ssl;
++		ne__ssl_exit;
++		ne__ssl_init;
++		ne_ssl_cert_cmp;
++		ne_ssl_cert_digest;
++		ne_ssl_cert_export;
++		ne_ssl_cert_free;
++		ne_ssl_cert_identity;
++		ne_ssl_cert_import;
++		ne_ssl_cert_issuer;
++		ne_ssl_cert_read;
++		ne_ssl_cert_signedby;
++		ne_ssl_cert_subject;
++		ne_ssl_cert_validity_time;
++		ne_ssl_cert_write;
++		ne_ssl_clicert_decrypt;
++		ne_ssl_clicert_encrypted;
++		ne_ssl_clicert_free;
++		ne_ssl_clicert_name;
++		ne_ssl_clicert_owner;
++		ne_ssl_clicert_read;
++		ne_ssl_context_create;
++		ne_ssl_context_destroy;
++		ne_ssl_context_keypair;
++		ne_ssl_context_set_flag;
++		ne_ssl_context_set_verify;
++		ne_ssl_context_trustcert;
++		ne_ssl_dname_cmp;
++		ne_ssl_readable_dname;
++		ne_ssl_set_clicert;
++		ne_ssl_trust_default_ca;
++		ne_xml_dispatch_request;
++		ne_xml_parse_response;
++		ne_xml_create;
++		ne_xml_currentline;
++		ne_xml_destroy;
++		ne_xml_doc_encoding;
++		ne_xml_failed;
++		ne_xml_get_attr;
++		ne_xml_get_error;
++		ne_xml_mapid;
++		ne_xml_parse;
++		ne_xml_parse_v;
++		ne_xml_push_handler;
++		ne_xml_resolve_nspace;
++		ne_xml_set_error;
++		ne_debug;
++		ne_debug_init;
++		ne_debug_mask;
++		ne_debug_stream;
++		ne_has_support;
++		ne_parse_statusline;
++		ne_version_match;
++		ne_version_string;
++		ne_path_childof;
++		ne_path_compare;
++		ne_path_escape;
++		ne_path_has_trailing_slash;
++		ne_path_parent;
++		ne_path_unescape;
++		ne_uri_cmp;
++		ne_uri_copy;
++		ne_uri_defaultport;
++		ne_uri_free;
++		ne_uri_parse;
++		ne_uri_resolve;
++		ne_uri_unparse;
++		ne_base64;
++		ne_buffer_altered;
++		ne_buffer_append;
++		ne_buffer_clear;
++		ne_buffer_concat;
++		ne_buffer_create;
++		ne_buffer_destroy;
++		ne_buffer_finish;
++		ne_buffer_grow;
++		ne_buffer_ncreate;
++		ne_buffer_snprintf;
++		ne_buffer_zappend;
++		ne_concat;
++		ne_qtoken;
++		ne_shave;
++		ne_snprintf;
++		ne_strcasecmp;
++		ne_strclean;
++		ne_strerror;
++		ne_strncasecmp;
++		ne_token;
++		ne_tolower_array;
++		ne_unbase64;
++		ne_vsnprintf;
++		ne__sock_sslsock;
++		ne_addr_destroy;
++		ne_addr_error;
++		ne_addr_first;
++		ne_addr_next;
++		ne_addr_resolve;
++		ne_addr_result;
++		ne_iaddr_cmp;
++		ne_iaddr_free;
++		ne_iaddr_make;
++		ne_iaddr_print;
++		ne_iaddr_reverse;
++		ne_iaddr_typeof;
++		ne_sock_accept;
++		ne_sock_accept_ssl;
++		ne_sock_block;
++		ne_sock_cipher;
++		ne_sock_close;
++		ne_sock_connect;
++		ne_sock_connect_ssl;
++		ne_sock_connect_timeout;
++		ne_sock_create;
++		ne_sock_error;
++		ne_sock_exit;
++		ne_sock_fd;
++		ne_sock_fullread;
++		ne_sock_fullwrite;
++		ne_sock_init;
++		ne_sock_peek;
++		ne_sock_peer;
++		ne_sock_prebind;
++		ne_sock_read;
++		ne_sock_read_timeout;
++		ne_sock_readline;
++		ne_sock_sessid;
++		ne__ssl_set_verify_err;
++		ne_close_connection;
++		ne_fill_proxy_uri;
++		ne_fill_server_uri;
++		ne_get_error;
++		ne_get_scheme;
++		ne_get_server_hostport;
++		ne_get_session_flag;
++		ne_hook_close_conn;
++		ne_hook_create_request;
++		ne_hook_destroy_request;
++		ne_hook_destroy_session;
++		ne_hook_post_headers;
++		ne_hook_post_send;
++		ne_hook_pre_send;
++		ne_session_create;
++		ne_session_destroy;
++		ne_session_proxy;
++		ne_set_addrlist;
++		ne_set_connect_timeout;
++		ne_set_error;
++		ne_set_localaddr;
++		ne_set_notifier;
++		ne_set_progress;
++		ne_set_read_timeout;
++		ne_set_session_flag;
++		ne_set_session_private;
++		ne_set_useragent;
++		ne_ssl_cert_validity;
++		ne_ssl_provide_clicert;
++		ne_ssl_set_verify;
++		ne_ssl_trust_cert;
++		ne_unhook_close_conn;
++		ne_unhook_create_request;
++		ne_unhook_destroy_request;
++		ne_unhook_destroy_session;
++		ne_unhook_post_headers;
++		ne_unhook_post_send;
++		ne_unhook_pre_send;
++		ne_version_pre_http11;
++		ne_accept_2xx;
++		ne_accept_always;
++		ne_add_request_header;
++		ne_add_response_body_reader;
++		ne_begin_request;
++		ne_discard_response;
++		ne_end_request;
++		ne_get_request_flag;
++		ne_get_request_private;
++		ne_get_response_header;
++		ne_get_session;
++		ne_get_session_private;
++		ne_get_status;
++		ne_print_request_header;
++		ne_read_response_block;
++		ne_read_response_to_fd;
++		ne_request_create;
++		ne_request_destroy;
++		ne_request_dispatch;
++		ne_response_header_iterate;
++		ne_set_request_body_buffer;
++		ne_set_request_body_fd;
++		ne_set_request_body_provider;
++		ne_set_request_flag;
++		ne_set_request_private;
++		ne_redirect_location;
++		ne_redirect_register;
++		ne_propfind_allprop;
++		ne_propfind_create;
++		ne_propfind_current_private;
++		ne_propfind_destroy;
++		ne_propfind_get_parser;
++		ne_propfind_get_request;
++		ne_propfind_named;
++		ne_propfind_set_private;
++		ne_propnames;
++		ne_proppatch;
++		ne_propset_iterate;
++		ne_propset_lang;
++		ne_propset_private;
++		ne_propset_status;
++		ne_propset_value;
++		ne_simple_propfind;
++		ne_ascii_to_md5;
++		ne_md5_create_ctx;
++		ne_md5_destroy_ctx;
++		ne_md5_dup_ctx;
++		ne_md5_finish_ascii;
++		ne_md5_finish_ctx;
++		ne_md5_process_block;
++		ne_md5_process_bytes;
++		ne_md5_read_ctx;
++		ne_md5_reset_ctx;
++		ne_md5_stream;
++		ne_md5_to_ascii;
++		ne_lock;
++		ne_lock_copy;
++		ne_lock_create;
++		ne_lock_destroy;
++		ne_lock_discover;
++		ne_lock_free;
++		ne_lock_refresh;
++		ne_lock_using_parent;
++		ne_lock_using_resource;
++		ne_lockstore_add;
++		ne_lockstore_create;
++		ne_lockstore_destroy;
++		ne_lockstore_findbyuri;
++		ne_lockstore_first;
++		ne_lockstore_next;
++		ne_lockstore_register;
++		ne_lockstore_remove;
++		ne_unlock;
++		ne_i18n_init;
++		ne_asctime_parse;
++		ne_httpdate_parse;
++		ne_iso8601_parse;
++		ne_rfc1036_parse;
++		ne_rfc1123_date;
++		ne_rfc1123_parse;
++		ne_decompress_destroy;
++		ne_decompress_reader;
++		ne_add_depth_header;
++		ne_copy;
++		ne_delete;
++		ne_get;
++		ne_get_content_type;
++		ne_get_range;
++		ne_getmodtime;
++		ne_mkcol;
++		ne_move;
++		ne_options;
++		ne_options2;
++		ne_post;
++		ne_put;
++		ne_add_proxy_auth;
++		ne_add_server_auth;
++		ne_forget_auth;
++		ne_set_proxy_auth;
++		ne_set_server_auth;
++		ne_calloc;
++		ne_malloc;
++		ne_oom_callback;
++		ne_realloc;
++		ne_strdup;
++		ne_strndup;
++		ne_acl_set;
++		ne_207_create;
++		ne_207_destroy;
++		ne_207_get_current_propstat;
++		ne_207_get_current_response;
++		ne_207_set_propstat_handlers;
++		ne_207_set_response_handlers;
++		ne_accept_207;
++		ne_simple_request;
++	local:
++		*;
++};
diff --git a/neon/prj/d.lst b/neon/prj/d.lst
index c9cf72163a44..a6c269e96600 100644
--- a/neon/prj/d.lst
+++ b/neon/prj/d.lst
@@ -2,5 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\external
 mkdir: %_DEST%\inc%_EXT%\external\neon
 ..\version.mk %_DEST%\inc%_EXT%\external\neon\version.mk
 ..\%__SRC%\inc\ne_*.h %_DEST%\inc%_EXT%\external\neon\ne_*.h
-..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib
-..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a
+..\%__SRC%\lib\ineon.lib %_DEST%\lib%_EXT%\ineon.lib
+..\%__SRC%\bin\neon*.dll %_DEST%\bin%_EXT%\neon*.dll
+..\%__SRC%\lib\libneon*.so %_DEST%\lib%_EXT%\libneon*.so
+..\%__SRC%\lib\libneon*.dylib %_DEST%\lib%_EXT%\libneon*.dylib
\ No newline at end of file