Index: main/LICENSE
===================================================================
--- main/LICENSE	(revision 1755010)
+++ main/LICENSE	(working copy)
@@ -1029,9 +1029,8 @@
 For integration of XML Expat - built in main/expat/
 - MIT license
 
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-                               and Clark Cooper
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2016 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
Index: main/expat/expat-2.1.0.patch
===================================================================
--- main/expat/expat-2.1.0.patch	(revision 1755010)
+++ main/expat/expat-2.1.0.patch	(nonexistent)
@@ -1,87 +0,0 @@
---- misc/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:26:42 2008
-@@ -1 +1,83 @@
--dummy
-+#**************************************************************
-+#  
-+#  Licensed to the Apache Software Foundation (ASF) under one
-+#  or more contributor license agreements.  See the NOTICE file
-+#  distributed with this work for additional information
-+#  regarding copyright ownership.  The ASF licenses this file
-+#  to you under the Apache License, Version 2.0 (the
-+#  "License"); you may not use this file except in compliance
-+#  with the License.  You may obtain a copy of the License at
-+#  
-+#    http://www.apache.org/licenses/LICENSE-2.0
-+#  
-+#  Unless required by applicable law or agreed to in writing,
-+#  software distributed under the License is distributed on an
-+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+#  KIND, either express or implied.  See the License for the
-+#  specific language governing permissions and limitations
-+#  under the License.
-+#  
-+#**************************************************************
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=expat
-+TARGET=expat
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE :  settings.mk
-+# --- Files --------------------------------------------------------
-+
-+CFLAGS+=-I..
-+
-+.IF "$(OS)"=="WNT"
-+CDEFS+=-DCOMPILED_FROM_DSP
-+.ELSE
-+CDEFS+=-DHAVE_EXPAT_CONFIG_H
-+.ENDIF
-+
-+.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!=""
-+CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
-+.ENDIF # "$(OS)"=="MACOSX"
-+
-+SLOFILES=$(SLO)$/xmlparse.obj \
-+         $(SLO)$/xmlrole.obj \
-+         $(SLO)$/xmltok.obj
-+
-+SECOND_BUILD=UNICODE
-+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
-+UNICODECDEFS+=-DXML_UNICODE
-+
-+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
-+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
-+LIB1OBJFILES=$(SLO)$/xmlparse.obj
-+
-+LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
-+LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
-+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
-+
-+LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
-+LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
-+LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj
-+
-+.IF "$(BUILD_X64)"!=""
-+# ---------------- X64 stuff special ---------------------
-+#  use UNICODE only because shell/shlxthandler
-+#  doesn't link against ascii_expat_xmlparse
-+#---------------------------------------------------------
-+SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
-+             $(SLO_X64)$/xmlrole.obj \
-+             $(SLO_X64)$/xmltok.obj
-+CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
-+CFLAGS_X64+=-I..
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
-+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
-+LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
-+LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE :  set_wntx64.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :  tg_wntx64.mk
Index: main/expat/expat-2.2.0.patch
===================================================================
--- main/expat/expat-2.2.0.patch	(revision 1755010)
+++ main/expat/expat-2.2.0.patch	(working copy)
@@ -1,5 +1,5 @@
---- misc/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.1.0/lib/makefile.mk	Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.0/lib/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.0/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,83 @@
 -dummy
 +#**************************************************************
@@ -36,7 +36,7 @@
 +CFLAGS+=-I..
 +
 +.IF "$(OS)"=="WNT"
-+CDEFS+=-DCOMPILED_FROM_DSP
++CDEFS+=-DWIN32
 +.ELSE
 +CDEFS+=-DHAVE_EXPAT_CONFIG_H
 +.ENDIF
@@ -73,7 +73,7 @@
 +SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
 +             $(SLO_X64)$/xmlrole.obj \
 +             $(SLO_X64)$/xmltok.obj
-+CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP
++CDEFS_X64+=-DXML_UNICODE -DWIN32
 +CFLAGS_X64+=-I..
 +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
 +LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
@@ -85,3 +85,32 @@
 +.INCLUDE :  set_wntx64.mk
 +.INCLUDE :	target.mk
 +.INCLUDE :  tg_wntx64.mk
+--- misc/expat-2.2.0/lib/xmltok.c	2016-06-21 05:58:38.000000000 -0700
++++ misc/build/expat-2.2.0/lib/xmltok.c	2016-08-05 10:08:54.265761000 -0700
+@@ -402,7 +402,7 @@
+     case BT_LEAD2:
+       if (fromLim - from < 2) {
+         res = XML_CONVERT_INPUT_INCOMPLETE;
+-        break;
++        goto after;
+       }
+       *to++ = (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3f));
+       from += 2;
+@@ -410,7 +410,7 @@
+     case BT_LEAD3:
+       if (fromLim - from < 3) {
+         res = XML_CONVERT_INPUT_INCOMPLETE;
+-        break;
++        goto after;
+       }
+       *to++ = (unsigned short)(((from[0] & 0xf) << 12)
+                                | ((from[1] & 0x3f) << 6) | (from[2] & 0x3f));
+@@ -441,6 +441,8 @@
+       break;
+     }
+   }
++  if (from < fromLim)
++    res = XML_CONVERT_OUTPUT_EXHAUSTED;
+ after:
+   *fromP = from;
+   *toP = to;
Index: main/expat/expat-winapi.patch
===================================================================
--- main/expat/expat-winapi.patch	(revision 1755010)
+++ main/expat/expat-winapi.patch	(working copy)
@@ -1,5 +1,6 @@
---- misc/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
-+++ misc/build/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
+diff -ur misc/expat-2.2.0/lib/expat_external.h misc/build/expat-2.2.0/lib/expat_external.h
+--- misc/expat-2.2.0/lib/expat_external.h	2016-06-21 05:58:38.000000000 -0700
++++ misc/build/expat-2.2.0/lib/expat_external.h	2016-07-31 17:10:53.551556000 -0700
 @@ -7,10 +7,6 @@
  
  /* External API definitions */
Index: main/expat/makefile.mk
===================================================================
--- main/expat/makefile.mk	(revision 1755010)
+++ main/expat/makefile.mk	(working copy)
@@ -38,8 +38,8 @@
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=expat-2.1.0
-TARFILE_MD5=dd7dab7a5fea97d2a6a43f511449b7cd 
+TARFILE_NAME=expat-2.2.0
+TARFILE_MD5=2f47841c829facb346eb6e3fab5212e2
 ADDITIONAL_FILES=lib$/makefile.mk
 PATCH_FILES=$(TARFILE_NAME).patch \
             expat-winapi.patch
Index: main/expat/prj/d.lst
===================================================================
--- main/expat/prj/d.lst	(revision 1755010)
+++ main/expat/prj/d.lst	(working copy)
@@ -1,7 +1,7 @@
 mkdir: %_DEST%\inc%_EXT%\external\expat
 mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.1.0\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.1.0\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.0\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.0\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
 ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
 ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
 ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
Index: main/external_deps.lst
===================================================================
--- main/external_deps.lst	(revision 1755010)
+++ main/external_deps.lst	(working copy)
@@ -221,9 +221,9 @@
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_EXPAT != YES)
-    MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
-    name = expat-2.1.0.tar.gz
-    URL1 = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+    MD5 = 2f47841c829facb346eb6e3fab5212e2
+    name = expat-2.2.0.tar.bz2
+    URL1 = http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_CURL != YES)